From ff000c95709d66ef7f4eaa50bc664f7225720bd5 Mon Sep 17 00:00:00 2001 From: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com> Date: Thu, 1 Feb 2024 08:04:57 -0800 Subject: [PATCH] Incoming Cit-RP pull (#3) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Service Borg Drink Fab upgrade (#6121) Updates Service Borg to have slightly more ingredients, now that more exotic ones have been added to make bar-tending complicated ## About The Pull Request Gives Grenadine and Cream to the borg drink maker ## Why It's Good For The Game Grenadine and cream are two broadly used ingredients in drinks, far more common then some of the ones already available to borgs. We've had a lot of new niche ingredients added, and there's also still a lot of specialty ingredients that are a pain for our mechanical bartending friends to access if we want that artificial difficulty. ## Changelog :cl: add: Added two existing reagents to borg machine /:cl: * fixes hammer heads being called forks (#6128) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: hammer heads are no longer called forks /:cl: * CI: Skipping is native feature (#6125) ## About The Pull Request Did you know this is pointless to have? [docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs](https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs) * [MDB IGNORE] [IDB IGNORE] atom damage (#5235) ## About The Pull Request adds generic system for atom health / integrity / damage everything that isn't flagged with not-bludgeonable can, well, now be bludgeoned. ## Why It's Good For The Game more interactive game world through the means of making people able to break Everything. ## Changelog :cl: add: atom damage - (almost) everything is now breakable. refactor: new /atom level materials system refactor: a lot of the combat system / click code refactor: melee attack styles /:cl: --------- Co-authored-by: silicons * Replikant Apparel, Armor, Leg Markings and 2nd Gen prosthetics. (#6127) ## About The Pull Request This adds several new types of heavily replika-inspired bodysuits, a uniform with a few variants, a NT patch (designed for use with the aforementioned uniform), a hat, an alternative type of replikant stilt leg prosthetic and two pairs of leg markings (designed for use with the aforementioned alternate stilt legs), as well as loadout Selections for the uniform bases and bodysuits. Lore on these is simple and somewhat placeholder while the lore team considers definitive lore implementations. Four body-armor items are also added, however there is no way to obtain these at the moment except for adminspawn, since these warrant more of an open discussion regarding what the best way to implement them would be, (sec armor/cargo/cosmetic attachments/etc.) Thank you to TrojanCoyote for the base LSTR/ARAR/FKLR and armor sprites, help with descriptions. Some previews: Replikant apparel: ![uniformpreview](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/081a3a97-1aaf-4e47-bc2e-444d2a582c84) Replikant armor: ![armorpreview](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ba900c26-eb51-4cef-a00a-42dc05a93120) Overview of all uniform parts for "STAR": ![starparts](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/0c62b91f-a656-412b-b28e-b44876a38319) Sleek Uniform (Skirt base + accessories / Sleeveless base): ![sleekuniform](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ab3b7a7f-d3ee-4daa-a79e-e1f116391748) (Also has a long sleeve version with pants in both male and female version) ## Why It's Good For The Game Beyond the increase of Replikant players recently, who have been having to resort to a lot of markings and underwear and custom loadout items to approximate their uniforms, in the future these may serve as an in-game presence to Replikant lore should they become a minor race (Lore currently WIP). In which case a second pass on the descriptions should be expected. ## Changelog :cl: add: Added 8 Replikant bodysuits and side cap. add: Added 4 Sleek uniforms, a jacket and NT patch. add: Added 4 variants of Replikant armor. add: Added Gen 2 Replikant leg prosthetics. add: Added two pairs of Replikant leg markings. /:cl: * Tridot body marking (forehead) (#6132) Marking for a humanoid's forehead that's 3 dots in a triangle. Alternate version is flipped upside down. * Replika Armor in Loadout (no defense stats) (#6139) ## About The Pull Request Adds replika armor to the loadout area as statless accessories. ## Why It's Good For The Game They can be worn on their own in the suit slot, as an accessory to undersuits OR normal suits (armor, voidsuits, ect) as well as carry accessories themselves, when worn alone. * Adds Replika Specific Body Marking (#6137) ## About The Pull Request 1. **Adds Replika Body/Groin Synthskin Marking.** ## Why It's Good For The Game 1. _Extant Ward Spirit panels insufficient for design, too subtle. Adds new larger skintone paneling._ ## Changelog :cl: add: Adds Replika specific body markings. /:cl: * fixes gpses breaking on flight (#6135) Move() already calls it, so we were double calling Co-authored-by: silicons * Removes old duplicate backpack of holding singularity_act (#6130) ## About The Pull Request Funny enough, it was being overridden by the correct one https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/a5ada8e75e396738fb53a1cad39e7d5122f49f79/code/game/objects/items/storage/backpack.dm#L64-L70 * Destroys the Universe (#6129) ## About The Pull Request I kept putting off the gamemode removal (and eventual rewrite). This is a good way to start
POV ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/34761877/2dbb9b26-4728-49d3-b066-55a7014fe4f4)
* Subtypes Corporate Crates, Fixes Mapped Biohazard Crate, Renames Advanced Voidsuit (#6126) ## About The Pull Request 1. *Fixes Bug With Corporate Crates, Subtypes Them.* 2. *Removes Varedited Biohazard Bin and Places Normal Biohazard Bin.* 3. *Changes Advanced Voidsuit Name to Advanced Hardsuit.* ## Why It's Good For The Game 1. _I received reports of one specific corporate crate not rendering properly when opened. As I inspected it, I realized it would be more efficient to subtype all corporate crates, so I did that. HOWEVER, this did not repair the initial bug. For some reason the crate was not rendering its 'aethersecureopen' state, even though all variables and code seemed to be working properly. No other crate exhibited this issue. I discovered that by changing the name of the icon state from 'aethersecureopen' to 'aethersecopen', the state began to enforce and render properly. I suspected it might be a name length issue, but tests with other equally long icon states in the crate section disproved this theory. This may warrant further investigation._ 2. _This one avoided detection during my initial sweep through. Can't remember who just went in and tried to varedit bins to fix biohazards, but hopefully this is the last one they touched._ 3. _This has been driving me crazy for a few days, and yesterday especially. The Advanced Voidsuit is clearly misnamed, as it is in fact a Hardsuit. When I tried to order these yesterday I overlooked this cargo entry twice because I was looking for a hardsuit, not a voidsuit. This just fixes the name._ ## Changelog :cl: add: Adds Corporate Crate Subtype, Reassigns Corporate Crates to It. fix: Fixes incorrectly mapped biohazard bin. tweak: Changes Name: Advanced Voidsuit to Advanced Hardsuit. /:cl: * Adjusts Alarms on Shuttles (#6131) ## About The Pull Request 1. **Remaps Alarms on Multiple Shuttle Submaps.** ## Why It's Good For The Game 1. _Some shuttle submaps are not using hidden alarms. This is gonna take a little live testing and stuff._ ## Changelog :cl: fix: Replaces shuttle submap alarms with hidden variants. /:cl: * Backpacks in Loadout (#6143) ## About The Pull Request Puts all the missing backpacks (default versions) into the utility tab for matrix recoloring. Equipping a backpack from the loadout and setting yourself to spawn with the same backpack in the main screen will overwrite, and autoequip the backpack+equipment. Adds security backpack to role restricted section. ## Why It's Good For The Game You can now matrix default backpacks automatically at round start. I would have just made it a selection for all types, but there are some that aren't meant to be accessed based on role and faction. I don't want to bloat the role restricted section THAT much, yet. * Hypokit placeable on Belt Slot (#6141) ## About The Pull Request Makes hypokits able to be put on the belt slot ## Why It's Good For The Game First aid kits already do this. If we were worried about abuse via belt storage we'd prevent kits from accepting vials. * various fixes + tweaks (#6138) see files changed: - fixes lowwalls clickblocking - pipes are now smaller - fxies some table stuff - air alarms - buffs scrubbers - buffs protean blob structure damage again are you happy now @Ghostcoffeee - both buffs and nerfs metal foam - nerfs inflatables - fixes weather --------- Co-authored-by: silicons * buffs borg lights (#6140) * minor inv fixes (#6142) - fixes some grammar issues with nodrop - fixes messages for 'reconsider xyz' calls Co-authored-by: silicons * fixes storage not dropping contents on destruction (#6146) oops * Objectifies Fish (#6144) * Updates the Description for CentCom Memorials (#6113) * Ore Stacking (#6136) ## About The Pull Request - All ores have been converted to become stacks. - Various for loops have been destroyed due to ore stacks now existing. - Bluespace crystals is detyped from being ores (request of Sili) - Mining satchels have been recoded to be more like ore boxes (there's an update I'd like to do to them later that will include even bigger ore satchels so I decided this was necessary) and their capacity has been buffed to carrying 200 ores instead of 50. People can now shove up to 7 ore stacks into their backpack with this update, so I decided that made sense. - .dm file containing ore box code was renamed. - fixed a bug that allowed you to dupe ores using the ore box ("take" was called twice when inserting ores by hand) - Some minor polishing of ore box code, particularly examine code, interaction feedback, and allowing you to climb onto boxes. - Ore boxes when destroyed will drop all of their ores, unless there's too much ore (up to 200 stacks will be dropped). It'll also drop 5 hardwood planks. People who accidentally shoot their box with their PKA, rejoice. - You can craft ore boxes using 5 hardwood planks. ## Why It's Good For The Game Having ores be stackable will greatly reduce lag. Otherwise, QoL changes good. ## Changelog :cl: add: You can climb ore boxes. qol: Ore boxes will drop their contents when destroyed. You can also craft ore boxes using hardwood planks now. balance: Mining satchels can now carry 200 ores instead of 50. fix: Ore box examines look proper now. fix: Fixed a bug that allowed you to dupe ores using the ore box. imageadd: stacks_ore.dmi was added. It holds ore stack stuff. code: Orebox DM file renamed to ore_box.dm code: Bluespace crystals are detyped from being ores. refactor: Ore is now stackable. This will reduce lag when miners are out causing havoc or shoving ore onto conveyor belts. /:cl: * Removes Carpotoxin from Fish-Based Dishes (#6148) ## About The Pull Request 1. **Removes Carpotoxin from Fish-Based Dishes.** ## Why It's Good For The Game 1. _It's easy to forget about this and poison the crew. Carpotoxin in these foods made sense when we only had poisonous space carp, but now that we have a broad fishing system it doesn't do anything for us to have noob trap food items on the menu._ ## Changelog :cl: del: Removes carpotoxin from fish-based dishes. /:cl: * Fixes Broken Empty Gun Sprites (#6150) ## About The Pull Request 1. **Fixes Broken Empty States for Various Guns.** ## Why It's Good For The Game 1. _Guys please report these when you notice them. I could've fixed all of these the day after my initial change PR was merged. Fixes empty states for: p90, wt274, and JSDF battle rifle._ ## Changelog :cl: fix: Fixes missing icon sprites for empty ballistics. /:cl: * Automatic TGS DMAPI Update (#6151) This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging. Co-authored-by: tgstation-server * kevlar upgrades no longer make you immortal (#6149) guess who fucked up? * Fixes Auril Castes not being able to wear hardsuits (#6157) ## About The Pull Request idk why they have to use the cycler at all but there we go ## Why It's Good For The Game wearing hardsuits is good, especially when your body type / sprite sheet is identical to normal humans ## Changelog :cl: fix:auril castes not being able to wear hardsuits /:cl: * Skrell Update (#6153) ## About The Pull Request @granodd @Keekenox helped a TON in making these sprites! Actually most of the credit goes to them. Updates Skrell & Skrell Hair sprites: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/50931595-a881-47cb-82c5-303c3d1c2f17) Adds 3 Skrell-specific markings (feel free to use them on others but like might be ugly): ![9Al8mjVhRP](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/150b2dd8-7f6e-4bbc-9c26-8147969a249b) Base mannequin with all markings applied: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/8a896c48-7ccf-418f-ae3b-d4d8ac0ae1a0) This also changes the Skrell stats: - gives them darksight level 2 - gives them slightly more speed ## Why It's Good For The Game no more androgynous barrel sprites all hail fidelity all hail thin waist ## Changelog :cl: tweak:skrell sprites /:cl: * Makes cups of water not cups of.. what? (#6154) ## About The Pull Request As title. ## Why It's Good For The Game What even is water? Apparently, our characters don't know. Now they do. ## Changelog :cl: qol: Gave water a cup name so cups of water now appear as "cup of water" instead of "cup of.. what?" /:cl: * Mar (Adds *mar emote) (#6147) ## About The Pull Request Adds a voiced mar emote, ported from https://github.com/VOREStation/VOREStation/pull/7944. That PR has a handful of other emotes that we don't have either, if anyone else feels like porting other new ones too. https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/25853190/38bb1580-6560-4c53-aa22-5aa46f3f244f ## Why It's Good For The Game Mar. Good for shadekin. ## Changelog :cl: add: Mar. /:cl: * adds a cropped sweater (#6160) ## About The Pull Request Adds both a suit and an accessory version of a cropped sweater, sprite credit goes fully to @Keekenox Female: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/9e9bda1d-7b29-4836-9d89-df471f4432a7) M*le: ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/f9eafc2b-7a06-4c9b-bf92-55934e6ab640) ## Why It's Good For The Game it was deemed so ## Changelog :cl: add:cropped sweater /:cl: * pet peeve solved (#6152) ## About The Pull Request I changed the Vodka flavour. ## Why It's Good For The Game Because it's really silly (stupid) to say it tastes like grain alcohol. ## Changelog \- "taste_description = 'grain alcohol'" \+ "taste_description = 'potato alcohol'" :cl: tweak: vodka flavour /:cl: * runtime maploading 2/3: multiz update (#6145) 3/3 is world structs and the fun that comes with that this pr has: - transitions - new multiz system - lookup optimizations - misc updates --------- Co-authored-by: silicons * various bugfixes (#6165) - test elevator GPS - weight ignores space noslow (yikes) - accessories (rings, etc) are still weighing - hologram offsets - water breathing collapsed lungs (check vacuum on inside & outside for collapse check?) - multitools won't work for circuit debugging - test fuel rod inhands to make sure it isn't showing the funny nuke sign --------- Co-authored-by: silicons * bandaids hypospray (#6159) bandaid; see comment i'll fix it proper later * Reverts reinforced windows dropping metal rods (#6155) ## About The Pull Request Reverts the change from #5235 that makes reinforced windows drop metal rods. ## Why It's Good For The Game Reinforced glass involves metal rods, this is true, but deconstructing reinforced windows gives you 100% of the reinforced glass back already. The extra metal rods are free, you can just generate infinite rods this way. No need for 'em. ## Changelog :cl: fix: Deconstructing reinforced windows no longer gives free rods /:cl: * Byond lists start at 1 (#6168) Genetics DNA bounds were improperly set. See line 499 for why this is a problem. This is the reason why toggling genetics powers in the admin player panel sometimes fails to toggle to on, as well as some other grievances. * fixes tables & poewrnet (#6170) see title Co-authored-by: silicons * small CI system rewrite (#6166) this fixes mapmerge hooks --------- Co-authored-by: silicons * Remaps Robotics Again (11/2023) (#6162) * Renames A Soda Brand (#6167) * what'soever (#6174) ## About The Pull Request makes whatsoever not autocorrect to what'soever ## Why It's Good For The Game what'soever ## Changelog :cl: fix: autocorrect no longer corrects "whatsoever" to "what'soever" /:cl: * downgrades pyhton to 3.9.0 (#6184) tg did it this fixes the bootstrap issue no, we shouldn't do this to fix things no, i don't care if someone wants to do it better be my guest i'm not here to do devops unless it's absolutely necessary for me to do so * Ports a large snake tail from Skyrat (#6177) * fixes chaplain alt title 'Counselor' (#6175) * Buffs Borg'Os (#6173) * KyoCola Hotfix (#6172) * adds meatsicles, made by mixing protein and ice (#6178) * makes it so you can always move through ghosts (#6180) * tgui reagent guidebook & tgui updates (#6161) Co-authored-by: silicons * Makes radiation wave decay inverse square instead of exponential (#6044) * smacks the CI suite with the if: always() (#6183) * gaia sauna window fixes (#6179) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: fixed the saunas on gaia not using the right windows fix: fixed all three saunas on gaia using the same Id for tint controll /:cl: * Adds a relay spawner that autoconnects to the station comms (#6182) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: add: Added a relay spawner that autoconnects to the station comms /:cl: * Fixes black duffelbags not being lightweight (#6186) * stop drying racks taking more than one sheet of leather at a time (#6188) * Adds plantpeople physiologies, buffs alraune in snow and water turfs, turf slowdown fixes & additions (#6187) * Heat pump rebalance (TESTMERGE) (#6164) Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> * Makes pronoun selection display the actual pronouns the options give you (#6194) * Adds a coffee dispenser crate to cargo (#6196) * Fixes Crab Meat Drop (#6195) * Jukebox Additions Part Two (#6190) * shark ear port from virgo (#6192) * Atlas map bugfix catchup (#6185) ## About The Pull Request Many mapfixes including but not limited to: Gravity in security prep Scrubbers/vents in security EVA Relabeling core ejection buttons in Engineering Medical tint control fixes, and glass/electrochromic doors and windows at reception Surgery now has tintable windows/doors, and a surgery sign all linked to the same button(s) Nebula Gas Tradeport has its landing zones fixed (hopefully) Backup bodycams for sec/exploration Body/helmet cameras placed into all security/exploration lockers (some only getting bodycams due to limited access to helmets) Access fix for exploration bodycams. All exploration roles can view cameras from tablets/laptops as long as they have pilot access. +more ## Why It's Good For The Game Bugfixes and QOL additions. * Reduce the amount of mobspawners in trashpiles by 50% (#6200) ## About The Pull Request makes it so that trashpiles flip a coin on whether or not to have a mouse spawner. ## Why It's Good For The Game Honestly mice are hardly any use in game, aside from the rare character eating them, and the occasional griefer throwing tonnes of them into the bar after storing them in backpacks. Additional I dislike the constant squeeking trying to walk through maint. ## Changelog :cl: tweak: tweaked trash piles to not always spawn mice /:cl: * Gaia floorlighting starts offline (#6198) ## About The Pull Request ## Why It's Good For The Game needless strain on the game, to constantly update the lights on the dancefloor when hardly anyone is ever there ## Changelog :cl: tweak: tweaked the gaia dancefloor to start inactive, for performance reasons /:cl: * Adds Mimosas (#6203) ## About The Pull Request 1. **Adds Mimosas.** ## Why It's Good For The Game 1. _Player request. Adds a mimosa to the drink recipes._ ## Changelog :cl: add: Adds mimosas. /:cl: * fixes traits applying to observers (#6199) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: fixed the game trying to apply traits/autohiss to observers, causing occasional runtimes /:cl: * A few fixes for bots (#6205) * Job icon fixes, Job blurb spelling correction (#6204) * Adds bluespace mining satchels + BS mining satchel upgrade for minerborgs (#6189) * [TESTMERGE ONLY] Revert "Makes radiation wave decay inverse square instead of exponential" (#6193) FUCK * stop large hypovials going in non-advanced hyposprays (#6176) ## About The Pull Request title ## Why It's Good For The Game fixes a bug ## Changelog :cl: fix: stop large hypovials going in non-advanced hyposprays /:cl: * Fixes Borg-O Recipe (#6208) ## About The Pull Request 1. **Fixes Borg-O Recipe.** ## Why It's Good For The Game 1. _The recipe is still using cooking oil. Changed to tallow._ ## Changelog :cl: fix: Fixes Borg-O recipe. /:cl: * Bump axios from 0.21.4 to 1.6.0 in /tgui (#6134) Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0.
Release notes

Sourced from axios's releases.

Release v1.6.0

Release notes:

Bug Fixes

  • CSRF: fixed CSRF vulnerability CVE-2023-45857 (#6028) (96ee232)
  • dns: fixed lookup function decorator to work properly in node v20; (#6011) (5aaff53)
  • types: fix AxiosHeaders types; (#5931) (a1c8ad0)

PRs

  • CVE 2023 45857 ( #6028 )

⚠️ Critical vulnerability fix. See
https://security.snyk.io/vuln/SNYK-JS-AXIOS-6032459

Contributors to this release

Release v1.5.1

Release notes:

Bug Fixes

  • adapters: improved adapters loading logic to have clear error messages; (#5919) (e410779)
  • formdata: fixed automatic addition of the Content-Type header for FormData in non-browser environments; (#5917) (bc9af51)
  • headers: allow content-encoding header to handle case-insensitive values (#5890) (#5892) (4c89f25)
  • types: removed duplicated code (9e62056)

Contributors to this release

Release v1.5.0

Release notes:

Bug Fixes

  • adapter: make adapter loading error more clear by using platform-specific adapters explicitly (#5837) (9a414bb)
  • dns: fixed cacheable-lookup integration; (#5836) (b3e327d)
  • headers: added support for setting header names that overlap with class methods; (#5831) (d8b4ca0)
  • headers: fixed common Content-Type header merging; (#5832) (8fda276)

Features

... (truncated)

Changelog

Sourced from axios's changelog.

1.6.0 (2023-10-26)

Bug Fixes

  • CSRF: fixed CSRF vulnerability CVE-2023-45857 (#6028) (96ee232)
  • dns: fixed lookup function decorator to work properly in node v20; (#6011) (5aaff53)
  • types: fix AxiosHeaders types; (#5931) (a1c8ad0)

PRs

  • CVE 2023 45857 ( #6028 )

⚠️ Critical vulnerability fix. See
https://security.snyk.io/vuln/SNYK-JS-AXIOS-6032459

Contributors to this release

1.5.1 (2023-09-26)

Bug Fixes

  • adapters: improved adapters loading logic to have clear error messages; (#5919) (e410779)
  • formdata: fixed automatic addition of the Content-Type header for FormData in non-browser environments; (#5917) (bc9af51)
  • headers: allow content-encoding header to handle case-insensitive values (#5890) (#5892) (4c89f25)
  • types: removed duplicated code (9e62056)

Contributors to this release

PRs

  • CVE 2023 45857 ( #6028 )

⚠️ Critical vulnerability fix. See
https://security.snyk.io/vuln/SNYK-JS-AXIOS-6032459

1.5.0 (2023-08-26)

... (truncated)

Commits
  • f7adacd chore(release): v1.6.0 (#6031)
  • 9917e67 chore(ci): fix release-it arg; (#6032)
  • 96ee232 fix(CSRF): fixed CSRF vulnerability CVE-2023-45857 (#6028)
  • 7d45ab2 chore(tests): fixed tests to pass in node v19 and v20 with keep-alive enabl...
  • 5aaff53 fix(dns): fixed lookup function decorator to work properly in node v20; (#6011)
  • a48a63a chore(docs): added AxiosHeaders docs; (#5932)
  • a1c8ad0 fix(types): fix AxiosHeaders types; (#5931)
  • 2ac731d chore(docs): update readme.md (#5889)
  • 88fb52b chore(release): v1.5.1 (#5920)
  • e410779 fix(adapters): improved adapters loading logic to have clear error messages; ...
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=axios&package-manager=npm_and_yarn&previous-version=0.21.4&new-version=1.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pillow from 9.3.0 to 10.0.1 in /tools (#6171) Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.0.1.
Release notes

Sourced from pillow's releases.

10.0.1

https://pillow.readthedocs.io/en/stable/releasenotes/10.0.1.html

Changes

10.0.0

https://pillow.readthedocs.io/en/stable/releasenotes/10.0.0.html

Changes

... (truncated)

Changelog

Sourced from pillow's changelog.

10.0.1 (2023-09-15)

  • Updated libwebp to 1.3.2 #7395 [radarhere]

  • Updated zlib to 1.3 #7344 [radarhere]

10.0.0 (2023-07-01)

  • Fixed deallocating mask images #7246 [radarhere]

  • Added ImageFont.MAX_STRING_LENGTH #7244 [radarhere, hugovk]

  • Fix Windows build with pyproject.toml #7230 [hugovk, nulano, radarhere]

  • Do not close provided file handles with libtiff #7199 [radarhere]

  • Convert to HSV if mode is HSV in getcolor() #7226 [radarhere]

  • Added alpha_only argument to getbbox() #7123 [radarhere. hugovk]

  • Prioritise speed in repr_png #7242 [radarhere]

  • Do not use CFFI access by default on PyPy #7236 [radarhere]

  • Limit size even if one dimension is zero in decompression bomb check #7235 [radarhere]

  • Use --config-settings instead of deprecated --global-option #7171 [radarhere]

  • Better C integer definitions #6645 [Yay295, hugovk]

  • Fixed finding dependencies on Cygwin #7175 [radarhere]

  • Changed grabclipboard() to use PNG instead of JPG compression on macOS #7219 [abey79, radarhere]

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pillow&package-manager=pip&previous-version=9.3.0&new-version=10.0.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Autosave duration is now configureable (#6201) ## About The Pull Request 10 seconds is a bit unelastic ## Changelog :cl: admin: The autosave smite now takes a duration input. /:cl: * Nightshift v2 (#6207) Co-authored-by: silicons * Replaces the RnG of electric shocks with a more sane calculation (#6213) TL;DR Shock damage being an RnG value hard capped at 1MW with "jumps" in damage at certain breakpoints was weird so I smoothed out the math. Overall, damage is uncapped but does a little less damage. Extended answer: The old method returns burn damage to the victim in a series of five "tiers" based on the available power at the time. These tiers roll a random with disadvantage, the thresholds in question were as follows: Note that these values are rolled with disadvantage. 1kW to 50kw = 10-20 50kW to 100kW = 15-40 100kW to 200kW = 20-60 200kW to 1MW = 25-80 1MW+ = 50-160 I've replaced the math with a logarithmic that looks like this burn damage = log(1.1, power) - log(1.1, (log(1.1, power)*1.5)) which results in a smoothed out damage curve with a plateau around 1MW, as follows: 1kW = 5 10kW = 24 100kW = 45 250kW = 53 1MW = 66 10MW = 88 100MW = 110 1GW = 132 * when loading into a pAI card you can now choose to use a saved name and description (#6211) ## About The Pull Request the role you can set in character setup doesn't seem like it has a real use but if anyone badly wants it to show on examine i can do that ## Why It's Good For The Game ease of use, plus having descriptions on pAIs is nice as you can give a bit of a visual description to differentiate them ## Changelog :cl: add: when loading into a pAI card you can now choose to use a saved name and description /:cl: * add action buttons for various pAI things, clean pAI code up a bit more (#6210) ## About The Pull Request title ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/59849408/93d8232b-42e3-47ba-a889-b9fab5cfe1f0) toggle fold/unfold (icon changes depending on your current state) change chassis clothing revert shell (only shows when your card isnt your shell, currently only possible with clothing transform) hologram display (only shows when in card form) UI rewrite for pAIs is coming but i'm still learning react ## Why It's Good For The Game stuff better ## Changelog :cl: add: add action buttons for various pAI things, clean pAI up a bit more /:cl: * Firelocks & Firealarm mapping fixes, Firelock animation fix n' some other stuff (#6206) ## About The Pull Request - Removes all multi-tile firedoors on every map and replaces them with two firedoors, except on Euthenia. This is due to their lack of sprites, so they kinda need this. - Fixes the holodeck windoors on Atlas being rotated incorrectly. - Rotates a few fire alarms to their correct direction on Atlas and Triumph, too lazy to scan over and check everything else for now. Many of these misrotated fire alarms were found in maintenance. - Triumph's flagship map gets a few fixes - some misrotated wide airlocks were found that I corrected - Firedoors will now rotate based on adjacency to other firedoors. Might be good news for mappers? - Firedoor animations are also fixed. So are their sounds. ## Why It's Good For The Game Fix man good. ## Changelog :cl: fix: rip wide firelocks :^) fix: Some fire alarms were rotated correctly on Atlas and Triumph. fix: More misrotated wide airlocks were found and corrected. /:cl: * Fixes stationary portable scrubbers, and the phoronlock statemachine (#6214) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: fixed stationary scrubbers not scrubbing due to missing cells fix: fixed stationary scrubbers not having a list of gases to scrub fix: fixed the phoronlock statemachine tweak: Tweaked phoronlock controllers to care about temperature. add: added two phoronlock examples to minitest admin: added file to allow to force minitest to be loaded before compile. /:cl: * tgui embedding hooks (#6212) Co-authored-by: silicons * removes access locks from engi rigsuits on triumph (#6223) * fixes rigs being unremovable without access (#6222) * fixes ghostrole spawners spawning empty mobs when requirements arent met (#6218) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: fixes ghostrole spawners spawning empty mobs when requirements arent met /:cl: * Adds a new sound for custom votes, to prevent people from thinking they are transfer votes (#6220) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: admin: custom votes now have their own sound rather than the same as transfer votes /:cl: * fixes the tether supply shuttle not loading in properly when ordered (#6216) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: fixed the supply shuttle not transitioning to station /:cl: * fixes a machine thing (#6226) * Makes the Dataknife Fit Boots (#6224) * door tint fix & door overlay fix (#6209) ## About The Pull Request ## Why It's Good For The Game Makes behaviour more to what its intended to be ## Changelog :cl: fix: fixed how door tinting works (it was a mess) /:cl: * Baywallifies tether surface 2 (#6225) ## About The Pull Request Fixes disappearing wires on surface 2 and adapts the whole level to use the department color walls ## Why It's Good For The Game ## Changelog :cl: tweak: adapts tether surface 2 to use the department color walls /:cl: * Adapts Tether astroid level 2 for New walls and windows (#6228) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: tweak: Adapts Tether astroid level 2 for New walls and windows /:cl: * Automatic TGS DMAPI Update (#6215) This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging. Co-authored-by: tgstation-server * fixes commune not letting you commune to someone 2 tiles away (#6233) ## About The Pull Request yea this changes it so if the chimera communes on-station, it will get candidates from the station, otherwise, it'll look for candidates on the same z-level ## Why It's Good For The Game probably the intended, least weird way to do this please no more i dont want to touch that shitty proc anymore ## Changelog :cl: fix:commune chimera /:cl: * stops tape recorder attempting to play when nothing is recorded (#6236) ## About The Pull Request title ## Why It's Good For The Game fixes a runtime ## Changelog :cl: fix: stops tape recorder attempting to play when nothing is recorded /:cl: * Replaces "capsaicin" with "wasabi" in wasabi peas' taste description (#6235) ## About The Pull Request Wasabi contains no capsaicin. Its heat-inducing ingredient is [allyl isothiocyanate](https://en.wikipedia.org/wiki/Allyl_isothiocyanate). We don't have that, so I'm keeping capsaicin as the literal ingredient for the pain-causing. But still. It shouldn't be explicitly listed as a taste. ## Why It's Good For The Game My immersion ! ## Changelog :cl: tweak: Wasabi peas no longer taste like "capsaicin" /:cl: * fixes a girder runtime (#6237) ## About The Pull Request tries to do a thing on a thing without checking if the thing exists ## Why It's Good For The Game fixes a runtime ## Changelog :cl: fix: fixes a girder runtime /:cl: * Gives xenochimeras set_size (#6239) ## About The Pull Request Gives xenochimeras the /mob/living/proc/set_size verb, allowing them to switch sizes as if they had the Sizeshift trait. ## Why It's Good For The Game It definitely feels like something that can be reasonably explained in the lore, as chimeras can manipulate their own mass pretty competently already. I would've liked to implement a nutrition cost system on positive size alteration, but I'm not skilled enough to pull that off. ## Changelog :cl: tweak: Added set_size to xenochimeras /:cl: * Allows silicons(our headcoder) to hide (#6227) ## Changelog :cl: admin: Invisimins dont appear in the orbit menu /:cl: * Adapt Surface 1 (#6240) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: /:cl: * adaptation of tether surface 3 for new walls and windows (#6238) AAAAA * baywallify station1 on tether (#6219) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: tweak: baywallify station1 on tether /:cl: * qol changes for TTS (#6217) ## About The Pull Request use in hand now toggles it on and off (icon changes to show this) when turned on and in your hands or pockets, TTS works when you speak if incapacitated then this will not occur and you will speak normally (assuming you can speak at all) when whispering you get a message with less range and it says 'quietly states' instead of 'states' ## Why It's Good For The Game qol ## Changelog :cl: add: TTS devices now work automatically when you go to speak or whisper, and can be toggled on/off /:cl: * Allows negative traits to be available for everyone (+ makes a few disabilities available to all + related tweaks) (#6241) ## About The Pull Request ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/6356337/84656b88-e499-4482-8708-0463e924161c) Self-explanatory PR. Ya no longer need to be a custom species to take negative traits! There's a few extra changes in here, as well. Notably, the trait selector will no longer show you traits that are exclusive to certain species if you are not that species (like the shadekin traits, for instance). Additionally, being a non-custom species will simplify the "neutral traits" button to just "traits", with the selector having both neutral and negative traits merged together. As a treat, we've also gone the extra mile and made four negative traits available to all: monochromancy, blindness, deafness, and muteness. ## Why It's Good For The Game Some negative traits, especially notably the disabilities, can make for genuinely interesting RP in some cases! So this makes a few directly available, and makes it *much* easier to add more in the future. ## Changelog :cl: Bhijn and Myr add: Some negative traits are now available to all species, not just custom species! Non-custom species have a trait selector with all traits available to them merged together. tweak: Monochromancy, blindness, deafness, and muteness, are now available to all species qol: The trait selector will no longer show you traits that you are unable to take. /:cl: * the icecream update (small food refactor) (#6169) starts prepping the codebase for food reworks by adding dynamic ice cream :) --------- Co-authored-by: silicons * Adapt tether midpoint (#6246) * Various (mostly) mining-related map alterations (#6243) Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> * Adds a confirmation prompt for hiding items in food (#6244) * Toggle cover verb for borgs (#6247) * Mining Drill QOL changes and fixes (#6245) * [IDB IGNORE] [MDB IGNORE] Euthenia final stretch (#5958) * various fixes (#6252) see commits fixes stuff in maintainer bug triage --------- Co-authored-by: silicons * Adds river turfs (#6248) ## About The Pull Request it adds both shallow and deep river turfs, which slowly flow in one direction, and move items and mobs that way as well ## Why It's Good For The Game We have maps that have rivers, just static ones at the time ## Changelog :cl: add: Added river turfs /:cl: * Floor mounted inflatables that deploy when firedoors close (#6249) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: add: Added Floor mounted inflatables that deploy when firedoors close /:cl: * removes the cache appearance verb because it's not used anymore (#6253) * Fixes the tense on some attack verbs (#6257) ## About The Pull Request A few attack verbs use the present tense instead of present perfect. This fixes that. ## Why It's Good For The Game "Has been smacks with" looks funny ## Changelog :cl: spellcheck: Fixed the tense on some attack verbs /:cl: * ports Aurora tattoos, adds asym. socks (#6251) ## About The Pull Request adds a bunch of tattoos (From Aurora) ![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/9f9bd1f8-f834-4745-8697-06e70e55bbc1) splits up tiger stripes to each limb adds asymmetrical stirrup socks ![t4xp2J8CdG](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/c9b58b92-7d2d-407a-af34-62750534af81) ## Why It's Good For The Game request + tattoos ## Changelog :cl: add:tattoos /:cl: * Makes a couple variables not arbitrarily converted to strings for no reason (??) (#6259) ## About The Pull Request As title. ?? ## Why It's Good For The Game It causes runtimes and stuff not to work for no reason ## Changelog :cl: fix: Some mask stuff will actually work now probably /:cl: * Makes phoronlocks go to 20C instead of 22 (#6256) ## About The Pull Request Title. ## Why It's Good For The Game 22C is too hot for comfort for some species and the phoronlock heaters are so incredibly powerful that they inevitably heat the entire station to their temperature, and it really doesn't take long to do so. This is above the comfort point for some species, so this is an annoyance. Plus, it being 22C doesn't make it work faster or better or anything. It's pointless. It runs at max power until it reaches the target temperature anyway. Turning up the thermostat to make it heat faster doesn't work in real life or in-game, sorry. ## Changelog :cl: tweak: Phoronlock heaters go to 20 instead of 22 /:cl: * Refactoring Baywalls and tweaking smoothing code (#6250) ## About The Pull Request Kev keeps begging me to fix walls, so I fixed them ## Changelog :cl: fix: Walls no longer loose their paint when updated by neighbors /:cl: * standardizes wallmount orientations (#6255) Co-authored-by: silicons * TGUIifies Material Processor Console (#6260) * Adds the Neko Maid Uniform (#6267) * Shrinking the hammerhead (slightly) (#6265) Space saved: 2 tiles vertical, 4 tiles horizontal. Removes two of the six spaces for fighters. Removes the refillable air canister. * superheated epic gas cave now has a warning sign and also lava instead of water (#6258) tin * disposal fixes (#6263) dusoisal unit grammar fixed * fixes & standardizes emitter integrity (#6274) * fixes ghosts blocking people (#6275) * Add a second mime slot (#6269) ## Changelog :cl: add: Added second mime slot /:cl: * refactors bodytemperature stabilization, refactors taking organ damage, etc (#6262) Co-authored-by: silicons Co-authored-by: Zandario * Adds a new robe (#6276) * small change to throwing (#6277) Co-authored-by: silicons * adds more protogen faces, and a flat screen head (#6273) * Fixes blueshields being red (#6281) ## About The Pull Request Totally fixes a game breaking issue. ## Why It's Good For The Game They're blue not red, clearly that's why redshields are a thing ## Changelog :cl: tweak: Changes the blueshield tag from 'red' to 'blue' /:cl: * protean blob chameleon clothing (#6261) fetish code * adds a second elevator to tether (#6282) * Reworks airlock programs (#6271) ## About The Pull Request In the old version Airlock controllers used a badly implemented system for determining what to do. This PR reworks that system to use a set of defined states, in which the airlock can be. There is two kinds of states, stable and transforming. Stable states stay the same unless an order is given. Transforming states are actively altering the contents of the airlock chamber, like pressurizing. This system allows for for more reliable and predictable behaviour of airlocks. ## Why It's Good For The Game A key system for Space stations should be reliable and behave predicatable. The system that is replaced in this PR was not predicatable. ## Changelog :cl: code: Airlocks now use properly implemented statemachines /:cl: * Adds Ability targeting (#6242) ## About The Pull Request Adds a way for abilities to be targetable, including range. ![dreamseeker_LdiPg2xAvH](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/9ce5cb7c-c326-4683-ab80-36c65a8aa12a) Currently works using a carbon/human datum that is used as a middleman between the abilities and the clicks. Currently no ability uses it. ## Why It's Good For The Game Ability versatility! ## Changelog :cl: add: Ability targeting /:cl: * I went through food/drinks and fixed as I scrolled (#6283) ## About The Pull Request As title. I scrolled through and fixed things that were bothering me. Main points: 1. Most drinks now have a bit of nutritional value. Some have a lot. No more are the days when you could drink 50 peanut butter milkshakes and not get fat. 2. Alcoholic drinks were largely rebalanced. I didn't get to all of them, mostly ignored the ones that seemed made-up, but for real ones, I tried to give them strengths that actually line up with their contents. I don't know why wine was stronger than whiskey, but it suuuure was. ## Why It's Good For The Game Mechanics should at least _sorta_ line up with expectation. The fact that a drink described as "Tyrmalin grog aggressively blended with unfiltered absinthe" was one of the weakest in the game was... weird. ## Changelog :cl: tweak: Non-alcoholic drinks now generally add some nutriment tweak: Alcoholic drinks have had their strengths made a bit more logical /:cl: * fixes two walls under doors (#6280) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: fixed two doors appearing above walls, instead of floors /:cl: * minor robe / hood tweaks (#6285) * Adds examin texts for previously hidden features, as well as power pr… (#6286) …oduction ## About The Pull Request ## Why It's Good For The Game Gives robots the information they need to know that they can setup geothermal power as well. ## Changelog :cl: tweak: tweaked the examine text for geothermal power /:cl: * access controll airlocks have a simplified process proc (#6288) ## About The Pull Request ## Why It's Good For The Game ## Changelog :cl: fix: fixed access control airlocks not cycling /:cl: * Adds mapping helpers for scrubbers in airlocks, and tweaks their receive signal proc (#6287) ## About The Pull Request The portable/huge/stationary/scrubbers dont use power, and essentially delete the gases they filter out, that is bad. This PR allows those scrubbers to be replaced for the purpose of scrubbing. A second PR will follow that will add Heater that the airlocks can control, so we can rid ourselves from those monstrosities. ## Why It's Good For The Game Replaces unrealistic mechanics with more realistic ones ## Changelog :cl: add: Added mapping helpers for scrubbers in airlocks /:cl: * Fixes airlock overlays not appearing (#6290) ## About The Pull Request Technically a regression. Smart overlays do not play nice with doors for reasons unknown. ## Why It's Good For The Game some overlays actually show up now. ## Changelog * Adds "Hush (ft. Mizz Fish") by kroh to the hacked jukebox songs (#6292) ## About The Pull Request Adds ["Hush (ft. Mizz Fish)" by kroh](https://www.youtube.com/watch?v=Qflixb8ss3Q) to the hacked jukebox songs, under the Electronic tab. It's a secret song since the lyrics directly reference the Syndicate (although it's not actually technically our Syndicate), so probably not NT-approved. ## Why It's Good For The Game It's a cool song. Also the syndicate reference is kind of on the nose. * Changes around some engi points vendor options (#6293) * Minor Fixes to Chaplain Equipment (#6294) * Fixes Stormdrifter Bull Melee Immunity Bug (#6295) * Melee trait fix and balance (#6309) ## About The Pull Request This PR resolves the issue of the traits attacks not applying as well rebalancing them to be a meaningful change. As for the reason as to why: A basic human attack does 5 to 10 damage. A claw attack does 5 damage. A sharp bite does 3 damage. The numbing bite injects ~2.5 numbying enzyme per hit with 20 being the OD So not only would it mean that spending 1 point on sharp attacks would actually nerf you. But also if you went the extra mile to take the numbing bite, it would take roughly 8 hits just to reach the OD threshold. A mere toolbox does 10 damage already, a welder even 15. So you would be able to put someone into crit with just 7 hits using a welder. Making the whole trait obsolete by the most basic items. Instead I have given claws and bites a fixed damage number of 10 with a slightly better armor rating pierce. Not as powerful as Vox claws but better. As for the venomous bite, I am a bit undecided with what toxin to use and the quantity per inject. From a little testing I did, injecting 2 units of basic toxin is not a whole ton and barely feels like it has an impact. Yet this also has the potential to be stupid powerful if tuned up again. * Makes intolerance values way more "logical", easier to follow (#6304) ## About The Pull Request Before: strength of the booze didn't matter, just how much you took, and damage went up quadratically with dose. This was mostly because I didn't understand how the actual dose system worked, ha. After: damage is 50*species mod*amount metabolized/strength. This is balanced around 1 tox damage per unit of beer; you get 5x as much from deathbell, 3.333... times as much from vodka, and so on. ## Why It's Good For The Game It rarely, if ever, comes into effect, but it's best that it acts in a way that's predictable. ## Changelog :cl: tweak: Alcohol intolerance damage now makes more sense /:cl: * Corrects Cargo Cow Crate Conundrum (#6301) ## About The Pull Request 1. **Fixes Pathing Bug With Cow Crates.* ## Why It's Good For The Game 1. _It turns out the crate for furnace grubs had the same path as the cow crate, overwriting the crate so that cows became unorderable. This fixes that._ ## Changelog :cl: fix: Fixes pathing bug with cow crates. /:cl: * Makes table unflipping actually fail if it fails (#6300) ## About The Pull Request Title ## Why It's Good For The Game Table unflipping failing should fail to unflip the table ## Changelog :cl: fix: Table unflipping now fails if it fails /:cl: * Automatic TGS DMAPI Update (#6278) This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging. Co-authored-by: tgstation-server --------- Signed-off-by: dependabot[bot] Co-authored-by: TheKnightofAura <59945034+TheKnightofAura@users.noreply.github.com> Co-authored-by: Putnam3145 Co-authored-by: Zandario Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> Co-authored-by: silicons Co-authored-by: AlphaM01 <33434925+AlphaM01@users.noreply.github.com> Co-authored-by: Monara <86886852+MonaraMir@users.noreply.github.com> Co-authored-by: Captain277 Co-authored-by: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Co-authored-by: silicons-bot <121360372+silicons-bot@users.noreply.github.com> Co-authored-by: tgstation-server Co-authored-by: FreeStylaLT Co-authored-by: Shadow Co-authored-by: 死烏 <85062773+washikarasu@users.noreply.github.com> Co-authored-by: BlackMajor Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Co-authored-by: yourdoom9898 <32888098+yourdoom9898@users.noreply.github.com> Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com> Co-authored-by: deathride58 Co-authored-by: SpartanKadence <113391284+SpartanKadence@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mouseofthecake <47932666+Mouseofthecake@users.noreply.github.com> Co-authored-by: KT Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com> Co-authored-by: Mocha-Not-Latte <53068506+Mocha-Not-Latte@users.noreply.github.com> Co-authored-by: Mazian Co-authored-by: Dimasw99 --- .vscode/settings.json | 2 +- _mapload/euthenia.dm | 5 + _mapload/minitest.dm | 5 + citadel.dme | 81 +- code/__DEFINES/_flags/atom_flags.dm | 15 - code/__DEFINES/ability.dm | 6 + code/__DEFINES/atmospherics/atmos.dm | 14 +- code/__DEFINES/atmospherics/constants.dm | 14 +- code/__DEFINES/atmospherics/environmental.dm | 4 +- code/__DEFINES/color/lights.dm | 15 +- code/__DEFINES/combat/damage.dm | 4 + code/__DEFINES/dcs/signals/signals_datum.dm | 8 +- .../signals/signals_mob/signals_mob_main.dm | 2 +- .../__DEFINES/dcs/signals/signals_painting.dm | 2 +- code/__DEFINES/inventory/carry_weight.dm | 38 +- code/__DEFINES/items_clothing.dm | 14 +- code/__DEFINES/machines/airlock_states.dm | 10 + code/__DEFINES/misc/nightshift.dm | 32 + code/__DEFINES/mobs/biology.dm | 22 + code/__DEFINES/mobs/{health.dm => life.dm} | 18 +- code/__DEFINES/mobs/mobs.dm | 4 + code/__DEFINES/mobs/organs.dm | 2 + code/__DEFINES/mobs/silicon_privileges.dm | 1 + code/__DEFINES/objects/type_generation.dm | 84 + code/__DEFINES/tgs.dm | 29 +- code/__DEFINES/turfs/type_generation.dm | 3 + code/__DEFINES/vv.dm | 2 + code/__HELPERS/datastructs/priority_queue.dm | 119 +- code/__HELPERS/global_lists.dm | 4 +- code/__HELPERS/graphs/astar.dm | 6 +- code/__HELPERS/icon_smoothing.dm | 157 +- code/__HELPERS/pathfinding/astar.dm | 4 +- code/__HELPERS/pathfinding/jps.dm | 2 +- code/__HELPERS/sorts/comparators.dm | 6 +- code/_globals/lists/clothing.dm | 4 + .../controllers/configuration/config_entry.dm | 2 +- .../controllers/configuration/entries/game.dm | 34 +- .../configuration_old/configuration.dm | 19 - code/controllers/subsystem/input.dm | 9 +- code/controllers/subsystem/nanoui.dm | 2 +- code/controllers/subsystem/nightshift.dm | 7 +- code/controllers/subsystem/parallax.dm | 10 + code/controllers/subsystem/ping.dm | 3 + .../subsystem/processing/chemistry.dm | 2 +- code/controllers/subsystem/tgui.dm | 2 + code/controllers/subsystem/throwing.dm | 12 +- code/controllers/subsystem/vote.dm | 9 +- code/datums/ability.dm | 39 +- code/datums/ability_handler.dm | 31 + code/datums/action.dm | 2 + code/datums/changelog.dm | 2 +- code/datums/character_profile.dm | 4 +- code/datums/components/crafting/crafting.dm | 8 +- .../components/turfs/transition_border.dm | 42 +- code/datums/recipe/stack_recipe.dm | 8 + code/datums/underwear/socks.dm | 9 + code/datums/wires/airlock.dm | 2 +- code/datums/wires/wires.dm | 6 +- code/game/area/Ship_Station_Areas.dm | 105 + code/game/area/Space Station 13 areas.dm | 110 +- code/game/area/Tether_areas.dm | 40 + code/game/area/area.dm | 7 + code/game/atoms/movable/movement.dm | 3 +- code/game/atoms/movable/throwing.dm | 4 +- code/game/click/observer.dm | 23 - code/game/click/other_mobs.dm | 2 +- code/game/dna/dna_modifier.dm | 41 +- code/game/dna/genes/monkey.dm | 17 +- .../gamemodes/changeling/powers/absorb.dm | 8 +- .../game/gamemodes/changeling/powers/armor.dm | 4 +- .../changeling/powers/lesser_form.dm | 4 +- code/game/gamemodes/cult/cult_items.dm | 2 +- code/game/gamemodes/cult/ritual.dm | 2 +- code/game/gamemodes/cult/runes.dm | 8 +- code/game/gamemodes/cult/talisman.dm | 4 +- .../technomancer/devices/boots_of_speed.dm | 4 +- .../technomancer/devices/gloves_of_regen.dm | 4 +- .../technomancer/spells/mend_organs.dm | 2 +- code/game/machinery/_machinery.dm | 2 + .../game/machinery/_machinery_construction.dm | 4 +- code/game/machinery/atmo_control.dm | 14 +- code/game/machinery/biogenerator.dm | 8 +- code/game/machinery/bomb_tester.dm | 2 +- code/game/machinery/buttons.dm | 62 +- code/game/machinery/camera/camera.dm | 38 +- code/game/machinery/camera/camera_assembly.dm | 12 +- code/game/machinery/colormate.dm | 4 +- code/game/machinery/computer/Operating.dm | 4 +- code/game/machinery/computer/aifixer.dm | 4 +- .../machinery/computer/arcade/claw_machine.dm | 4 +- code/game/machinery/computer/arcade/orion.dm | 6 +- code/game/machinery/computer/atmos_alert.dm | 4 +- code/game/machinery/computer/command/card.dm | 15 +- code/game/machinery/computer/guestpass.dm | 4 +- code/game/machinery/computer/medical.dm | 4 +- code/game/machinery/computer/misc/bioscan.dm | 6 +- code/game/machinery/computer/prisoner.dm | 4 +- code/game/machinery/computer/robot.dm | 4 +- code/game/machinery/computer/security.dm | 4 +- code/game/machinery/computer/skills.dm | 4 +- code/game/machinery/computer/timeclock_vr.dm | 2 +- code/game/machinery/doors/airlock/airlock.dm | 82 +- .../doors/airlock/airlock_control.dm | 34 +- .../doors/airlock/airlock_electronics.dm | 4 +- .../doors/airlock/airlock_subtypes.dm | 15 +- .../machinery/doors/airlock/airlock_vr.dm | 3 - .../machinery/doors/airlock/phoronlocks.dm | 189 +- code/game/machinery/doors/door.dm | 21 +- code/game/machinery/doors/door_timer.dm | 4 +- code/game/machinery/doors/door_vr.dm | 27 - code/game/machinery/doors/firedoor.dm | 90 +- code/game/machinery/doors/multi_tile.dm | 27 +- code/game/machinery/doors/multi_tile_vr.dm | 1 - .../airlock_controllers.dm | 11 +- .../airlock_docking_controller.dm | 26 +- .../airlock_docking_controller_multi.dm | 6 +- .../embedded_controller/airlock_program.dm | 378 +- .../docking_program_multi.dm | 16 +- .../embedded_controller_base.dm | 2 +- .../embedded_controller/mapping_helpers.dm | 10 +- .../simple_docking_controller.dm | 2 +- code/game/machinery/exonet_node.dm | 4 +- code/game/machinery/fire_alarm.dm | 62 +- code/game/machinery/floor_inflatables.dm | 54 + code/game/machinery/floor_light.dm | 3 + code/game/machinery/holopad.dm | 8 +- code/game/machinery/iv_drip.dm | 10 +- code/game/machinery/jukebox.dm | 6 +- code/game/machinery/lathes/lathe.dm | 2 +- code/game/machinery/pipe/pipe_dispenser.dm | 4 +- code/game/machinery/pointdefense.dm | 2 +- .../machinery/suit_storage/suit_cycler.dm | 4 +- .../suit_storage/suit_storage_unit.dm | 14 +- code/game/machinery/telecomms/_telecomms.dm | 6 +- code/game/machinery/telecomms/logbrowser.dm | 4 +- code/game/machinery/telecomms/telemonitor.dm | 4 +- code/game/machinery/teleporter/console.dm | 2 +- code/game/machinery/turnstile.dm | 4 +- code/game/mecha/combat/combat.dm | 8 +- .../mecha/equipment/tools/armor_ranged.dm | 2 +- .../game/mecha/equipment/tools/syringe_gun.dm | 2 +- code/game/mecha/mech_fabricator.dm | 6 +- code/game/mecha/mech_prosthetics.dm | 2 +- code/game/mecha/mecha.dm | 2 +- code/game/mecha/mecha_control_console.dm | 4 +- code/game/mecha/micro/micro.dm | 8 +- code/game/mecha/working/ripley.dm | 5 +- code/game/mecha/working/working.dm | 47 - code/game/objects/effects/spiders.dm | 8 +- code/game/objects/items.dm | 20 +- code/game/objects/items/devices/PDA/PDA.dm | 4 +- .../objects/items/devices/chameleonproj.dm | 2 +- .../items/devices/communicator/UI_tgui.dm | 8 +- code/game/objects/items/devices/gps.dm | 6 +- code/game/objects/items/devices/paicard.dm | 43 + .../objects/items/devices/radio/headset.dm | 6 +- .../objects/items/devices/radio/intercom.dm | 16 + .../game/objects/items/devices/radio/radio.dm | 6 +- .../devices/tape_recorder/tape_recorder.dm | 3 + .../objects/items/devices/text_to_speech.dm | 66 +- .../objects/items/devices/transfer_valve.dm | 6 +- code/game/objects/items/glassjar.dm | 6 +- code/game/objects/items/robot/robot_parts.dm | 4 +- .../objects/items/robot/robot_upgrades.dm | 37 +- code/game/objects/items/scanners/plant.dm | 4 +- code/game/objects/items/stacks/stack.dm | 4 +- code/game/objects/items/storage/bags.dm | 14 +- code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/items/weapons/RPD.dm | 8 +- code/game/objects/items/weapons/candle.dm | 7 +- code/game/objects/items/weapons/handcuffs.dm | 2 + .../game/objects/items/weapons/hydroponics.dm | 116 - .../objects/items/weapons/implants/implant.dm | 5 +- .../objects/items/weapons/material/kitchen.dm | 4 +- .../objects/items/weapons/material/shards.dm | 8 +- .../objects/items/weapons/melee/energy.dm | 2 +- code/game/objects/items/weapons/melee/misc.dm | 2 +- code/game/objects/items/weapons/nullrod.dm | 27 +- code/game/objects/items/weapons/scrolls.dm | 2 +- code/game/objects/items/weapons/shields.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 4 +- .../game/objects/items/weapons/tanks/tanks.dm | 8 +- code/game/objects/items/weapons/trays.dm | 14 +- code/game/objects/objs.dm | 38 +- code/game/objects/random/mapping.dm | 16 +- code/game/objects/random/misc.dm | 14 +- code/game/objects/random/underdark.dm | 4 +- code/game/objects/structures/bedsheet_bin.dm | 2 +- code/game/objects/structures/catwalk.dm | 2 + .../structures/crates_lockers/crates.dm | 2 + code/game/objects/structures/girders.dm | 3 +- code/game/objects/structures/low_wall.dm | 4 +- .../objects/structures/tables/flipping.dm | 4 +- code/game/objects/structures/transit_tubes.dm | 40 +- code/game/objects/structures/watercloset.dm | 4 +- code/game/objects/structures/window.dm | 53 - .../game/objects/structures/window_spawner.dm | 1 + .../game/turfs/simulated/floor_types/river.dm | 126 + .../game/turfs/simulated/floor_types/water.dm | 3 +- .../simulated/flooring/flooring_decals.dm | 2 +- .../simulated/flooring/flooring_premade.dm | 2 + code/game/turfs/simulated/wall/materials.dm | 34 +- code/game/turfs/simulated/wall/wall.dm | 39 +- code/game/turfs/simulated/wall/wall_icon.dm | 71 +- .../turfs/simulated/wall_types/wall_types.dm | 109 +- code/game/turfs/turf.dm | 27 +- code/game/verbs/advanced_who.dm | 10 + code/game/verbs/character_directory.dm | 11 +- code/game/verbs/character_profile_verbs.dm | 16 - code/game/verbs/who.dm | 12 + code/modules/admin/admin_verbs.dm | 2 + code/modules/admin/verbs/smite.dm | 14 +- .../view_variables/color_matrix_editor.dm | 8 +- .../admin/view_variables/filteriffic.dm | 8 +- code/modules/admin/view_variables/topic.dm | 123 +- .../ai/aI_holder_subtypes/slime_xenobio_ai.dm | 2 +- code/modules/assembly/assembly.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/mousetrap.dm | 7 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/signaler.dm | 4 +- code/modules/assembly/timer.dm | 2 +- .../modules/asset_cache/asset_cache_client.dm | 4 + .../atmospherics/machinery/air_alarm.dm | 16 +- .../binary_devices/algae_generator_vr.dm | 4 +- .../components/binary_devices/heat_pump.dm | 6 +- .../binary_devices/massive_gas_pump.dm | 4 +- .../binary_devices/massive_heat_pump.dm | 4 +- .../components/binary_devices/passive_gate.dm | 4 +- .../components/binary_devices/pump.dm | 4 +- .../machinery/components/component.dm | 6 +- .../components/omni_devices/filter.dm | 4 +- .../components/omni_devices/mixer.dm | 4 +- .../components/trinary_devices/filter.dm | 6 +- .../components/trinary_devices/mixer.dm | 4 +- .../trinary_devices/molar_filter.dm | 4 +- .../machinery/components/unary/cold_sink.dm | 4 +- .../machinery/components/unary/heat_source.dm | 4 +- .../components/unary/outlet_injector.dm | 4 +- .../machinery/components/unary/vent_pump.dm | 6 +- .../components/unary/vent_scrubber.dm | 16 +- .../atmospherics/machinery/mainspipe.dm | 22 +- .../machinery/portable/area_atmos_computer.dm | 4 +- .../machinery/portable/canister.dm | 8 +- .../portable/portable_atmospherics.dm | 4 +- .../machinery/portable/powered.dm | 4 +- .../atmospherics/machinery/portable/pump.dm | 6 +- .../machinery/portable/scrubber.dm | 8 +- code/modules/cargo/supplypacks/hydroponics.dm | 5 +- code/modules/client/client_procs.dm | 48 +- code/modules/client/{ => data}/client_data.dm | 83 +- code/modules/client/{ => data}/player_data.dm | 2 + code/modules/client/onboarding/_onboarding.dm | 10 +- .../client/onboarding/age_verification.dm | 6 +- .../client/onboarding/security_checks.dm | 4 + code/modules/client/security.dm | 2 +- code/modules/client/verbs/ooc.dm | 3 + code/modules/clothing/gloves/arm_guards.dm | 2 +- code/modules/clothing/gloves/color.dm | 8 +- code/modules/clothing/gloves/miscellaneous.dm | 32 +- code/modules/clothing/head/hardhat.dm | 4 +- code/modules/clothing/head/helmet.dm | 12 +- code/modules/clothing/head/hood.dm | 14 +- code/modules/clothing/head/misc.dm | 4 +- code/modules/clothing/head/misc_special.dm | 2 +- code/modules/clothing/head/pilot_helmet.dm | 4 +- code/modules/clothing/masks/miscellaneous.dm | 4 +- code/modules/clothing/shoes/_shoes.dm | 1 + code/modules/clothing/shoes/boots.dm | 8 +- code/modules/clothing/shoes/leg_guards.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 4 +- code/modules/clothing/spacesuits/alien.dm | 4 +- .../clothing/spacesuits/miscellaneous.dm | 2 +- .../modules/clothing/spacesuits/spacesuits.dm | 4 +- code/modules/clothing/spacesuits/void/void.dm | 4 +- .../clothing/spacesuits/void/zaddat.dm | 2 +- code/modules/clothing/suits/aliens/tajara.dm | 4 +- code/modules/clothing/suits/aliens/teshari.dm | 4 +- code/modules/clothing/suits/armor.dm | 16 +- code/modules/clothing/suits/hooded.dm | 12 +- code/modules/clothing/suits/miscellaneous.dm | 30 +- code/modules/clothing/suits/utility.dm | 6 +- .../clothing/under/accessories/armor.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 11 +- .../detectivework/microscope/dnascanner.dm | 4 +- .../modules/donatorreskins/donatorclothing.dm | 4 +- code/modules/economy/machines/ATM.dm | 2 +- code/modules/events/atmos_leak.dm | 2 +- code/modules/events/canister_leak.dm | 2 +- .../examine/descriptions/engineering.dm | 2 +- code/modules/fishing/aquarium/aquarium.dm | 4 +- code/modules/fishing/equipment/catalog.dm | 2 +- code/modules/fishing/equipment/rod.dm | 4 +- .../fishing/minigame/fishing_calculator.dm | 10 +- .../fishing/minigame/fishing_minigame.dm | 8 +- code/modules/food/drinkingglass/extras.dm | 4 +- .../glass1.dm} | 0 .../{drinkingglass.dm => glass2.dm} | 0 code/modules/food/drinkingglass/metaglass.dm | 4 + code/modules/food/{food => }/drinks/bottle.dm | 370 - code/modules/food/drinks/bottle/alcohol.dm | 149 + code/modules/food/drinks/bottle/dairy.dm | 20 + code/modules/food/drinks/bottle/juice.dm | 56 + code/modules/food/drinks/bottle/misc.dm | 23 + code/modules/food/drinks/bottle/soda.dm | 23 + .../food/{food/cans.dm => drinks/can.dm} | 0 code/modules/food/drinks/carton.dm | 88 + code/modules/food/{food => }/drinks/cup.dm | 0 code/modules/food/drinks/flask.dm | 33 + code/modules/food/{food => }/drinks/jar.dm | 0 code/modules/food/drinks/misc.dm | 15 + code/modules/food/drinks/shaker.dm | 7 + code/modules/food/drinks/tea.dm | 15 + code/modules/food/food.dm | 23 +- code/modules/food/food/drinks.dm | 206 - code/modules/food/food/ice_cream.dm | 229 + code/modules/food/food/snacks.dm | 19 +- code/modules/food/kitchen/icecream.dm | 198 - .../appliance}/_appliance.dm | 0 .../appliance}/_cooker.dm | 0 .../appliance}/_cooker_output.dm | 0 .../appliance}/_mixer.dm | 0 .../appliance}/candy.dm | 0 .../appliance}/cereal.dm | 0 .../appliance}/container.dm | 0 .../appliance}/fryer.dm | 9 +- .../appliance}/grill.dm | 0 .../appliance}/oven.dm | 0 .../food/{kitchen => machinery}/gibber.dm | 0 .../food/{kitchen => machinery}/microwave.dm | 0 .../{kitchen => machinery}/smartfridge.dm | 0 .../{kitchen => machinery}/smartfridge_vr.dm | 0 code/modules/food/recipes_microwave.dm | 26 +- code/modules/food/structures/icecream_cart.dm | 243 + code/modules/gamemaster/actions/atmos_leak.dm | 2 +- .../gamemaster/actions/canister_leak.dm | 2 +- code/modules/genetics/side_effects.dm | 8 +- code/modules/ghostroles/instantiator.dm | 2 +- code/modules/ghostroles/menu.dm | 6 +- code/modules/guidebook/guidebook.dm | 6 +- code/modules/hardsuits/_rig.dm | 6 +- code/modules/hardsuits/rig_pieces.dm | 32 +- code/modules/hardsuits/rig_verbs.dm | 2 +- .../holidays/halloween_loadout_masquarade.dm | 52 +- code/modules/hydroponics/seed_machines.dm | 4 +- code/modules/hydroponics/seed_storage.dm | 2 +- code/modules/instruments/instruments/item.dm | 2 +- .../integrated_electronics/core/assemblies.dm | 4 +- .../integrated_electronics/core/detailer.dm | 4 +- .../core/integrated_circuit.dm | 6 +- .../integrated_electronics/core/printer.dm | 6 +- .../jobs/job_types/station/civillian/clown.dm | 2 +- .../job_types/station/civillian/librarian.dm | 4 +- .../jobs/job_types/station/civillian/mime.dm | 2 +- .../engineering/atmospherics_technician.dm | 2 +- .../station/engineering/senior_engineer.dm | 2 +- .../station/engineering/station_engineer.dm | 2 +- .../job_types/station/medical/head_nurse.dm | 2 +- .../station/medical/medical_doctor.dm | 6 +- .../station/science/research_director.dm | 2 +- .../job_types/station/science/scientist.dm | 6 +- .../station/science/senior_researcher.dm | 2 +- code/modules/loadout/loadout_head.dm | 5 + .../loadout/loadout_role_restricted.dm | 4 +- code/modules/loadout/loadout_suit.dm | 5 + code/modules/loot/packs/gear.dm | 2 + code/modules/mapping/map_helpers/paint.dm | 72 +- code/modules/mapping/spawner/window.dm | 1 + .../station_shuttles/euthenia_shuttles.dm | 35 + .../modules/maps/overmap/space/talon/talon.dm | 3 + code/modules/media/walkpod.dm | 4 +- code/modules/mining/drilling/drill.dm | 60 +- code/modules/mining/machine_processing.dm | 127 +- .../engineering_points_vendor.dm | 8 +- code/modules/mob/_modifiers/unholy.dm | 2 +- code/modules/mob/characteristics/ui.dm | 4 +- code/modules/mob/grab.dm | 6 +- code/modules/mob/health.dm | 1 + code/modules/mob/holder.dm | 11 +- code/modules/mob/inventory/items.dm | 2 + code/modules/mob/living/bot/SLed209bot.dm | 9 +- code/modules/mob/living/bot/cleanbot.dm | 8 +- code/modules/mob/living/bot/edCLNbot.dm | 2 +- code/modules/mob/living/bot/farmbot.dm | 2 +- code/modules/mob/living/bot/floorbot.dm | 13 +- code/modules/mob/living/bot/medibot.dm | 2 +- code/modules/mob/living/bot/mulebot.dm | 4 +- code/modules/mob/living/bot/secbot.dm | 23 +- code/modules/mob/living/carbon/carbon.dm | 2 +- .../mob/living/carbon/carbon_defines.dm | 14 +- .../modules/mob/living/carbon/damage_procs.dm | 46 + code/modules/mob/living/carbon/human/human.dm | 46 +- .../mob/living/carbon/human/human_damage.dm | 117 +- .../mob/living/carbon/human/human_defense.dm | 2 +- .../mob/living/carbon/human/human_defines.dm | 2 + code/modules/mob/living/carbon/human/life.dm | 280 +- .../mob/living/carbon/human/traits/_trait.dm | 3 + .../living/carbon/human/traits/negative.dm | 4 + .../living/carbon/human/traits/positive.dm | 18 +- code/modules/mob/living/carbon/organs.dm | 26 + code/modules/mob/living/carbon/physiology.dm | 32 + code/modules/mob/living/damage_procs.dm | 49 +- code/modules/mob/living/defense.dm | 4 +- code/modules/mob/living/health.dm | 3 + code/modules/mob/living/life.dm | 8 +- code/modules/mob/living/living.dm | 35 +- code/modules/mob/living/say.dm | 7 + .../modules/mob/living/silicon/pai/actions.dm | 89 + .../mob/living/silicon/pai/mobility.dm | 58 +- code/modules/mob/living/silicon/pai/pai.dm | 120 + code/modules/mob/living/silicon/pai/verbs.dm | 113 +- .../mob/living/silicon/robot/component.dm | 2 +- .../mob/living/silicon/robot/damage_procs.dm | 75 + .../silicon/robot/drone/damage_procs.dm | 15 + .../silicon/robot/drone/drone_console.dm | 6 +- .../silicon/robot/drone/drone_damage.dm | 6 - .../modules/mob/living/silicon/robot/robot.dm | 9 +- .../mob/living/silicon/robot/robot_damage.dm | 76 - code/modules/mob/living/silicon/silicon.dm | 8 +- .../subtypes/lavaland/stormdrifter.dm | 13 +- code/modules/mob/living/throwing.dm | 2 +- code/modules/mob/living/vv.dm | 15 + code/modules/mob/login.dm | 8 + code/modules/mob/logout.dm | 9 + code/modules/mob/mob.dm | 6 +- code/modules/mob/mob_defines.dm | 1 + code/modules/mob/new_player/join_menu.dm | 6 +- code/modules/mob/new_player/new_player.dm | 4 +- .../mob/observer/dead/observer_movement.dm | 3 + code/modules/mob/observer/dead/orbit.dm | 12 +- code/modules/mob/physiology.dm | 142 +- .../computers/modular_computer/ui.dm | 4 +- .../modular_computers/file_system/program.dm | 6 +- .../programs/antagonist/access_decrypter.dm | 2 +- .../file_system/programs/antagonist/dos.dm | 4 +- .../programs/antagonist/revelation.dm | 4 +- .../file_system/programs/command/card.dm | 26 +- .../programs/generic/file_browser.dm | 2 +- .../file_system/programs/generic/game.dm | 4 +- .../programs/generic/news_browser.dm | 2 +- .../programs/generic/ntdownloader.dm | 4 +- .../programs/generic/ntnrc_client.dm | 6 +- .../programs/generic/nttransfer.dm | 2 +- .../programs/generic/wordprocessor.dm | 2 +- .../programs/research/email_administration.dm | 2 +- .../programs/research/ntmonitor.dm | 10 +- .../programs/security/digitalwarrant.dm | 12 +- code/modules/nanites/chamber_control.dm | 4 +- code/modules/nano/nanoui.dm | 8 +- code/modules/nifsoft/nif_tgui.dm | 4 +- code/modules/nifsoft/software/05_health.dm | 2 +- code/modules/organs/external/external.dm | 351 +- code/modules/organs/external/robolimbs.dm | 15 +- code/modules/organs/internal/internal.dm | 13 + code/modules/organs/organ.dm | 14 +- .../legacy/disperser/disperser_console.dm | 2 +- .../legacy/ships/computers/engine_control.dm | 2 +- .../overmap/legacy/ships/computers/helm.dm | 2 +- .../overmap/legacy/ships/computers/sensors.dm | 2 +- .../overmap/legacy/ships/computers/ship.dm | 4 +- .../overmap/legacy/ships/computers/shuttle.dm | 2 +- code/modules/paperwork/filingcabinet.dm | 6 +- code/modules/power/apc.dm | 212 +- code/modules/power/cell.dm | 41 +- code/modules/power/generator.dm | 2 +- code/modules/power/geothermal_power.dm | 8 + code/modules/power/gravitygenerator.dm | 4 +- code/modules/power/lighting/lighting.dm | 12 +- code/modules/power/lighting/lights.dm | 27 +- code/modules/power/port_gen.dm | 4 +- code/modules/power/powernet.dm | 27 +- code/modules/power/sensors/powernet_sensor.dm | 2 +- code/modules/power/singularity/emitter.dm | 37 +- code/modules/power/smes/smes.dm | 4 +- code/modules/power/smes/smes_construction.dm | 22 +- code/modules/power/supermatter/supermatter.dm | 2 +- .../preference_setup/helpers/language_pick.dm | 6 +- .../preference_setup/helpers/species_pick.dm | 6 +- .../preference_setup/loadout/loadout.dm | 4 +- .../preference_setup/vore/08_traits.dm | 42 +- code/modules/reagents/Drink-Recipes.dm | 16 +- code/modules/reagents/chemistry/colors.dm | 1 + code/modules/reagents/chemistry/holder.dm | 102 +- code/modules/reagents/chemistry/reaction.dm | 2 +- .../reagents/Chemistry-Reagents-Dispenser.dm | 18 +- .../Chemistry-Reagents-Food-Drinks.dm | 240 +- .../reagents/Chemistry-Reagents-Medicine.dm | 2 +- .../reagents/Chemistry-Reagents-Other.dm | 2 +- .../reagents/Chemistry-Reagents-Toxins.dm | 12 +- .../chemistry/reagents/core/elements.dm | 4 +- code/modules/reagents/items/hypospray.dm | 3 + .../modules/reagents/machinery/chem_master.dm | 6 +- .../reagents/machinery/dispenser/dispenser.dm | 8 +- .../reagents/reagent_containers/syringes.dm | 11 +- code/modules/recycling/conveyor2.dm | 4 + code/modules/recycling/disposal.dm | 49 +- code/modules/recycling/sortingmachinery.dm | 4 +- code/modules/research/designs/mining_toys.dm | 7 + .../research/designs/prosfab_designs.dm | 8 + .../research/machinery/rdconsole_tgui.dm | 6 +- code/modules/research/machinery/server.dm | 4 +- code/modules/resleeving/infomorph.dm | 5 +- code/modules/sculpting/sculpting_block.dm | 2 +- .../security levels/security levels.dm | 2 +- code/modules/shieldgen/shield_generator.dm | 4 +- code/modules/shuttles/escape_pods.dm | 6 +- code/modules/shuttles/shuttle_console.dm | 4 +- .../modules/shuttles/shuttle_console_multi.dm | 2 +- code/modules/shuttles/shuttles_web.dm | 4 +- code/modules/species/promethean/promethean.dm | 2 +- code/modules/species/protean/protean.dm | 2 +- code/modules/species/protean/protean_blob.dm | 177 +- code/modules/species/shadekin/shadekin.dm | 2 +- .../species/shadekin/shadekin_blackeyed.dm | 2 +- code/modules/species/species.dm | 6 +- code/modules/species/species_attack.dm | 23 + code/modules/species/species_shapeshift.dm | 2 +- code/modules/species/station/adherent.dm | 2 +- code/modules/species/station/alraune.dm | 4 +- .../modules/species/station/custom_species.dm | 2 +- code/modules/species/station/diona.dm | 2 +- code/modules/species/station/phoronoids.dm | 6 +- .../species/station/standard/tajaran.dm | 2 +- .../species/station/standard/teshari.dm | 2 +- .../species/station/standard/zaddat.dm | 2 +- code/modules/species/station/vasilissan.dm | 2 +- code/modules/species/station/xenochimera.dm | 25 +- .../station/xenomorph_hybrids/xeno_hybrids.dm | 2 +- .../modules/species/virtual_reality/avatar.dm | 2 +- .../species/xenomorphs/alien_embryo.dm | 2 +- .../species/xenomorphs/alien_facehugger.dm | 4 +- .../species/xenomorphs/alien_species.dm | 12 +- .../sprite_accessories/markings/tattoo.dm | 360 + code/modules/stockmarket/computer.dm | 12 +- code/modules/surgery/other.dm | 4 +- code/modules/surgery/robotics.dm | 2 +- code/modules/tgs/core/core.dm | 11 +- code/modules/tgs/v5/__interop_version.dm | 2 +- code/modules/tgs/v5/_defines.dm | 2 +- code/modules/tgs/v5/api.dm | 75 +- code/modules/tgs/v5/bridge.dm | 13 +- code/modules/tgs/v5/topic.dm | 1 + code/modules/tgs/v5/undefs.dm | 2 +- code/modules/tgui/client.dm | 88 + code/modules/tgui/datum.dm | 331 + code/modules/tgui/external.dm | 300 - .../tgui/{ => legacy}/modal_vr_legacy.dm | 0 code/modules/tgui/mob.dm | 15 + code/modules/tgui/modals/tgui_alert.dm | 10 +- .../modules/tgui/modals/tgui_dynamic_input.dm | 4 +- code/modules/tgui/modals/tgui_input_list.dm | 10 +- code/modules/tgui/modals/tgui_input_number.dm | 10 +- code/modules/tgui/modals/tgui_input_text.dm | 10 +- code/modules/tgui/module.dm | 103 +- code/modules/tgui/modules/_base.dm | 8 +- .../tgui/modules/admin_shuttle_controller.dm | 4 +- code/modules/tgui/modules/agentcard.dm | 22 +- code/modules/tgui/modules/alarm.dm | 14 +- .../tgui/modules/appearance_changer.dm | 6 +- .../tgui/modules/appearance_changer_vr.dm | 6 +- code/modules/tgui/modules/atmos_control.dm | 10 +- code/modules/tgui/modules/camera.dm | 8 +- code/modules/tgui/modules/communications.dm | 4 +- code/modules/tgui/modules/crew_manifest.dm | 4 +- code/modules/tgui/modules/crew_monitor.dm | 10 +- code/modules/tgui/modules/general/cardmod.dm | 2 +- code/modules/tgui/modules/gyrotron_control.dm | 4 +- code/modules/tgui/modules/law_manager.dm | 6 +- .../tgui/modules/ntos-only/configurator.dm | 4 +- code/modules/tgui/modules/ntos-only/email.dm | 4 +- code/modules/tgui/modules/ntos-only/uav.dm | 6 +- code/modules/tgui/modules/overmap.dm | 14 +- code/modules/tgui/modules/power_monitor.dm | 6 +- code/modules/tgui/modules/rcon.dm | 6 +- code/modules/tgui/modules/rustcore_monitor.dm | 4 +- code/modules/tgui/modules/rustfuel_control.dm | 4 +- code/modules/tgui/modules/shutoff_monitor.dm | 4 +- .../tgui/modules/supermatter_monitor.dm | 4 +- code/modules/tgui/modules/teleporter.dm | 4 +- code/modules/tgui/states.dm | 31 - code/modules/tgui/tgui.dm | 148 +- code/modules/turbolift/turbolift_door.dm | 4 +- code/modules/turbolift/turbolift_map.dm | 1 + .../modules/unit_tests/core/priority_queue.dm | 4 +- code/modules/ventcrawl/ventcrawl.dm | 8 +- code/modules/virus2/centrifuge.dm | 4 +- code/modules/virus2/diseasesplicer.dm | 2 +- code/modules/virus2/immunesystem.dm | 2 +- code/modules/virus2/isolator.dm | 4 +- code/modules/vore/eating/vore_vr.dm | 7 - .../modules/vore/fluffstuff/custom_clothes.dm | 4 +- code/modules/vore/fluffstuff/custom_items.dm | 2 +- code/modules/vore/fluffstuff/guns/gunsword.dm | 2 +- code/modules/vore/hook-defs_vr.dm | 2 - code/modules/vore/resizing/resize_vr.dm | 10 +- .../xenoarcheaology/artifacts/replicator.dm | 2 +- .../tools/ano_device_battery.dm | 4 +- .../tools/artifact_analyser.dm | 2 +- .../tools/artifact_harvester.dm | 2 +- .../tools/geosample_scanner.dm | 2 +- .../tools/suspension_generator.dm | 2 +- code/modules/xenoarcheaology/tools/tools.dm | 8 +- config/entries/game.txt | 25 +- config_static/jukebox.json | 10 + icons/clothing/head/aureate.dmi | Bin 0 -> 1071 bytes icons/clothing/suit/coats/aureate_kimono.dmi | Bin 0 -> 854 bytes icons/clothing/uniform/misc/neko.dmi | Bin 0 -> 866 bytes icons/machinery/security_camera.dmi | Bin 0 -> 4323 bytes icons/misc/map_helpers.dmi | Bin 916 -> 996 bytes icons/mob/clothing/back.dmi | Bin 214387 -> 215144 bytes icons/mob/clothing/ears.dmi | Bin 20372 -> 22020 bytes icons/mob/clothing/eyes.dmi | Bin 22635 -> 23948 bytes icons/mob/clothing/feet.dmi | Bin 77972 -> 78782 bytes icons/mob/clothing/hands.dmi | Bin 44371 -> 45266 bytes icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi | Bin 0 -> 448 bytes icons/mob/human.dmi | Bin 100177 -> 99594 bytes icons/mob/monitor_icons.dmi | Bin 15666 -> 17831 bytes .../sprite_accessories/markings/tatoos.dmi | Bin 1843 -> 8192 bytes icons/modules/atmospherics/air_alarm.dmi | Bin 0 -> 2600 bytes icons/modules/food/items/ice_cream.dmi | Bin 0 -> 1523 bytes icons/modules/food/structures/ice_cream.dmi | Bin 0 -> 562 bytes icons/obj/apc.dmi | Bin 4028 -> 13134 bytes icons/obj/doors/double/door.dmi | Bin 16648 -> 56809 bytes icons/obj/doors/double/lights_deny.dmi | Bin 6227 -> 0 bytes icons/obj/doors/external/door.dmi | Bin 6177 -> 32298 bytes icons/obj/doors/external/lights_deny.dmi | Bin 2973 -> 0 bytes icons/obj/doors/hatch/door.dmi | Bin 6949 -> 27534 bytes icons/obj/doors/hatch/lights_deny.dmi | Bin 2534 -> 0 bytes icons/obj/doors/hazard/floor_inflatables.dmi | Bin 0 -> 519 bytes icons/obj/doors/station/door.dmi | Bin 5372 -> 24147 bytes icons/obj/doors/station/lights_deny.dmi | Bin 2960 -> 0 bytes icons/obj/doors/vault/door.dmi | Bin 5580 -> 5695 bytes icons/obj/doors/vault/panel.dmi | Bin 0 -> 629 bytes icons/obj/drinks.dmi | Bin 166050 -> 166439 bytes icons/obj/firealarm.dmi | Bin 4407 -> 4025 bytes .../electronic_setups.dmi | Bin 41161 -> 18253 bytes icons/obj/kitchen.dmi | Bin 22645 -> 20198 bytes icons/obj/monitors.dmi | Bin 31260 -> 10978 bytes icons/screen/actions/pai.dmi | Bin 0 -> 2556 bytes icons/screen/atom_hud/job.dmi | Bin 1982 -> 1978 bytes icons/turf/outdoors.dmi | Bin 248695 -> 248697 bytes icons/turf/river.dmi | Bin 0 -> 122315 bytes interface/interface.dm | 5 + maps/UTILITY_REGEXES.md | 10 + maps/away_missions/140x140/carpfarm.dmm | 11 +- maps/away_missions/140x140/snow_outpost.dmm | 58 +- maps/away_missions/140x140/snowfield.dmm | 6 +- maps/away_missions/archive/Academy.dmm | 12 +- .../archive/blackmarketpackers.dmm | 9 +- maps/away_missions/archive/example.dmm | 5 +- .../archive/stationCollision.dmm | 35 +- maps/away_missions/archive/zresearchlabs.dmm | 134 +- maps/euthenia/levels/deck0.dmm | 7376 +- maps/euthenia/levels/deck1.dmm | 19732 +++-- maps/euthenia/levels/deck2.dmm | 24027 +++--- maps/euthenia/levels/deck3.dmm | 16951 ++-- maps/euthenia/levels/deck4.dmm | 69720 +++++++++------- maps/euthenia/levels/misc.dmm | 8842 +- maps/euthenia/shuttle_stub.dm | 10 + maps/generic/turbolifts.dm | 46 + maps/map_levels/140x140/fueldepot.dmm | 3 +- maps/map_levels/140x140/lavaland_dungeon.dmm | 5 +- maps/map_levels/140x140/talon/talon1.dmm | 129 +- maps/map_levels/140x140/talon/talon2.dmm | 95 +- maps/map_levels/192x192/fueldepot.dmm | 3 +- maps/minitest/levels/minitest.dmm | 1304 +- maps/minitest/levels/sector1.dmm | 10 +- maps/rift/levels/rift-01-underground3.dmm | 9 +- maps/rift/levels/rift-02-underground2.dmm | 479 +- maps/rift/levels/rift-03-underground1.dmm | 322 +- maps/rift/levels/rift-04-surface1.dmm | 811 +- maps/rift/levels/rift-05-surface2.dmm | 2002 +- maps/rift/levels/rift-06-surface3.dmm | 431 +- maps/rift/levels/rift-07-west_base.dmm | 3 +- maps/rift/levels/rift-08-west_deep.dmm | 7573 +- maps/rift/levels/rift-09-west_caves.dmm | 62 +- maps/rift/levels/rift-10-west_plains.dmm | 220 +- maps/rift/levels/rift-11-orbital.dmm | 44 +- .../debrisfield_140/levels/debrisfield.dmm | 4 +- .../debrisfield_192/levels/debrisfield.dmm | 4 +- maps/sectors/frozen_140/levels/frozen_140.dmm | 4 +- maps/sectors/frozen_192/levels/frozen_192.dmm | 4 +- maps/sectors/gaia_140/levels/gaia_140.dmm | 6 +- maps/sectors/gaia_192/levels/gaia_192.dmm | 3052 +- .../lavaland_140/levels/lavaland_140.dmm | 107 +- .../lavaland_140/levels/lavaland_140_east.dmm | 13 +- .../lavaland_192/levels/lavaland_192.dmm | 32635 ++++---- .../miaphus_192/levels/miaphus_192_beach.dmm | 48 +- maps/sectors/mining_140/levels/mining_140.dmm | 1 - maps/sectors/mining_192/levels/mining_192.dmm | 1 - .../piratebase_140/levels/piratebase_140.dmm | 7 +- .../piratebase_192/levels/piratebase_192.dmm | 187 +- .../tradeport_140/levels/tradeport_140.dmm | 162 +- .../tradeport_192/levels/tradeport_192.dmm | 134 +- .../virgo2_140/levels/virgo2_140_aerostat.dmm | 5 +- .../virgo4_140/levels/virgo4_140_beach.dmm | 24 +- .../wasteland_140/levels/wasteland_140.dmm | 43 +- .../wasteland_192/levels/wasteland_192.dmm | 43 +- .../class_d/Possesed_mech_cave.dmm | 4 +- .../class_p/HeadscientistHQ.dmm | 3 +- .../level_specific/debrisfield/clownship.dmm | 20 +- .../level_specific/debrisfield/derelict.dmm | 27 +- .../debrisfield_vr/debris14.dmm | 3 +- .../debrisfield_vr/derelict.dmm | 36 +- .../debrisfield_vr/gecko_cr_wreck.dmm | 44 +- .../debrisfield_vr/mining_drones.dmm | 3 +- .../debrisfield_vr/old_teleporter.dmm | 3 +- .../debrisfield_vr/salamander_wreck.dmm | 67 +- .../debrisfield_vr/tinycarrier.dmm | 32 +- .../virgo2/Blackshuttledown.dmm | 6 +- .../level_specific/virgo2/CrashedSmuggler.dmm | 5 +- .../level_specific/virgo2/DJOutpost1.dmm | 6 +- maps/submaps/level_specific/virgo2/DoomP.dmm | 7 +- maps/submaps/level_specific/virgo2/Epod4.dmm | 1 - maps/submaps/level_specific/virgo2/Lab1.dmm | 6 +- maps/submaps/level_specific/virgo2/Manor1.dmm | 2 +- .../level_specific/virgo2/Rockybase.dmm | 6 +- .../caves/west_caves_buriedstructure_1.dmm | 2 +- .../caves/west_caves_buriedstructure_2.dmm | 2 +- maps/submaps/mountains/Mineshaft1.dmm | 5 +- maps/submaps/mountains/Rockb1.dmm | 7 +- maps/submaps/mountains/crashed_ufo.dmm | 2 +- maps/submaps/mountains/quarantineshuttle.dmm | 1 - maps/submaps/plains/Epod.dmm | 1 - maps/submaps/wilderness/Blackshuttledown.dmm | 6 +- maps/submaps/wilderness/Blueshuttledown.dmm | 6 +- maps/submaps/wilderness/DJOutpost1.dmm | 6 +- maps/submaps/wilderness/DJOutpost3.dmm | 6 +- maps/submaps/wilderness/DJOutpost4.dmm | 6 +- maps/submaps/wilderness/DoomP.dmm | 6 +- maps/submaps/wilderness/Epod4.dmm | 1 - maps/submaps/wilderness/Lab1.dmm | 6 +- maps/submaps/wilderness/Manor1.dmm | 2 +- maps/submaps/wilderness/Rockybase.dmm | 6 +- maps/templates/admin/dhael_centcom.dmm | 14 +- maps/templates/admin/dojo.dmm | 2 +- maps/templates/admin/ert.dmm | 292 +- maps/templates/admin/ert_base.dmm | 8 +- maps/templates/admin/killhouse1.dmm | 4 +- maps/templates/admin/killhouse2.dmm | 9 +- maps/templates/admin/killhouseteleporter.dmm | 2 +- maps/templates/admin/kk_mercship.dmm | 307 +- maps/templates/admin/mercbase.dmm | 7 +- maps/templates/admin/skipjack.dmm | 8 +- maps/templates/admin/wizard.dmm | 4 - maps/templates/archive/tradeship.dmm | 4 +- .../shuttles/overmaps/generic/bearcat.dmm | 45 +- .../shuttles/overmaps/generic/cruise_ship.dmm | 4 +- .../shuttles/overmaps/generic/cruiser.dmm | 290 +- .../shuttles/overmaps/generic/curashuttle.dmm | 20 +- .../shuttles/overmaps/generic/gecko_cr.dmm | 48 +- .../shuttles/overmaps/generic/gecko_sh.dmm | 44 +- .../overmaps/generic/generic_shuttle.dmm | 8 +- .../overmaps/generic/hybridshuttle.dmm | 6 +- .../shuttles/overmaps/generic/itglight.dmm | 74 +- .../shuttles/overmaps/generic/mackerel_hc.dmm | 2 +- .../overmaps/generic/mackerel_hc_skel.dmm | 12 +- .../shuttles/overmaps/generic/mackerel_lc.dmm | 2 +- .../shuttles/overmaps/generic/mackerel_sh.dmm | 2 +- .../overmaps/generic/mercenarybase.dmm | 100 +- .../shuttles/overmaps/generic/mercship.dmm | 84 +- .../shuttles/overmaps/generic/salamander.dmm | 35 +- .../shuttles/overmaps/generic/screebarge.dmm | 6 +- .../shuttles/overmaps/generic/shelter_5.dmm | 6 +- .../shuttles/overmaps/generic/shelter_6.dmm | 10 +- .../shuttles/overmaps/generic/vespa.dmm | 205 +- maps/tether/engines.dm | 4 +- maps/tether/engines/rust.dmm | 190 +- maps/tether/engines/singulo.dmm | 31 +- maps/tether/engines/sme.dmm | 216 +- maps/tether/engines/tesla.dmm | 160 +- maps/tether/levels/midpoint.dmm | 1726 +- maps/tether/levels/mining.dmm | 267 +- maps/tether/levels/misc.dmm | 7079 +- maps/tether/levels/plains.dmm | 82 +- maps/tether/levels/station1.dmm | 48751 ++++++----- maps/tether/levels/station2.dmm | 64654 +++++++------- maps/tether/levels/surface1.dmm | 5141 +- maps/tether/levels/surface2.dmm | 4029 +- maps/tether/levels/surface3.dmm | 7257 +- maps/tether/levels/underdark.dmm | 7 +- maps/triumph/engines/burn.dmm | 16 +- maps/triumph/engines/fission.dmm | 30 +- maps/triumph/engines/rust.dmm | 22 +- maps/triumph/engines/sme.dmm | 25 +- maps/triumph/levels/deck1.dmm | 297 +- maps/triumph/levels/deck2.dmm | 554 +- maps/triumph/levels/deck3.dmm | 739 +- maps/triumph/levels/deck4.dmm | 868 +- maps/triumph/levels/flagship.dmm | 47 +- sound/custom_vote.ogg | Bin 0 -> 62451 bytes tgui/packages/tgui-dev-server/package.json | 2 +- .../tgui/interfaces/EmbeddedController.js | 12 + .../tgui/interfaces/ExosuitFabricator.js | 2 + .../tgui/interfaces/MaterialProcessor.tsx | 158 + .../tgui/interfaces/machines/IcecreamCart.tsx | 88 + tgui/yarn.lock | 29 +- tools/dmi/__init__.py | 37 +- 798 files changed, 182607 insertions(+), 171103 deletions(-) create mode 100644 _mapload/euthenia.dm create mode 100644 _mapload/minitest.dm create mode 100644 code/__DEFINES/machines/airlock_states.dm create mode 100644 code/__DEFINES/misc/nightshift.dm create mode 100644 code/__DEFINES/mobs/biology.dm rename code/__DEFINES/mobs/{health.dm => life.dm} (60%) create mode 100644 code/__DEFINES/objects/type_generation.dm create mode 100644 code/datums/ability_handler.dm create mode 100644 code/game/machinery/floor_inflatables.dm delete mode 100644 code/game/objects/items/weapons/hydroponics.dm create mode 100644 code/game/turfs/simulated/floor_types/river.dm delete mode 100644 code/game/verbs/character_profile_verbs.dm rename code/modules/client/{ => data}/client_data.dm (95%) rename code/modules/client/{ => data}/player_data.dm (98%) rename code/modules/food/{food/drinks/drinkingglass.dm => drinkingglass/glass1.dm} (100%) rename code/modules/food/drinkingglass/{drinkingglass.dm => glass2.dm} (100%) rename code/modules/food/{food => }/drinks/bottle.dm (52%) create mode 100644 code/modules/food/drinks/bottle/alcohol.dm create mode 100644 code/modules/food/drinks/bottle/dairy.dm create mode 100644 code/modules/food/drinks/bottle/juice.dm create mode 100644 code/modules/food/drinks/bottle/misc.dm create mode 100644 code/modules/food/drinks/bottle/soda.dm rename code/modules/food/{food/cans.dm => drinks/can.dm} (100%) create mode 100644 code/modules/food/drinks/carton.dm rename code/modules/food/{food => }/drinks/cup.dm (100%) create mode 100644 code/modules/food/drinks/flask.dm rename code/modules/food/{food => }/drinks/jar.dm (100%) create mode 100644 code/modules/food/drinks/misc.dm create mode 100644 code/modules/food/drinks/shaker.dm create mode 100644 code/modules/food/drinks/tea.dm create mode 100644 code/modules/food/food/ice_cream.dm delete mode 100644 code/modules/food/kitchen/icecream.dm rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/_appliance.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/_cooker.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/_cooker_output.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/_mixer.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/candy.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/cereal.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/container.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/fryer.dm (98%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/grill.dm (100%) rename code/modules/food/{kitchen/cooking_machines => machinery/appliance}/oven.dm (100%) rename code/modules/food/{kitchen => machinery}/gibber.dm (100%) rename code/modules/food/{kitchen => machinery}/microwave.dm (100%) rename code/modules/food/{kitchen => machinery}/smartfridge.dm (100%) rename code/modules/food/{kitchen => machinery}/smartfridge_vr.dm (100%) create mode 100644 code/modules/food/structures/icecream_cart.dm create mode 100644 code/modules/maps/generic/shuttles/station_shuttles/euthenia_shuttles.dm create mode 100644 code/modules/mob/living/carbon/damage_procs.dm create mode 100644 code/modules/mob/living/carbon/organs.dm create mode 100644 code/modules/mob/living/carbon/physiology.dm create mode 100644 code/modules/mob/living/silicon/pai/actions.dm create mode 100644 code/modules/mob/living/silicon/robot/damage_procs.dm create mode 100644 code/modules/mob/living/silicon/robot/drone/damage_procs.dm create mode 100644 code/modules/mob/living/vv.dm create mode 100644 code/modules/tgui/client.dm create mode 100644 code/modules/tgui/datum.dm delete mode 100644 code/modules/tgui/external.dm rename code/modules/tgui/{ => legacy}/modal_vr_legacy.dm (100%) create mode 100644 code/modules/tgui/mob.dm create mode 100644 icons/clothing/head/aureate.dmi create mode 100644 icons/clothing/suit/coats/aureate_kimono.dmi create mode 100644 icons/clothing/uniform/misc/neko.dmi create mode 100644 icons/machinery/security_camera.dmi create mode 100644 icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi create mode 100644 icons/modules/atmospherics/air_alarm.dmi create mode 100644 icons/modules/food/items/ice_cream.dmi create mode 100644 icons/modules/food/structures/ice_cream.dmi delete mode 100644 icons/obj/doors/double/lights_deny.dmi delete mode 100644 icons/obj/doors/external/lights_deny.dmi delete mode 100644 icons/obj/doors/hatch/lights_deny.dmi create mode 100644 icons/obj/doors/hazard/floor_inflatables.dmi delete mode 100644 icons/obj/doors/station/lights_deny.dmi create mode 100644 icons/obj/doors/vault/panel.dmi create mode 100644 icons/screen/actions/pai.dmi create mode 100644 icons/turf/river.dmi create mode 100644 maps/UTILITY_REGEXES.md create mode 100644 maps/euthenia/shuttle_stub.dm create mode 100644 sound/custom_vote.ogg create mode 100644 tgui/packages/tgui/interfaces/MaterialProcessor.tsx create mode 100644 tgui/packages/tgui/interfaces/machines/IcecreamCart.tsx diff --git a/.vscode/settings.json b/.vscode/settings.json index 4fa8059898..11e44342bd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,7 +10,7 @@ "**/.pnp.*": true }, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "files.eol": "\n", "files.insertFinalNewline": true, diff --git a/_mapload/euthenia.dm b/_mapload/euthenia.dm new file mode 100644 index 0000000000..1e8222e521 --- /dev/null +++ b/_mapload/euthenia.dm @@ -0,0 +1,5 @@ +#ifdef FORCE_MAP + #error Duplicate FORCE_MAP, what are you doing!? +#endif + +#define FORCE_MAP "euthenia" diff --git a/_mapload/minitest.dm b/_mapload/minitest.dm new file mode 100644 index 0000000000..14f378fa88 --- /dev/null +++ b/_mapload/minitest.dm @@ -0,0 +1,5 @@ +#ifdef FORCE_MAP + #error Duplicate FORCE_MAP, what are you doing!? +#endif + +#define FORCE_MAP "minitest" diff --git a/citadel.dme b/citadel.dme index ecbcfbf779..c9414d382a 100644 --- a/citadel.dme +++ b/citadel.dme @@ -222,6 +222,7 @@ #include "code\__DEFINES\languages\ids.dm" #include "code\__DEFINES\languages\legacy.dm" #include "code\__DEFINES\languages\translation.dm" +#include "code\__DEFINES\machines\airlock_states.dm" #include "code\__DEFINES\machines\door.dm" #include "code\__DEFINES\mapping\levels.dm" #include "code\__DEFINES\mapping\maploader.dm" @@ -238,17 +239,20 @@ #include "code\__DEFINES\mining\legacy.dm" #include "code\__DEFINES\misc\attack_animations.dm" #include "code\__DEFINES\misc\message_ranges.dm" +#include "code\__DEFINES\misc\nightshift.dm" #include "code\__DEFINES\mobs\actions.dm" +#include "code\__DEFINES\mobs\biology.dm" #include "code\__DEFINES\mobs\characteristics.dm" #include "code\__DEFINES\mobs\grab.dm" -#include "code\__DEFINES\mobs\health.dm" #include "code\__DEFINES\mobs\intent.dm" +#include "code\__DEFINES\mobs\life.dm" #include "code\__DEFINES\mobs\mobility.dm" #include "code\__DEFINES\mobs\mobs.dm" #include "code\__DEFINES\mobs\organs.dm" #include "code\__DEFINES\mobs\silicon_privileges.dm" #include "code\__DEFINES\mobs\sprite_accessories.dm" #include "code\__DEFINES\mobs\stat.dm" +#include "code\__DEFINES\objects\type_generation.dm" #include "code\__DEFINES\overmaps\misc.dm" #include "code\__DEFINES\overmaps\overmap.dm" #include "code\__DEFINES\power\balancing.dm" @@ -605,6 +609,7 @@ #include "code\controllers\subsystem\sound\channel_manager.dm" #include "code\controllers\subsystem\sound\soundbyte_manager.dm" #include "code\datums\ability.dm" +#include "code\datums\ability_handler.dm" #include "code\datums\access.dm" #include "code\datums\action.dm" #include "code\datums\ai_law_sets.dm" @@ -1192,6 +1197,7 @@ #include "code\game\machinery\fire_alarm.dm" #include "code\game\machinery\flasher.dm" #include "code\game\machinery\floodlight.dm" +#include "code\game\machinery\floor_inflatables.dm" #include "code\game\machinery\floor_light.dm" #include "code\game\machinery\floorlayer.dm" #include "code\game\machinery\fossilrevive.dm" @@ -1983,6 +1989,7 @@ #include "code\game\turfs\simulated\floor_types\lava.dm" #include "code\game\turfs\simulated\floor_types\outdoors.dm" #include "code\game\turfs\simulated\floor_types\outdoors_attackby.dm" +#include "code\game\turfs\simulated\floor_types\river.dm" #include "code\game\turfs\simulated\floor_types\sky.dm" #include "code\game\turfs\simulated\floor_types\snow.dm" #include "code\game\turfs\simulated\floor_types\water.dm" @@ -2012,7 +2019,6 @@ #include "code\game\turfs\unsimulated\walls.dm" #include "code\game\verbs\advanced_who.dm" #include "code\game\verbs\character_directory.dm" -#include "code\game\verbs\character_profile_verbs.dm" #include "code\game\verbs\ignore.dm" #include "code\game\verbs\suicide.dm" #include "code\game\verbs\who.dm" @@ -2346,13 +2352,11 @@ #include "code\modules\catalogue\cataloguer_visuals.dm" #include "code\modules\catalogue\cataloguer_vr.dm" #include "code\modules\client\client.dm" -#include "code\modules\client\client_data.dm" #include "code\modules\client\client_procs.dm" #include "code\modules\client\connection.dm" #include "code\modules\client\cutscene.dm" #include "code\modules\client\legacy.dm" #include "code\modules\client\perspective.dm" -#include "code\modules\client\player_data.dm" #include "code\modules\client\security.dm" #include "code\modules\client\spam_prevention.dm" #include "code\modules\client\statpanel.dm" @@ -2360,6 +2364,8 @@ #include "code\modules\client\ui_style.dm" #include "code\modules\client\viewport.dm" #include "code\modules\client\wrappers.dm" +#include "code\modules\client\data\client_data.dm" +#include "code\modules\client\data\player_data.dm" #include "code\modules\client\onboarding\_onboarding.dm" #include "code\modules\client\onboarding\age_verification.dm" #include "code\modules\client\onboarding\panic_bunker.dm" @@ -2637,42 +2643,53 @@ #include "code\modules\food\recipes_fryer.dm" #include "code\modules\food\recipes_microwave.dm" #include "code\modules\food\recipes_oven.dm" -#include "code\modules\food\drinkingglass\drinkingglass.dm" #include "code\modules\food\drinkingglass\extras.dm" +#include "code\modules\food\drinkingglass\glass1.dm" +#include "code\modules\food\drinkingglass\glass2.dm" #include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\metaglass.dm" #include "code\modules\food\drinkingglass\shaker.dm" -#include "code\modules\food\food\cans.dm" +#include "code\modules\food\drinks\bottle.dm" +#include "code\modules\food\drinks\can.dm" +#include "code\modules\food\drinks\carton.dm" +#include "code\modules\food\drinks\cup.dm" +#include "code\modules\food\drinks\flask.dm" +#include "code\modules\food\drinks\jar.dm" +#include "code\modules\food\drinks\misc.dm" +#include "code\modules\food\drinks\shaker.dm" +#include "code\modules\food\drinks\tea.dm" +#include "code\modules\food\drinks\bottle\alcohol.dm" +#include "code\modules\food\drinks\bottle\dairy.dm" +#include "code\modules\food\drinks\bottle\juice.dm" +#include "code\modules\food\drinks\bottle\misc.dm" +#include "code\modules\food\drinks\bottle\soda.dm" #include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\drinks.dm" +#include "code\modules\food\food\ice_cream.dm" #include "code\modules\food\food\lunch.dm" #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" #include "code\modules\food\food\z_custom_food_vr.dm" -#include "code\modules\food\food\drinks\bottle.dm" -#include "code\modules\food\food\drinks\cup.dm" -#include "code\modules\food\food\drinks\drinkingglass.dm" -#include "code\modules\food\food\drinks\jar.dm" #include "code\modules\food\food\snacks\meat.dm" #include "code\modules\food\glass\bottle.dm" #include "code\modules\food\glass\bottle_vr.dm" #include "code\modules\food\glass\bottle\robot.dm" -#include "code\modules\food\kitchen\gibber.dm" -#include "code\modules\food\kitchen\icecream.dm" -#include "code\modules\food\kitchen\microwave.dm" -#include "code\modules\food\kitchen\smartfridge.dm" -#include "code\modules\food\kitchen\smartfridge_vr.dm" -#include "code\modules\food\kitchen\cooking_machines\_appliance.dm" -#include "code\modules\food\kitchen\cooking_machines\_cooker.dm" -#include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm" -#include "code\modules\food\kitchen\cooking_machines\_mixer.dm" -#include "code\modules\food\kitchen\cooking_machines\candy.dm" -#include "code\modules\food\kitchen\cooking_machines\cereal.dm" -#include "code\modules\food\kitchen\cooking_machines\container.dm" -#include "code\modules\food\kitchen\cooking_machines\fryer.dm" -#include "code\modules\food\kitchen\cooking_machines\grill.dm" -#include "code\modules\food\kitchen\cooking_machines\oven.dm" +#include "code\modules\food\machinery\gibber.dm" +#include "code\modules\food\machinery\microwave.dm" +#include "code\modules\food\machinery\smartfridge.dm" +#include "code\modules\food\machinery\smartfridge_vr.dm" +#include "code\modules\food\machinery\appliance\_appliance.dm" +#include "code\modules\food\machinery\appliance\_cooker.dm" +#include "code\modules\food\machinery\appliance\_cooker_output.dm" +#include "code\modules\food\machinery\appliance\_mixer.dm" +#include "code\modules\food\machinery\appliance\candy.dm" +#include "code\modules\food\machinery\appliance\cereal.dm" +#include "code\modules\food\machinery\appliance\container.dm" +#include "code\modules\food\machinery\appliance\fryer.dm" +#include "code\modules\food\machinery\appliance\grill.dm" +#include "code\modules\food\machinery\appliance\oven.dm" +#include "code\modules\food\structures\icecream_cart.dm" #include "code\modules\gamemaster\controller.dm" #include "code\modules\gamemaster\defines.dm" #include "code\modules\gamemaster\helpers.dm" @@ -3406,6 +3423,7 @@ #include "code\modules\mob\living\say.dm" #include "code\modules\mob\living\status_procs.dm" #include "code\modules\mob\living\throwing.dm" +#include "code\modules\mob\living\vv.dm" #include "code\modules\mob\living\bot\assembly.dm" #include "code\modules\mob\living\bot\bot.dm" #include "code\modules\mob\living\bot\cleanbot.dm" @@ -3426,10 +3444,13 @@ #include "code\modules\mob\living\carbon\carbon_movement.dm" #include "code\modules\mob\living\carbon\carbon_powers.dm" #include "code\modules\mob\living\carbon\cpr.dm" +#include "code\modules\mob\living\carbon\damage_procs.dm" #include "code\modules\mob\living\carbon\give.dm" #include "code\modules\mob\living\carbon\health.dm" #include "code\modules\mob\living\carbon\inventory.dm" +#include "code\modules\mob\living\carbon\organs.dm" #include "code\modules\mob\living\carbon\perspective.dm" +#include "code\modules\mob\living\carbon\physiology.dm" #include "code\modules\mob\living\carbon\resist.dm" #include "code\modules\mob\living\carbon\shock.dm" #include "code\modules\mob\living\carbon\taste.dm" @@ -3540,6 +3561,7 @@ #include "code\modules\mob\living\silicon\decoy\death.dm" #include "code\modules\mob\living\silicon\decoy\decoy.dm" #include "code\modules\mob\living\silicon\decoy\life.dm" +#include "code\modules\mob\living\silicon\pai\actions.dm" #include "code\modules\mob\living\silicon\pai\admin.dm" #include "code\modules\mob\living\silicon\pai\death.dm" #include "code\modules\mob\living\silicon\pai\defense.dm" @@ -3563,6 +3585,7 @@ #include "code\modules\mob\living\silicon\robot\analyzer.dm" #include "code\modules\mob\living\silicon\robot\component.dm" #include "code\modules\mob\living\silicon\robot\custom_sprites.dm" +#include "code\modules\mob\living\silicon\robot\damage_procs.dm" #include "code\modules\mob\living\silicon\robot\death.dm" #include "code\modules\mob\living\silicon\robot\examine.dm" #include "code\modules\mob\living\silicon\robot\examine_vr.dm" @@ -3586,6 +3609,7 @@ #include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm" #include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm" #include "code\modules\mob\living\silicon\robot\drone\_defines.dm" +#include "code\modules\mob\living\silicon\robot\drone\damage_procs.dm" #include "code\modules\mob\living\silicon\robot\drone\drone.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_console.dm" @@ -4694,13 +4718,15 @@ #include "code\modules\tgchat\message.dm" #include "code\modules\tgchat\to_chat.dm" #include "code\modules\tgs\includes.dm" -#include "code\modules\tgui\external.dm" -#include "code\modules\tgui\modal_vr_legacy.dm" +#include "code\modules\tgui\client.dm" +#include "code\modules\tgui\datum.dm" +#include "code\modules\tgui\mob.dm" #include "code\modules\tgui\module.dm" #include "code\modules\tgui\states.dm" #include "code\modules\tgui\status_composers.dm" #include "code\modules\tgui\tgui.dm" #include "code\modules\tgui\tgui_window.dm" +#include "code\modules\tgui\legacy\modal_vr_legacy.dm" #include "code\modules\tgui\modals\tgui_alert.dm" #include "code\modules\tgui\modals\tgui_dynamic_input.dm" #include "code\modules\tgui\modals\tgui_input_list.dm" @@ -4914,6 +4940,7 @@ #include "interface\skin.dmf" #include "interface\menus\_menus.dm" #include "interface\menus\main.dm" +#include "maps\euthenia\euthenia.dm" #include "maps\generic\death_triggers.dm" #include "maps\generic\map_data.dm" #include "maps\generic\misc.dm" diff --git a/code/__DEFINES/_flags/atom_flags.dm b/code/__DEFINES/_flags/atom_flags.dm index 5f9ef421b7..5beef64962 100644 --- a/code/__DEFINES/_flags/atom_flags.dm +++ b/code/__DEFINES/_flags/atom_flags.dm @@ -29,21 +29,6 @@ /// Does not leave user's fingerprints/fibers when used on things? #define NOPRINT (1<<12) // TODO: item flag -///CITMAIN FLAG BITMASKS - Completely unused. -/* -/// Early returns mob.face_atom() -#define BLOCK_FACE_ATOM (1<<16) -/// Prevents mobs from getting chainshocked by teslas and the supermatter. -#define SHOCKED (1<<17) -/// Projectiles will use default chance-based ricochet handling on things with this. -#define DEFAULT_RICOCHET (1<<18) -/// For machines and structures that should not break into parts, eg, holodeck stuff. -#define NODECONSTRUCT (1<<19) -/// Prevent clicking things below it on the same turf eg. doors/ fulltile windows. -#define PREVENT_CLICK_UNDER (1<<20) -/// should not get harmed if this gets caught by an explosion? -#define PREVENT_CONTENTS_EXPLOSION (1<<22) -*/ /// We are ticking in materials #define ATOM_MATERIALS_TICKING (1<<22) /// Use initial icon/icon state for HTML renders in things like VV diff --git a/code/__DEFINES/ability.dm b/code/__DEFINES/ability.dm index dc6fd5c3b2..b009141129 100644 --- a/code/__DEFINES/ability.dm +++ b/code/__DEFINES/ability.dm @@ -7,6 +7,12 @@ /// toggle interact, hot-bindable #define ABILITY_INTERACT_TOGGLE "toggle" +//? targeting_type - exclusively used for targeted abilities + +#define ABILITY_TARGET_ALL "all" +#define ABILITY_TARGET_MOB "mob" +#define ABILITY_TARGET_TURF "turf" + //? ability_check_flags - if you add new ones, make sure to modify available_check() and unavailable_reason(). #define ABILITY_CHECK_CONSCIOUS (1<<0) diff --git a/code/__DEFINES/atmospherics/atmos.dm b/code/__DEFINES/atmospherics/atmos.dm index 66ec751321..74bcf83f22 100644 --- a/code/__DEFINES/atmospherics/atmos.dm +++ b/code/__DEFINES/atmospherics/atmos.dm @@ -1,6 +1,4 @@ // Math constants. -/// kPa*L/(K*mol). -#define R_IDEAL_GAS_EQUATION 8.31 /// kPa. #define ONE_ATMOSPHERE 101.325 /// (mol^3 * s^3) / (kg^3 * L). @@ -13,10 +11,6 @@ #define TCMB 2.7 //! -270.3 degrees celcius // Radiation constants. -/// W/(m^2*K^4). -#define STEFAN_BOLTZMANN_CONSTANT 5.6704e-8 -/// K. -#define COSMIC_RADIATION_TEMPERATURE 3.15 /// W/m^2. Kind of arbitrary. Really this should depend on the sun position much like solars. #define AVERAGE_SOLAR_RADIATION 200 /// kPa at 20 C. This should be higher as gases aren't great conductors until they are dense. Used the critical pressure for air. @@ -27,8 +21,6 @@ #define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04 ///m^2, surface area of 1.7m (H) x 0.46m (D) cylinder #define HUMAN_EXPOSED_SURFACE_AREA 5.2 -/// Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C. -#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) /// Percentage. #define O2STANDARD 0.21 #define N2STANDARD 0.79 @@ -36,9 +28,9 @@ /// Moles in a standard cell after which phoron is visible. #define MOLES_PHORON_VISIBLE 0.7 /// O2 standard value (21%) -#define MOLES_O2STANDARD (MOLES_CELLSTANDARD * O2STANDARD) +#define MOLES_O2STANDARD (CELL_MOLES * O2STANDARD) /// N2 standard value (79%) -#define MOLES_N2STANDARD (MOLES_CELLSTANDARD * N2STANDARD) +#define MOLES_N2STANDARD (CELL_MOLES * N2STANDARD) #define MOLES_O2ATMOS (MOLES_O2STANDARD*50) #define MOLES_N2ATMOS (MOLES_N2STANDARD*50) @@ -52,7 +44,7 @@ #define BREATH_MOLES (ONE_ATMOSPHERE * BREATH_VOLUME / (T20C * R_IDEAL_GAS_EQUATION)) /// Amount of air needed before pass out/suffocation commences. #define BREATH_PERCENTAGE (BREATH_VOLUME / CELL_VOLUME) -#define HUMAN_NEEDED_OXYGEN (MOLES_CELLSTANDARD * BREATH_PERCENTAGE * 0.16) +#define HUMAN_NEEDED_OXYGEN (CELL_MOLES * BREATH_PERCENTAGE * 0.16) ///J/K For 80kg person #define HUMAN_HEAT_CAPACITY 280000 /// The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE. diff --git a/code/__DEFINES/atmospherics/constants.dm b/code/__DEFINES/atmospherics/constants.dm index f2b2a2c7a5..d5c7580239 100644 --- a/code/__DEFINES/atmospherics/constants.dm +++ b/code/__DEFINES/atmospherics/constants.dm @@ -1,3 +1,15 @@ +//* Physics Constants *// + +/// in Kelvin, temperature of cosmic microwave background radiation (used for radiative space cooling) +#define COSMIC_RADIATION_TEMPERATURE 3.15 +/// kPa*L/(K*mol). +#define R_IDEAL_GAS_EQUATION 8.31 +/// W/(m^2*K^4). +#define STEFAN_BOLTZMANN_CONSTANT 5.6704e-8 + + /// Volume, in liters, of a single tile. Y'KNOW WHY THIS IS A CONSTANT? WELL FOR ONE, initial_gas_mix IS MOLES, NOT PERCENTAGES OR PRESSURES. IF YOU TOUCH THIS, YOU BREAK *EVERYTHING*. DON'T TOUCH THIS. /// Exceptions can be made if you're a big boy who knows how this clusterfuck of a ZAS/LINDA hybrid works and have good reason to touch this. -#define CELL_VOLUME 2500 +#define CELL_VOLUME 2500 +/// Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C. +#define CELL_MOLES (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) diff --git a/code/__DEFINES/atmospherics/environmental.dm b/code/__DEFINES/atmospherics/environmental.dm index 6fb0388893..b3ffdde739 100644 --- a/code/__DEFINES/atmospherics/environmental.dm +++ b/code/__DEFINES/atmospherics/environmental.dm @@ -1,4 +1,5 @@ -// CANATMOSPASS +//* CanAtmosPass, CanAtmosPassVertical *// + // make sure it's in this order so we cann use min() //! these are actual return values, using them in CanAtmosPass results in it always be returned. /// lets everything through @@ -18,7 +19,6 @@ #define CANATMOSPASS(A, O, D) (A.CanAtmosPass > -1? A.CanAtmosPass : (A.CanAtmosPass == ATMOS_PASS_PROC? A.CanAtmosPass(O, D) : (A.density? ATMOS_PASS_AIR_BLOCKED : ATMOS_PASS_NOT_BLOCKED))) #define CANVERTICALATMOSPASS(A, O, D) (A.CanAtmosPassVertical == ATMOS_PASS_VERTICAL_DEFAULT? CANATMOSPASS(A, O, D) : (A.CanAtmosPassVertical > -1? A.CanAtmosPassVertical : (A.CanAtmosPassVertical == ATMOS_PASS_PROC? A.CanAtmosPass(O, D) : (A.density? ATMOS_PASS_AIR_BLOCKED : ATMOS_PASS_NOT_BLOCKED)))) - /** * LEGACY BELOW */ diff --git a/code/__DEFINES/color/lights.dm b/code/__DEFINES/color/lights.dm index 66f715b6b3..781628408b 100644 --- a/code/__DEFINES/color/lights.dm +++ b/code/__DEFINES/color/lights.dm @@ -1,4 +1,6 @@ -//Some defines to generalise colours used in lighting. +//* Some defines to generalise colours used in lighting. +//* This file also contains powers/ranges, because power really does matter for lighting. + //! ## GENERAL COLORS //? Important note on colors. Colors can end up significantly different from the basic html picture, especially when saturated! #define LIGHT_COLOR_WHITE "#FFFFFF" // rgb(255, 255, 255) Pure white. @@ -34,4 +36,13 @@ #define LIGHT_COLOR_INCANDESCENT_TUBE "#E0EFF0" // rgb(224, 239, 240) Slightly blueish white. #define LIGHT_COLOR_INCANDESCENT_BULB "#FFFEB8" // rgb(255, 254, 184) Slightly yellowish white. #define LIGHT_COLOR_INCANDESCENT_FLASHLIGHT "#FFCC66" // rgb(255, 204, 102) Slightly yellowish white. -#define LIGHT_COLOR_NIGHTSHIFT "#616191" // rgb(97, 97, 145) Dark blue. + +/// Nightshift Light Color +/// Used on full-strength light tubes. +#define LIGHT_COLOR_NIGHTSHIFT "#c7c7ff" +/// Nightshift Light Power +/// Used on full-strength light tubes. +#define LIGHT_POWER_NIGHTSHIFT 0.435 +/// Nightshift Light Range +/// Used on full-strength light tubes. +#define LIGHT_RANGE_NIGHTSHIFT 7 diff --git a/code/__DEFINES/combat/damage.dm b/code/__DEFINES/combat/damage.dm index 335ea3ae37..32d831fed8 100644 --- a/code/__DEFINES/combat/damage.dm +++ b/code/__DEFINES/combat/damage.dm @@ -12,3 +12,7 @@ #define DAMAGE_MODE_ABLATING (1<<2) //! pulse lasers, etc, basically blows a crater #define DAMAGE_MODE_PIERCE (1<<3) //! specifically highly-piercing weapons like bullets, even worse than sharp. #define DAMAGE_MODE_SHRED (1<<4) //! messy, shredded wounds instead of a clean cut / pierce. strong. +#define DAMAGE_MODE_GRADUAL (1<<5) //! disallow bone breaks, ablation, etc; used for gradual sources like depressurization +#define DAMAGE_MODE_INTERNAL (1<<6) //! coming from internal; used to flag that something isn't coming through the skin. certain defenses don't work if this is set. +#define DAMAGE_MODE_REDIRECT (1<<7) //! if zone doesn't exist / etc, allow redirection +#define DAMAGE_MODE_NO_OVERFLOW (1<<8)//! temporary - re-evaluate when health is reworked. prevents damage from overflowing caps. diff --git a/code/__DEFINES/dcs/signals/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum.dm index f4462c1315..119acfbbb1 100644 --- a/code/__DEFINES/dcs/signals/signals_datum.dm +++ b/code/__DEFINES/dcs/signals/signals_datum.dm @@ -18,10 +18,10 @@ /// Handler for vv_do_topic (usr, href_list) ////#define COMSIG_VV_TOPIC "vv_topic" ////#define COMPONENT_VV_HANDLED (1<<0) -/// From datum ui_act (usr, action, list/params, datum/tgui/ui) -#define COMSIG_UI_ACT "ui_act" -/// From datum ui_module_act (usr, module_id, action, list/params, datum/tgui/ui) -#define COMSIG_UI_MODULE_ACT "ui_module_act" +/// From datum ui_act (usr, action, list/params, datum/tgui/ui, datum/tgui_module_context/module_context) +#define COMSIG_DATUM_UI_ACT "ui_act" +/// From datum push_ui_data: (mob/user, datum/tgui/ui, list/data) +#define COMSIG_DATUM_PUSH_UI_DATA "push_ui_data" /// Fires on the target datum when an element is attached to it (/datum/element) ////#define COMSIG_ELEMENT_ATTACH "element_attach" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm index 894562605d..3dc6401c22 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -79,7 +79,7 @@ /// From base of /mob/update_sight(): () #define COMSIG_MOB_UPDATE_SIGHT "mob_update_sight" //// From /mob/living/say(): () -////#define COMSIG_MOB_SAY "mob_say" +#define COMSIG_MOB_SAY "mob_say" ////#define COMPONENT_UPPERCASE_SPEECH (1<<0) //? used to access COMSIG_MOB_SAY argslist ////#define SPEECH_MESSAGE 1 diff --git a/code/__DEFINES/dcs/signals/signals_painting.dm b/code/__DEFINES/dcs/signals/signals_painting.dm index 8a1340e786..6261670366 100644 --- a/code/__DEFINES/dcs/signals/signals_painting.dm +++ b/code/__DEFINES/dcs/signals/signals_painting.dm @@ -8,5 +8,5 @@ /// From base of /item/proc/set_painting_tool_color(): (chosen_color) ////#define COMSIG_PAINTING_TOOL_SET_COLOR "painting_tool_set_color" -/// From base of /item/canvas/ui_data(): (data) +/// From base of /item/canvas/ui_data(mob/user, datum/tgui/ui) ////#define COMSIG_PAINTING_TOOL_GET_ADDITIONAL_DATA "painting_tool_get_data" diff --git a/code/__DEFINES/inventory/carry_weight.dm b/code/__DEFINES/inventory/carry_weight.dm index 92814959f4..128bda3b57 100644 --- a/code/__DEFINES/inventory/carry_weight.dm +++ b/code/__DEFINES/inventory/carry_weight.dm @@ -27,7 +27,7 @@ //? Carry factor - multiplier for penalizing over-limit weight; higher is worse. -#define CARRY_FACTOR_BASELINE 1 +#define CARRY_FACTOR_BASELINE 0.97 #define CARRY_FACTOR_MOD_HUMAN 0.92 #define CARRY_FACTOR_MOD_UNATHI 0.92 @@ -38,8 +38,8 @@ #define CARRY_FACTOR_MOD_PROTEAN 1.12 #define CARRY_FACTOR_MOD_XENOCHIMERA 0.88 #define CARRY_FACTOR_MOD_XENOHYBRID 0.88 -#define CARRY_FACTOR_MOD_ALRAUNE 0.25 -#define CARRY_FACTOR_MOD_DIONA 0.1 +#define CARRY_FACTOR_MOD_ALRAUNE 0.25 //! finally, a real reason to be an alraune +#define CARRY_FACTOR_MOD_DIONA 0.1 //! i am groot //? Carry equation constants @@ -120,26 +120,26 @@ //* Spacesuits -#define ITEM_ENCUMBRANCE_SOFTSUIT 30 +#define ITEM_ENCUMBRANCE_SOFTSUIT 22.5 #define ITEM_ENCUMBRANCE_SOFTSUIT_HELMET 2.5 -#define ITEM_ENCUMBRANCE_VOIDSUIT 30 +#define ITEM_ENCUMBRANCE_VOIDSUIT 25 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET 0 -#define ITEM_ENCUMBRANCE_VOIDSUIT_LIGHT 25 +#define ITEM_ENCUMBRANCE_VOIDSUIT_LIGHT 20 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET_LIGHT 0 -#define ITEM_ENCUMBRANCE_VOIDSUIT_HEAVY 35 +#define ITEM_ENCUMBRANCE_VOIDSUIT_HEAVY 30 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET_HEAVY 0 #define ITEM_ENCUMBRANCE_VOIDSUIT_ULTRALIGHT 20 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET_ULTRALIGHT 0 -#define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 30 +#define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 22.5 #define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY_HELMET 2.5 -#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 17.5 +#define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 20 #define ITEM_ENCUMBRANCE_LEGACY_RIG 25 -#define ITEM_ENCUMBRANCE_LEGACY_RIG_HEAVY 35 +#define ITEM_ENCUMBRANCE_LEGACY_RIG_HEAVY 30 -#define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 30 +#define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 25 #define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT_HELMET 0 //* Storage @@ -156,18 +156,18 @@ //* Weapons -#define ITEM_ENCUMBRANCE_GUN_LIGHT 2.5 -#define ITEM_ENCUMBRANCE_GUN_NORMAL 5 -#define ITEM_ENCUMBRANCE_GUN_LARGE 7.5 -#define ITEM_ENCUMBRANCE_GUN_BULKY 12.5 -#define ITEM_ENCUMBRANCE_GUN_UNREASONABLE 17.5 +#define ITEM_ENCUMBRANCE_GUN_LIGHT 1.25 +#define ITEM_ENCUMBRANCE_GUN_NORMAL 2.5 +#define ITEM_ENCUMBRANCE_GUN_LARGE 5 +#define ITEM_ENCUMBRANCE_GUN_BULKY 8 +#define ITEM_ENCUMBRANCE_GUN_UNREASONABLE 15 #define ITEM_ENCUMBRANCE_GUN_RIDICULOUS 30 #define ITEM_ENCUMBRANCE_GUN_VEHICLE 60 -#define ITEM_ENCUMBRANCE_MELEE_SPEAR 15 -#define ITEM_ENCUMBRANCE_MELEE_SLEDGEHAMMER 20 +#define ITEM_ENCUMBRANCE_MELEE_SPEAR 7.5 +#define ITEM_ENCUMBRANCE_MELEE_SLEDGEHAMMER 12.5 -#define ITEM_ENCUMBRANCE_SHIELD_TOWER 30 +#define ITEM_ENCUMBRANCE_SHIELD_TOWER 12.5 //? Item Flat Encumbrance defines diff --git a/code/__DEFINES/items_clothing.dm b/code/__DEFINES/items_clothing.dm index 6c463461f0..28cac6d347 100644 --- a/code/__DEFINES/items_clothing.dm +++ b/code/__DEFINES/items_clothing.dm @@ -1,6 +1,4 @@ - -/// For how bright candles are. -#define CANDLE_LUM 3 +// todo: this all should go somewhere else. // Bitflags for the percentual amount of protection a piece of clothing which covers the body part offers. // Used with human/proc/get_heat_protection() and human/proc/get_cold_protection(). @@ -17,6 +15,8 @@ #define THERMAL_PROTECTION_HAND_LEFT 0.025 #define THERMAL_PROTECTION_HAND_RIGHT 0.025 +/// when being temperature-modified by environment, + // Pressure limits. /// This determines at what pressure the ultra-high pressure red icon is displayed. (This one is set as a constant) #define HAZARD_HIGH_PRESSURE 550 @@ -30,7 +30,7 @@ #define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 /// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive. #define BODYTEMP_AUTORECOVERY_DIVISOR 12 -/// Minimum amount of kelvin moved toward 310.15K per tick. So long as abs(310.15 - bodytemp) is more than 50. +/// Minimum amount of kelvin moved toward 310.15K per tick, when bodytemp is dangerously far from livable. #define BODYTEMP_AUTORECOVERY_MINIMUM 1 /// Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster. #define BODYTEMP_COLD_DIVISOR 6 @@ -40,10 +40,12 @@ #define BODYTEMP_COOLING_MAX -30 /// The maximum number of degrees that your body can heat up in 1 tick, when in a hot area. #define BODYTEMP_HEATING_MAX 30 + /// The limit the human body can take before it starts taking damage from heat. -#define BODYTEMP_HEAT_DAMAGE_LIMIT 360.15 +#define LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD 360.15 /// The limit the human body can take before it starts taking damage from coldness. -#define BODYTEMP_COLD_DAMAGE_LIMIT 260.15 +#define LEGACY_BODYTEMP_COLD_DAMAGE_THRESHOLD 260.15 + /// What min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. #define SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE 2.0 /// What min_cold_protection_temperature is set to for space-suit quality jumpsuits or suits. MUST NOT BE 0. diff --git a/code/__DEFINES/machines/airlock_states.dm b/code/__DEFINES/machines/airlock_states.dm new file mode 100644 index 0000000000..803e45f88b --- /dev/null +++ b/code/__DEFINES/machines/airlock_states.dm @@ -0,0 +1,10 @@ +#define STATE_UNDEFINED -1 //Manual overrides +#define STATE_CLOSED 0 //Both doors closed +#define STATE_OPEN_IN 1 //Interior doors open, exterior closed +#define STATE_OPEN_OUT 2 //Exterior doors open, interior closed +#define STATE_BYPASS 3 + +#define STATE_CYCLING_IN 4 //Matching indoors pressure and composition +#define STATE_CYCLING_OUT 5 //Matching outdoors pressure +#define STATE_SEALING 6 //Closing both doors +#define STATE_BYPASSING 7 //Unlocking both doors diff --git a/code/__DEFINES/misc/nightshift.dm b/code/__DEFINES/misc/nightshift.dm new file mode 100644 index 0000000000..339b7008ed --- /dev/null +++ b/code/__DEFINES/misc/nightshift.dm @@ -0,0 +1,32 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* nightshift flags + +#define NIGHTSHIFT_LEVEL_UNSET (1<<0) + +#define NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS (1<<1) +#define NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES (1<<2) + +#define NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS (1<<3) +#define NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES (1<<4) +#define NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE (1<<5) +#define NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE (1<<6) + +#define NIGHTSHIFT_LEVEL_COMMAND_HALLWAYS (1<<7) +#define NIGHTSHIFT_LEVEL_COMMAND_FACILITIES (1<<8) +#define NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE (1<<9) + +//* Do not randomly change this, it is used for configuration. *// +DEFINE_BITFIELD(nightshift_level, list( + BITFIELD_NAMED("Unset", NIGHTSHIFT_LEVEL_UNSET), + BITFIELD_NAMED("PublicHalls", NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS), + BITFIELD_NAMED("PublicAreas", NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES), + BITFIELD_NAMED("DepartmentHalls", NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS), + BITFIELD_NAMED("DepartmentAreas", NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES), + BITFIELD_NAMED("DepartmentSecure", NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE), + BITFIELD_NAMED("DepartmentLeisure", NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE), + BITFIELD_NAMED("CommandHalls", NIGHTSHIFT_LEVEL_COMMAND_HALLWAYS), + BITFIELD_NAMED("CommandAreas", NIGHTSHIFT_LEVEL_COMMAND_FACILITIES), + BITFIELD_NAMED("CommandSecure", NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE), +)) diff --git a/code/__DEFINES/mobs/biology.dm b/code/__DEFINES/mobs/biology.dm new file mode 100644 index 0000000000..8762562388 --- /dev/null +++ b/code/__DEFINES/mobs/biology.dm @@ -0,0 +1,22 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* biology flags + +/// humanlike, organic, normal biology +#define BIOLOGY_TYPE_HUMAN (1<<0) +/// fully machinelike +#define BIOLOGY_TYPE_SYNTH (1<<1) +/// promethean / slime +#define BIOLOGY_TYPE_SLIME (1<<2) +/// chimeric +#define BIOLOGY_TYPE_CHIMERA (1<<3) +/// protean +#define BIOLOGY_TYPE_NANITES (1<<4) +/// plant +#define BIOLOGY_TYPE_PLANT (1<<5) + +#define BIOLOGY_TYPES_FLESHY (BIOLOGY_TYPE_HUMAN | BIOLOGY_TYPE_CHIMERA | BIOLOGY_TYPE_PLANT | BIOLOGY_TYPE_SLIME) +#define BIOLOGY_TYPES_ALL (ALL) + +// todo: define bitfield (when do i rework define bitfield) diff --git a/code/__DEFINES/mobs/health.dm b/code/__DEFINES/mobs/life.dm similarity index 60% rename from code/__DEFINES/mobs/health.dm rename to code/__DEFINES/mobs/life.dm index ab1c1e7186..2ba9d0ae43 100644 --- a/code/__DEFINES/mobs/health.dm +++ b/code/__DEFINES/mobs/life.dm @@ -1,4 +1,7 @@ -//* Medical system defines go in here +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* This file is called 'life', but realistically is the resting place of all things metabolism, health, and related. *// //? Health - Core /** Round damage values to this value @@ -9,6 +12,19 @@ #define ARMOR_PRECISION 0.001 #define ARMOR_TIER_PRECISION 0.01 +//* Health - Environmental Interactions *// + +/// % of temperature recovered when going towards favorable +#define MOB_BODYTEMP_EQUALIZATION_FAVORABLE_RATIO (1 / 6) +/// % of temperature gained/lost when going away from favorable +#define MOB_BODYTEMP_EQUALIZATION_UNFAVORABLE_RATIO (1 / 6) +/// minimum stabilization when far from 'livable' tempreatures, but environment is closer to livable temperature +#define MOB_BODYTEMP_EQUALIZATION_MIN_FAVORABLE 10 +/// minimum temperature change when environment is further from livable temperature / is going ot harm us from its temperature +#define MOB_BODYTEMP_EQUALIZATION_MIN_UNFAVORABLE 1 +/// maximum temperature change when environment is further from livable temperature / is going to harm us from its temperature +#define MOB_BODYTEMP_EQUALIZATION_MAX_UNFAVORABLE 50 + //? CPR /// how long CPR suppresses brain decay #define CPR_BRAIN_STASIS_TIME (15 SECONDS) diff --git a/code/__DEFINES/mobs/mobs.dm b/code/__DEFINES/mobs/mobs.dm index 94e5a35c44..506bbc3637 100644 --- a/code/__DEFINES/mobs/mobs.dm +++ b/code/__DEFINES/mobs/mobs.dm @@ -1,4 +1,6 @@ +// todo: if i haven't bad touched something in here, i probably need to & will ~silicons + // These are used as the layers for the icons, as well as indexes in a list that holds onto them. // Technically the layers used are all -100+layer to make them FLOAT_LAYER overlays. //! Human Overlays Indexes///////// @@ -75,6 +77,7 @@ ////////////////////////////////// // Bitflags defining which status effects could be or are inflicted on a mob. +// todo: this is all terrible tbh #define STATUS_CAN_STUN (1<<0) //! Can Stun() #define STATUS_CAN_KNOCKDOWN (1<<1) //! Can Knockdown() #define STATUS_CAN_ROOT (1<<2) //! Can Root() @@ -84,6 +87,7 @@ #define STATUS_LEAPING (1<<20) //! Is leaping (??? legacy) #define STATUS_HIDING (1<<21) //! Is hiding (??? legacy) +// todo: this should be a trait with a mob_flags flag to go with it for quick access #define STATUS_GODMODE (1<<22) //! Godmode (??? legacy) #define STATUS_FAKEDEATH (1<<23) //! In fakedeath - SLATED FOR REMOVAL, THIS SHOULD BE TRAIT diff --git a/code/__DEFINES/mobs/organs.dm b/code/__DEFINES/mobs/organs.dm index 20c2be19fe..259494f92f 100644 --- a/code/__DEFINES/mobs/organs.dm +++ b/code/__DEFINES/mobs/organs.dm @@ -157,6 +157,8 @@ BP_R_LEG, \ BP_TORSO) +GLOBAL_LIST_INIT(body_zones, BP_ALL_STANDARD) + //* ADHERENT EXTERNAL ORGANS *// #define O_COOLING_FINS "cooling fins" diff --git a/code/__DEFINES/mobs/silicon_privileges.dm b/code/__DEFINES/mobs/silicon_privileges.dm index 94ea5157a3..62f69f210c 100644 --- a/code/__DEFINES/mobs/silicon_privileges.dm +++ b/code/__DEFINES/mobs/silicon_privileges.dm @@ -1,4 +1,5 @@ //silicon_privileges flags on /mob +// todo: rework #define PRIVILEGES_SILICON (1<<0) #define PRIVILEGES_PAI (1<<1) #define PRIVILEGES_BOT (1<<2) diff --git a/code/__DEFINES/objects/type_generation.dm b/code/__DEFINES/objects/type_generation.dm new file mode 100644 index 0000000000..9a42c379ff --- /dev/null +++ b/code/__DEFINES/objects/type_generation.dm @@ -0,0 +1,84 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +#define CREATE_WALL_MOUNTING_TYPES(TYPE) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ +} \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} + +#define CREATE_WALL_MOUNTING_TYPES_AUTOSPRITE(TYPE, AUTOSPRITE) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ +} \ +##TYPE/auto_mount { icon_state = AUTOSPRITE } \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} + +#define CREATE_WALL_MOUNTING_TYPES_SHIFTED(TYPE, SHIFT) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ + pixel_y = SHIFT; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ + pixel_y = -SHIFT; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ + pixel_x = SHIFT; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ + pixel_x = -SHIFT; \ +} \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} + +#define CREATE_WALL_MOUNTING_TYPES_SHIFTED_AUTOSPRITE(TYPE, SHIFT, AUTOSPRITE) \ +##TYPE/north_mount{ \ + dir = SOUTH; \ + pixel_y = SHIFT; \ +} \ +##TYPE/south_mount{ \ + dir = NORTH; \ + pixel_y = -SHIFT; \ +} \ +##TYPE/east_mount{ \ + dir = WEST; \ + pixel_x = SHIFT; \ +} \ +##TYPE/west_mount{ \ + dir = EAST; \ + pixel_x = -SHIFT; \ +} \ +##TYPE/auto_mount { icon_state = AUTOSPRITE } \ +##TYPE/auto_mount/Initialize(){ \ + auto_orient_wallmount_single_preinit(); \ + return ..(); \ +} diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index b0e97e05e9..fdfec5e8ca 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.7.0" +#define TGS_DMAPI_VERSION "7.0.2" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -73,12 +73,12 @@ #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3 /// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path. #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4 -/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND. -#define TGS_EVENT_BYOND_INSTALL_START 5 -/// When a BYOND install operation fails. Parameters: Error message -#define TGS_EVENT_BYOND_INSTALL_FAIL 6 -/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND. -#define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7 +/// Before a engine install operation begins. Parameters: Version string of the installing engine. +#define TGS_EVENT_ENGINE_INSTALL_START 5 +/// When a engine install operation fails. Parameters: Error message +#define TGS_EVENT_ENGINE_INSTALL_FAIL 6 +/// When the active engine version changes. Parameters: (Nullable) Version string of the current engine, version string of the new engine. +#define TGS_EVENT_ENGINE_ACTIVE_VERSION_CHANGE 7 /// When the compiler starts running. Parameters: Game directory path, origin commit SHA. #define TGS_EVENT_COMPILE_START 8 /// When a compile is cancelled. No parameters. @@ -108,7 +108,7 @@ // #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22 /// After a single submodule update is performed. Parameters: Updated submodule name. #define TGS_EVENT_REPO_SUBMODULE_UPDATE 23 -/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version. +/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, version string of the used engine. #define TGS_EVENT_PRE_DREAM_MAKER 24 /// Whenever a deployment folder is deleted from disk. Parameters: Game directory path. #define TGS_EVENT_DEPLOYMENT_CLEANUP 25 @@ -122,6 +122,7 @@ /// The watchdog will restart on reboot. #define TGS_REBOOT_MODE_RESTART 2 +// Note that security levels are currently meaningless in OpenDream /// DreamDaemon Trusted security level. #define TGS_SECURITY_TRUSTED 0 /// DreamDaemon Safe security level. @@ -136,6 +137,11 @@ /// DreamDaemon invisible visibility level. #define TGS_VISIBILITY_INVISIBLE 2 +/// The Build Your Own Net Dream engine. +#define TGS_ENGINE_TYPE_BYOND 0 +/// The OpenDream engine. +#define TGS_ENGINE_TYPE_OPENDREAM 1 + //REQUIRED HOOKS /** @@ -420,6 +426,7 @@ /** * Send a message to connected chats. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies. @@ -429,6 +436,7 @@ /** * Send a private message to a specific user. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * user: The [/datum/tgs_chat_user] to PM. @@ -438,6 +446,7 @@ /** * Send a message to connected chats that are flagged as game-related in TGS. This function may sleep! + * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game. * * message - The [/datum/tgs_message_content] to send. * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to. @@ -449,6 +458,10 @@ /world/proc/TgsVersion() return +/// Returns the running engine type +/world/proc/TgsEngine() + return + /// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsApiVersion() return diff --git a/code/__DEFINES/turfs/type_generation.dm b/code/__DEFINES/turfs/type_generation.dm index d8fb0c98e7..0afaab7890 100644 --- a/code/__DEFINES/turfs/type_generation.dm +++ b/code/__DEFINES/turfs/type_generation.dm @@ -1,3 +1,6 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + /// create the standard 4 types of turfs for a given turf type. #define CREATE_STANDARD_TURFS(type) \ ##type/indoors { \ diff --git a/code/__DEFINES/vv.dm b/code/__DEFINES/vv.dm index 74f97ebc4b..0c812d4b04 100644 --- a/code/__DEFINES/vv.dm +++ b/code/__DEFINES/vv.dm @@ -97,7 +97,9 @@ #define VV_HK_EDIT_ARMOR "edit_armor" // /mob +/// used on /mob as well as /obj/item/organ #define VV_HK_ADD_PHYSIOLOGY_MODIFIER "add_physiology_mod" +/// used on /mob as well as /obj/item/organ #define VV_HK_REMOVE_PHYSIOLOGY_MODIFIER "remove_physiology_mod" /* diff --git a/code/__HELPERS/datastructs/priority_queue.dm b/code/__HELPERS/datastructs/priority_queue.dm index 7c43fe02cb..a77f218a04 100644 --- a/code/__HELPERS/datastructs/priority_queue.dm +++ b/code/__HELPERS/datastructs/priority_queue.dm @@ -1,66 +1,89 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + /** - * array-backed priority heap + * An array-backed priority queue. * - * not written in house, cloned from oldish polaris/bay (?) + * The "front" of the queue is popped first; check comparators.dm for what this means. */ /datum/priority_queue - var/list/queue - var/comparison_function + /// comparaison function + var/procpath/comparison + /// internal array + var/list/array = list() -/datum/priority_queue/New(compare) - queue = list() - comparison_function = compare +/datum/priority_queue/New(cmp) + src.comparison = cmp + array = list() /datum/priority_queue/proc/is_empty() - return !queue.len - -/datum/priority_queue/proc/enqueue(data) - queue.Add(data) - var/index = queue.len + return length(array) == 0 - //From what I can tell, this automagically sorts the added data into the correct location. - while(index > 2 && call(comparison_function)(queue[index / 2], queue[index]) > 0) - queue.Swap(index, index / 2) - index /= 2 +/datum/priority_queue/proc/enqueue(entry) + array += entry + bubble_up(length(array)) /datum/priority_queue/proc/dequeue() - if(!queue.len) - return 0 - return remove(1) + if(length(array) == 0) + return null + . = array[1] + array.Swap(1, length(array)) + --array.len + bubble_down(1) -/datum/priority_queue/proc/remove(index) - if(index > queue.len) - return 0 +/datum/priority_queue/proc/peek() + return length(array)? array[1] : null - var/thing = queue[index] - queue.Swap(index, queue.len) - --queue.len - if(index < queue.len) - fix_queue(index) - return thing - -/datum/priority_queue/proc/fix_queue(index) - var/child = 2 * index - var/item = queue[index] +// todo: define this +/datum/priority_queue/proc/bubble_up(index) + while(index >= 2 && call(comparison)(array[index], array[index / 2]) < 0) + array.Swap(index, index / 2) + index /= 2 - while(child <= queue.len) - if(child < queue.len && call(comparison_function)(queue[child], queue[child + 1]) > 0) - child++ - if(call(comparison_function)(item, queue[child]) > 0) - queue[index] = queue[child] - index = child +// todo: define this +/datum/priority_queue/proc/bubble_down(index) + var/length = length(array) + var/next = index * 2 + while(next <= length) + // left always exists, right doesn't necessarily exist + if(call(comparison)(array[next], array[index]) < 0) + if(next < length && call(comparison)(array[next], array[next + 1]) > 0) + array.Swap(index, next + 1) + index = next + 1 + else + array.Swap(index, next) + index = next + else if(next < length && call(comparison)(array[next + 1], array[index]) < 0) + array.Swap(index, next + 1) + index = next + 1 else break - child = 2 * index - queue[index] = item + next = index * 2 -/datum/priority_queue/proc/clone_list() - return queue.Copy() +/** + * returns copy of list of entries in no particular order + */ +/datum/priority_queue/proc/flattened() + return array.Copy() -/datum/priority_queue/proc/size() - return queue.len +/datum/priority_queue/proc/remove_index(index) + var/length = length(array) + if(!index || index > length) + return + if(index == length) + . = array[index] + --array.len + return + . = array[index] + array.Swap(index, length) + --array.len + bubble_down(index) + +/datum/priority_queue/proc/find(entry) + return array.Find(entry) -/datum/priority_queue/proc/remove_item(data) - var/index = queue.Find(data) - if(index) - return remove(index) +/datum/priority_queue/proc/remove_entry(entry) + return remove_index(array.Find(entry)) + +/datum/priority_queue/proc/size() + return length(array) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index cbdad2423f..9a9827e78c 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -601,13 +601,13 @@ var/global/list/remainless_species = list(SPECIES_ID_PROMETHEAN, var/cost = instance.cost traits_costs[path] = cost all_traits[path] = instance + if(!instance.custom_only && instance.cost <= 0) + everyone_traits[path] = instance switch(cost) if(-INFINITY to -0.1) negative_traits[path] = instance if(0) neutral_traits[path] = instance - if(!(instance.custom_only)) - everyone_traits[path] = instance if(0.1 to INFINITY) positive_traits[path] = instance diff --git a/code/__HELPERS/graphs/astar.dm b/code/__HELPERS/graphs/astar.dm index d851edea14..1a0079c465 100644 --- a/code/__HELPERS/graphs/astar.dm +++ b/code/__HELPERS/graphs/astar.dm @@ -114,7 +114,7 @@ var/datum/graph_astar_node/target = path_node_by_position[datum] if(target.best_estimated_cost) if(best_estimated_cost + call(datum, dist)(end) < target.best_estimated_cost) - open.remove_item(target) + open.remove_entry(target) else continue @@ -122,7 +122,7 @@ path_node_by_position[datum] = next_node open.enqueue(next_node) - if(max_nodes && length(open.queue) > max_nodes) - open.remove(length(open.queue)) + if(max_nodes && length(open.array) > max_nodes) + open.remove_index(length(open.array)) return path diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index e234e5b03e..8631670446 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -15,54 +15,42 @@ * * For turfs, what appears under the diagonal corners depends on the turf that was in the same position previously: if you make a wall on * a plating floor, you will see plating under the diagonal wall corner, if it was space, you will see space. + */ + + +/** + * Stole this from @DaedalusDock - @Zandario + * Checks if `thing` (an atom) can smooth with `turf`, based on the [/area/var/area_limited_icon_smoothing] variable of their areas. * - * If you wish to map a diagonal wall corner with a fixed underlay, you must configure the turf's 'fixed_underlay' list var, like so: - * fixed_underlay = list("icon"='icon_file.dmi', "icon_state"="iconstatename") - * A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is - * not set properly, the underlay will default to regular floor plating. + * * If `thing` doesn't have an area (E.g. the edge of the z level), return `FALSE`. + * * If one area has `area_limited_icon_smoothing` set, and the other area's type doesn't match it, return `FALSE`. + * * Else, return `TRUE`. * - * To see an example of a diagonal wall, see '/turf/closed/wall/mineral/titanium' and its subtypes. + * Arguments: + * * thing - The source atom we're smoothing. + * * turf - The target turf we're trying to smooth with. + * * val - The variable to set to `TRUE` depending on if the two can smooth. + * + *? This is a macro because it is a very very hot proc. */ - -#define SET_ADJ_IN_DIR(source, junction, direction, direction_flag) \ - do { \ - var/turf/neighbor = get_step(source, direction); \ - if(!neighbor) { \ - if(source.smoothing_flags & SMOOTH_BORDER) { \ - junction |= direction_flag; \ - }; \ +#define CAN_AREAS_SMOOTH(thing, turf, val) \ + do{ \ + if(isnull(turf)) { \ + break; \ }; \ - else { \ - if(source.can_area_smooth(neighbor)) { \ - if(!isnull(neighbor.smoothing_groups)) { \ - for(var/target in source.canSmoothWith) { \ - if(!(source.canSmoothWith[target] & neighbor.smoothing_groups[target])) { \ - continue; \ - }; \ - junction |= direction_flag; \ - break; \ - }; \ - }; \ - if(!(junction & direction_flag) && source.smoothing_flags & SMOOTH_OBJ) { \ - for(var/obj/thing in neighbor) { \ - if(!thing.anchored || isnull(thing.smoothing_groups)) { \ - continue; \ - }; \ - for(var/target in source.canSmoothWith) { \ - if(!(source.canSmoothWith[target] & thing.smoothing_groups[target])) { \ - continue; \ - }; \ - junction |= direction_flag; \ - break; \ - }; \ - if(junction & direction_flag) { \ - break; \ - }; \ - }; \ - }; \ - }; \ + var/area/source_area = get_step(thing, 0)?.loc; \ + var/area/target_area = turf:loc; \ + if(isnull(target_area)) { \ + break; \ + };\ + if(target_area.area_limited_icon_smoothing && !istype(source_area, target_area.area_limited_icon_smoothing)) { \ + break; \ + }; \ + if(source_area.area_limited_icon_smoothing && !istype(target_area, source_area.area_limited_icon_smoothing)) { \ + break; \ }; \ - } while(FALSE) + val = TRUE; \ + }while(FALSE) /** * Performs the work to set smoothing_groups and canSmoothWith. @@ -95,28 +83,6 @@ var/list/unwrapped = UNWRAP_SMOOTHING_GROUPS(smoothing_group_variable, unwrapped); \ assert_sorted(unwrapped, "[#smoothing_group_variable] ([type])"); \ -/** - * Stole this from @DaedalusDock - @Zandario - * Checks if `src` can smooth with `target`, based on the [/area/var/area_limited_icon_smoothing] variable of their areas. - * - * * If `target` doesn't have an area (E.g. the edge of the z level), return `FALSE`. - * * If one area has `area_limited_icon_smoothing` set, and the other area's type doesn't match it, return `FALSE`. - * * Else, return `TRUE`. - * - * Arguments: - * * target - The atom we're trying to smooth with. - */ -/atom/proc/can_area_smooth(atom/target) - var/area/target_area = get_area(target) - var/area/source_area = get_area(src) - if(!target_area) - return FALSE - if(target_area.area_limited_icon_smoothing && !istype(source_area, target_area.area_limited_icon_smoothing)) - return FALSE - if(source_area.area_limited_icon_smoothing && !istype(target_area, source_area.area_limited_icon_smoothing)) - return FALSE - return TRUE - /** * Scans all adjacent turfs to find targets to smooth with. */ @@ -327,7 +293,9 @@ if(!target_turf) return NULLTURF_BORDER - if(!can_area_smooth(target_turf)) + var/can_area_smooth + CAN_AREAS_SMOOTH(src, target_turf, can_area_smooth) + if(isnull(can_area_smooth)) return NO_ADJ_FOUND if(isnull(canSmoothWith)) //special case in which it will only smooth with itself @@ -358,12 +326,55 @@ * Basic smoothing proc. The atom checks for adjacent directions to smooth with and changes the icon_state based on that. * * Returns the previous smoothing_junction state so the previous state can be compared with the new one after the proc ends, and see the changes, if any. + * */ /atom/proc/bitmask_smooth() var/new_junction = NONE + // cache for sanic speed + var/canSmoothWith = src.canSmoothWith + + var/smooth_border = (smoothing_flags & SMOOTH_BORDER) + var/smooth_obj = (smoothing_flags & SMOOTH_OBJ) + + #define SET_ADJ_IN_DIR(direction, direction_flag) \ + set_adj_in_dir: { \ + do { \ + var/turf/neighbor = get_step(src, direction); \ + var/can_area_smooth; \ + CAN_AREAS_SMOOTH(src, neighbor, can_area_smooth); \ + if(neighbor && can_area_smooth) { \ + var/neighbor_smoothing_groups = neighbor.smoothing_groups; \ + if(neighbor_smoothing_groups) { \ + for(var/target in canSmoothWith) { \ + if(canSmoothWith[target] & neighbor_smoothing_groups[target]) { \ + new_junction |= direction_flag; \ + break set_adj_in_dir; \ + }; \ + }; \ + }; \ + if(smooth_obj) { \ + for(var/atom/movable/thing as anything in neighbor) { \ + var/thing_smoothing_groups = thing.smoothing_groups; \ + if(!thing.anchored || isnull(thing_smoothing_groups)) { \ + continue; \ + }; \ + for(var/target in canSmoothWith) { \ + if(canSmoothWith[target] & thing_smoothing_groups[target]) { \ + new_junction |= direction_flag; \ + break set_adj_in_dir; \ + }; \ + }; \ + }; \ + }; \ + } else if (smooth_border) { \ + new_junction |= direction_flag; \ + }; \ + } while(FALSE) \ + } + for(var/direction in GLOB.cardinal) //Cardinal case first. - SET_ADJ_IN_DIR(src, new_junction, direction, direction) + SET_ADJ_IN_DIR(direction, direction) if(!(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST))) set_smoothed_icon_state(new_junction) @@ -371,20 +382,20 @@ if(new_junction & NORTH_JUNCTION) if(new_junction & WEST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, NORTHWEST, NORTHWEST_JUNCTION) + SET_ADJ_IN_DIR(NORTHWEST, NORTHWEST_JUNCTION) if(new_junction & EAST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, NORTHEAST, NORTHEAST_JUNCTION) + SET_ADJ_IN_DIR(NORTHEAST, NORTHEAST_JUNCTION) if(new_junction & SOUTH_JUNCTION) if(new_junction & WEST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, SOUTHWEST, SOUTHWEST_JUNCTION) + SET_ADJ_IN_DIR(SOUTHWEST, SOUTHWEST_JUNCTION) if(new_junction & EAST_JUNCTION) - SET_ADJ_IN_DIR(src, new_junction, SOUTHEAST, SOUTHEAST_JUNCTION) + SET_ADJ_IN_DIR(SOUTHEAST, SOUTHEAST_JUNCTION) set_smoothed_icon_state(new_junction) - +#undef SET_ADJ_IN_DIR /** * Changes the icon state based on the new junction bitmask. Returns the old junction value. @@ -547,5 +558,3 @@ underlay_appearance.icon_state = icon_state underlay_appearance.dir = adjacency_dir return TRUE - -#undef SET_ADJ_IN_DIR diff --git a/code/__HELPERS/pathfinding/astar.dm b/code/__HELPERS/pathfinding/astar.dm index 8de65a3f5c..901fb35ae7 100644 --- a/code/__HELPERS/pathfinding/astar.dm +++ b/code/__HELPERS/pathfinding/astar.dm @@ -176,7 +176,7 @@ GLOBAL_VAR_INIT(astar_visualization_persist, 3 SECONDS) start.color = ASTAR_VISUAL_COLOR_OPEN #endif - while(length(open.queue)) + while(length(open.array)) // get best node var/datum/astar_node/top = open.dequeue() current = top.pos @@ -231,7 +231,7 @@ GLOBAL_VAR_INIT(astar_visualization_persist, 3 SECONDS) turfs_got_colored[top.pos] = TRUE #endif - if(length(open.queue) > ASTAR_SANE_NODE_LIMIT) + if(length(open.array) > ASTAR_SANE_NODE_LIMIT) #ifdef ASTAR_DEBUGGING astar_wipe_colors_after(turfs_got_colored, GLOB.astar_visualization_persist) #endif diff --git a/code/__HELPERS/pathfinding/jps.dm b/code/__HELPERS/pathfinding/jps.dm index 75f7bbdb58..9e1cdb5147 100644 --- a/code/__HELPERS/pathfinding/jps.dm +++ b/code/__HELPERS/pathfinding/jps.dm @@ -406,7 +406,7 @@ GLOBAL_VAR_INIT(jps_visualization_resolve, TRUE) while(TRUE); #endif //* loop - while(length(open.queue)) + while(length(open.array)) node_top = open.dequeue() node_top_pos = node_top.pos #ifdef JPS_DEBUGGING diff --git a/code/__HELPERS/sorts/comparators.dm b/code/__HELPERS/sorts/comparators.dm index 6e3134a538..0214226acb 100644 --- a/code/__HELPERS/sorts/comparators.dm +++ b/code/__HELPERS/sorts/comparators.dm @@ -1,6 +1,10 @@ /** * Comparators for use with /datum/sort_instance (or wherever you want) - * They should return negative, zero, or positive numbers for a < b, a == b, and a > b respectively. + * + * They should return negative, zero, or positive numbers for a < b, a == b, and a > b respectively, where + * * neg : a < b = "a should be in front of b", + * * zero: a == b = "a and b are equivalent" + * * pos : a > b = "a should be behind b" */ //! Standard Sort diff --git a/code/_globals/lists/clothing.dm b/code/_globals/lists/clothing.dm index 6cb05adce2..fdb1697eaf 100644 --- a/code/_globals/lists/clothing.dm +++ b/code/_globals/lists/clothing.dm @@ -28,3 +28,7 @@ GLOBAL_LIST_INIT(clothing_belt, generate_chameleon_choices(/obj/item/storage/bel // accessories GLOBAL_LIST_INIT(clothing_accessory, generate_chameleon_choices(/obj/item/clothing/accessory, list(/obj/item/clothing/accessory/chameleon))) + +GLOBAL_LIST_INIT(clothing_ears, generate_chameleon_choices(/obj/item/clothing/ears)) + +GLOBAL_LIST_INIT(clothing_headsets, generate_chameleon_choices(/obj/item/radio/headset)) diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index c8b2cdd3f9..8c571111df 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -224,7 +224,7 @@ continue_check_key = ispath(new_key) switch(value_mode) if(VALUE_MODE_FLAG) - new_value = TRUE + new_value = text2num(key_value) != 0 && lowertext(key_value) != "false" continue_check_value = TRUE if(VALUE_MODE_NUM) new_value = text2num(key_value) diff --git a/code/controllers/configuration/entries/game.dm b/code/controllers/configuration/entries/game.dm index 549ab14ca6..3da3132bf9 100644 --- a/code/controllers/configuration/entries/game.dm +++ b/code/controllers/configuration/entries/game.dm @@ -37,9 +37,6 @@ /datum/config_entry/flag/allow_holidays default = TRUE -/datum/config_entry/flag/nightshifts_enabled - default = TRUE - /datum/config_entry/string/alert_desc_green default = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." @@ -81,3 +78,34 @@ /datum/config_entry/flag/almost_everyone_has_maintenance_access default = TRUE + +//* Nightshifts *// + +/datum/config_entry/flag/nightshifts_enabled + default = TRUE + +/datum/config_entry/keyed_list/nightshift_levels + default = list( + "Unset", + "PublicHalls", + "PublicAreas", + "DepartmentHalls", + "DepartmentLeisure", + "CommandHalls", + ) + lowercase = FALSE + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_FLAG + +/datum/config_entry/keyed_list/nightshift_levels/ValidateAndSet(str_val) + . = ..() + if(!.) + return + var/datum/bitfield/single/target_bitfield = /datum/bitfield/single/nightshift_level + var/target_bitname = initial(target_bitfield.variable) + var/list/actual_bitfield = GLOB.bitfields[target_bitname] + var/new_flags = NONE + for(var/key in config_entry_value) + if(config_entry_value[key]) + new_flags |= actual_bitfield[key] + SSnightshift.nightshift_level = new_flags diff --git a/code/controllers/configuration_old/configuration.dm b/code/controllers/configuration_old/configuration.dm index 1af300a08d..3bd2f44c05 100644 --- a/code/controllers/configuration_old/configuration.dm +++ b/code/controllers/configuration_old/configuration.dm @@ -125,18 +125,9 @@ var/health_threshold_crit = 0 var/health_threshold_dead = -100 - var/organ_health_multiplier = 1 - var/organ_regeneration_multiplier = 1 var/default_brain_health = 400 var/allow_headgibs = FALSE - //Paincrit knocks someone down once they hit 60 shock_stage, so by default make it so that close to 100 additional damage needs to be dealt, - //so that it's similar to HALLOSS. Lowered it a bit since hitting paincrit takes much longer to wear off than a halloss stun. - var/organ_damage_spillover_multiplier = 0.5 - - var/bones_can_break = 0 - var/limbs_can_break = 0 - var/revival_pod_plants = 1 var/revival_cloning = 1 var/revival_brain_life = -1 @@ -794,20 +785,10 @@ config_legacy.revival_cloning = value if("revival_brain_life") config_legacy.revival_brain_life = value - if("organ_health_multiplier") - config_legacy.organ_health_multiplier = value / 100 - if("organ_regeneration_multiplier") - config_legacy.organ_regeneration_multiplier = value / 100 - if("organ_damage_spillover_multiplier") - config_legacy.organ_damage_spillover_multiplier = value / 100 if("default_brain_health") config_legacy.default_brain_health = text2num(value) if(!config_legacy.default_brain_health || config_legacy.default_brain_health < 1) config_legacy.default_brain_health = initial(config_legacy.default_brain_health) - if("bones_can_break") - config_legacy.bones_can_break = value - if("limbs_can_break") - config_legacy.limbs_can_break = value if("allow_headgibs") config_legacy.allow_headgibs = TRUE diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index f05c86e92d..6f848ba04c 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -104,15 +104,14 @@ SUBSYSTEM_DEF(input) // Badmins just wanna have fun ♪ /datum/controller/subsystem/input/proc/refresh_client_macro_sets() - var/list/clients = GLOB.clients - for(var/i in 1 to clients.len) - var/client/user = clients[i] + for(var/client/user as anything in GLOB.clients) + if(!user.initialized) + continue user.set_macros() user.update_movement_keys() /datum/controller/subsystem/input/fire() - var/list/clients = GLOB.clients // Let's sing the list cache song - for(var/client/C as anything in clients) + for(var/client/C as anything in GLOB.clients) if(!C.initialized) continue C.keyLoop() diff --git a/code/controllers/subsystem/nanoui.dm b/code/controllers/subsystem/nanoui.dm index c9384bcf05..e5bc5d6314 100644 --- a/code/controllers/subsystem/nanoui.dm +++ b/code/controllers/subsystem/nanoui.dm @@ -182,7 +182,7 @@ SUBSYSTEM_DEF(nanoui) * * @return bool FALSE if no ui was removed, TRUE if removed successfully */ -/datum/controller/subsystem/nanoui/proc/ui_closed(datum/nanoui/ui) +/datum/controller/subsystem/nanoui/proc/on_ui_closed(datum/nanoui/ui) var/src_object_key = "\ref[ui.src_object]" if (!open_uis[src_object_key] || !open_uis[src_object_key][ui.ui_key]) return FALSE // wasn't open diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index 8696aa1480..7321979537 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -5,6 +5,11 @@ SUBSYSTEM_DEF(nightshift) wait = 60 SECONDS subsystem_flags = SS_NO_TICK_CHECK + /// Set from configuration - enabled nightshift flags. + var/nightshift_level = NONE + + //! legacy below + var/nightshift_active = FALSE var/nightshift_start_time = 19 HOURS + 30 MINUTES //7:30 PM, station time var/nightshift_end_time = 7 HOURS + 30 MINUTES //7:30 AM, station time @@ -64,7 +69,7 @@ SUBSYSTEM_DEF(nightshift) for(var/obj/machinery/power/apc/apc in GLOB.apcs) if(apc.z in (LEGACY_MAP_DATUM).station_levels) - apc.set_nightshift(active, TRUE) + apc.set_nightshift(active && (apc.area.nightshift_level & nightshift_level), TRUE) CHECK_TICK SSlighting.resume_instant() diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index fdf4653963..5c1b72de73 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -17,6 +17,7 @@ SUBSYSTEM_DEF(parallax) while(length(currentrun)) var/client/processing_client = currentrun[currentrun.len] currentrun.len-- + // implicitly checks initialized if (QDELETED(processing_client) || !processing_client.eye) if (MC_TICK_CHECK) return @@ -28,6 +29,7 @@ SUBSYSTEM_DEF(parallax) while(length(currentrun)) var/client/processing_client = currentrun[currentrun.len] currentrun.len-- + // implicitly checks initialized if (QDELETED(processing_client) || !processing_client.eye) if (MC_TICK_CHECK) return @@ -106,6 +108,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/update_clients_on_z(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.Update(TRUE) @@ -114,6 +118,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/reset_clients_on_z(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.reset() @@ -122,6 +128,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/update_z_vis_contents(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.SyncVisContents() @@ -130,6 +138,8 @@ SUBSYSTEM_DEF(parallax) */ /datum/controller/subsystem/parallax/proc/update_z_motion(z) for(var/client/C in GLOB.clients) + if(!C.initialized) + continue if(C.mob.z == z) C.parallax_holder?.UpdateMotion() diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm index d8b5ba01b9..12ac61b1b4 100644 --- a/code/controllers/subsystem/ping.dm +++ b/code/controllers/subsystem/ping.dm @@ -27,6 +27,9 @@ SUBSYSTEM_DEF(ping) var/client/client = currentrun[currentrun.len] currentrun.len-- + if(!client.initialized) + continue + if (client?.tgui_panel?.is_ready()) // Send a soft ping client.tgui_panel.window.send_message("ping/soft", list( diff --git a/code/controllers/subsystem/processing/chemistry.dm b/code/controllers/subsystem/processing/chemistry.dm index 07eff0f752..9bd0ed8199 100644 --- a/code/controllers/subsystem/processing/chemistry.dm +++ b/code/controllers/subsystem/processing/chemistry.dm @@ -62,5 +62,5 @@ PROCESSING_SUBSYSTEM_DEF(chemistry) * * do not edit the returned instance, it is global! */ -/datum/controller/subsystem/processing/chemistry/proc/get_reagent(datum/reagent/id_or_path) +/datum/controller/subsystem/processing/chemistry/proc/fetch_reagent(datum/reagent/id_or_path) return reagent_lookup[ispath(id_or_path)? initial(id_or_path.id) : id_or_path] diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index 1815632e1b..b3d214da48 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -361,6 +361,8 @@ SUBSYSTEM_DEF(tgui) ui.user = target target.tgui_open_uis.Add(ui) source.on_ui_transfer(source, target, ui) + for(var/datum/module in ui.modules_processed) + module.on_ui_transfer(source, target, ui, TRUE) // Clear the old list. source.tgui_open_uis.Cut() return TRUE diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 33eb999ab1..7fa198c888 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -35,6 +35,8 @@ SUBSYSTEM_DEF(throwing) currentrun = null +// todo: the landing stack kinda sucks ass and needs to be unit tested and rewritten + /datum/thrownthing //! important stuff /// thing we threw @@ -197,7 +199,7 @@ SUBSYSTEM_DEF(throwing) // if we have gravity we can end, else keep going if(AM.has_gravity()) if(dist_travelled >= maxrange || AM.loc == target_turf) - terminate() + land() return else if(dist_travelled >= MAX_THROWING_DIST) terminate() @@ -340,6 +342,7 @@ SUBSYSTEM_DEF(throwing) * land on something and terminate the throw */ /datum/thrownthing/proc/land(atom/A = get_turf(thrownthing)) + // todo: need to rewrite to consider qdel's for object + us maybe? // nothing to land on if(!A) terminate() @@ -349,6 +352,10 @@ SUBSYSTEM_DEF(throwing) if(!impacted[target] && (target in get_turf(A))) impact(target, TRUE) + // we got terminated already + if(finished) + return + // land thrownthing._throw_finalize(A, src) on_land?.InvokeAsync(A, src) @@ -361,6 +368,9 @@ SUBSYSTEM_DEF(throwing) * when called, immediately erases the throw from the atom and stops it. */ /datum/thrownthing/proc/terminate(in_qdel) + // todo: shitcode, rewrite + if(QDELETED(src)) + return finished = TRUE thrownthing.throwing = null if(!QDELETED(thrownthing)) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index f7c293c180..885cf5541c 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -184,9 +184,12 @@ SUBSYSTEM_DEF(vote) log_vote(text) to_chat(world, "[text]\nType vote or click here to place your votes.\nYou have [config_legacy.vote_period / 10] seconds to vote.") - if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM) + if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE) SEND_SOUND(world, sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)) + if(vote_type == VOTE_CUSTOM) + SEND_SOUND(world, sound('sound/custom_vote.ogg', repeat = 0, wait = 0, volume = 30, channel = 3)) + time_remaining = round(config_legacy.vote_period / 10) return 1 return 0 @@ -215,7 +218,7 @@ SUBSYSTEM_DEF(vote) ui = new(user, src, "Vote") ui.open() -/datum/controller/subsystem/vote/ui_data(mob/user) +/datum/controller/subsystem/vote/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "choices" = list(), "question" = question, @@ -235,7 +238,7 @@ SUBSYSTEM_DEF(vote) return data -/datum/controller/subsystem/vote/ui_act(action, params) +/datum/controller/subsystem/vote/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/datums/ability.dm b/code/datums/ability.dm index 6c50c2ba8b..277197b696 100644 --- a/code/datums/ability.dm +++ b/code/datums/ability.dm @@ -30,7 +30,7 @@ /// action button background icon var/background_icon = 'icons/screen/actions/backgrounds.dmi' /// action button background icon state - the _on overlay will be added while active, automatically. - var/background_state = "alien" + var/background_state = "default" /// currently hotbound? var/bound = FALSE /// automatically hotbound? @@ -41,6 +41,13 @@ var/interact_type = ABILITY_INTERACT_NONE /// currently hidden? var/hidden = FALSE + /// targeted? + /// targeted abilities only work with ABILITY_INTERACT_TOGGLE + var/targeted = FALSE + /// target type? Can be anything (atoms), mobs or turfs + var/targeting_type = ABILITY_TARGET_ALL + /// range? + var/range //? ui /// tgui id @@ -148,6 +155,10 @@ return if(isnull(toggling)) toggling = !enabled + if(targeted) + if(ishuman(user) && toggling == TRUE) + var/mob/living/carbon/human/H = user + H.ab_handler?.process_ability(src) if(!check_trigger(user, toggling, TRUE)) return if(windup) @@ -199,12 +210,16 @@ enabled = TRUE if(update_action) update_action() + action?.background_icon_state += "_on" + action?.update_button() on_enable() /datum/ability/proc/disable(update_action) enabled = FALSE if(update_action) update_action() + action?.background_icon_state = background_state + action?.update_button() on_disable() /datum/ability/proc/on_enable() @@ -299,10 +314,30 @@ if(always_bind) quickbind() + +/** + * checks if the target is within range and the ability is triggerable + */ +/datum/ability/proc/target_check(mob/user, atom/target) + if(range) + if(get_dist(get_turf(user),get_turf(target)) > range) + return FALSE + if(check_trigger(user)) + target_trigger(user,target) + return TRUE + return FALSE + +/** + * target-affecting proc + */ +/datum/ability/proc/target_trigger(mob/user, atom/target) + //target-related code goes here + disable() + /** * static data for tgui panel */ -/datum/ability/ui_static_data(mob/user) +/datum/ability/ui_static_data(mob/user, datum/tgui/ui) return list( "$tgui" = tgui_id, "$src" = REF(src), diff --git a/code/datums/ability_handler.dm b/code/datums/ability_handler.dm new file mode 100644 index 0000000000..269acce512 --- /dev/null +++ b/code/datums/ability_handler.dm @@ -0,0 +1,31 @@ +/datum/ability_handler + var/datum/ability/current + var/target_type + +///Is called by the ability +/datum/ability_handler/proc/process_ability(var/datum/ability/ab) + current = ab + switch(current?.targeting_type) + if(ABILITY_TARGET_ALL) + target_type = /atom + if(ABILITY_TARGET_MOB) + target_type = /mob + if(ABILITY_TARGET_TURF) + target_type = /turf + else + target_type = null + return + ab.owner.client.mouse_pointer_icon = file("icons/screen/mouse_pointers/standard1.dmi") + +///Is called by a click if there's an ability in 'current' +/datum/ability_handler/proc/process_click(mob/user, atom/A) + if(current) + if(target_type && !istype(A, target_type)) + return FALSE + if(A.atom_flags & ATOM_ABSTRACT) + return FALSE + if(current.target_check(user, A)) + current = null + user.client?.mouse_pointer_icon = initial(user.client.mouse_pointer_icon) + return TRUE + return FALSE diff --git a/code/datums/action.dm b/code/datums/action.dm index c5c3fe219e..7f508f61e5 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -69,6 +69,8 @@ var/button_toggled /// are button updates managed? if so, we don't auto update. var/button_managed = FALSE + /// is the button visible + var/button_visibility = TRUE /datum/action/New(datum/target) if(!target_compatible(target)) diff --git a/code/datums/changelog.dm b/code/datums/changelog.dm index d1f8709524..910c72186f 100644 --- a/code/datums/changelog.dm +++ b/code/datums/changelog.dm @@ -21,7 +21,7 @@ changelog_items[params["date"]] = changelog_item return ui.send_asset(changelog_item) -/datum/changelog/ui_static_data() +/datum/changelog/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list( "dates" = list() ) var/regex/ymlRegex = regex(@"\.yml", "g") diff --git a/code/datums/character_profile.dm b/code/datums/character_profile.dm index 6a512863e3..93ddda7b62 100644 --- a/code/datums/character_profile.dm +++ b/code/datums/character_profile.dm @@ -1,5 +1,3 @@ -GLOBAL_LIST_EMPTY(cached_previews) - /datum/description_profile var/datum/weakref/host @@ -14,7 +12,7 @@ GLOBAL_LIST_EMPTY(cached_previews) /datum/description_profile/ui_state() return GLOB.always_state -/datum/description_profile/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/description_profile/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/data[0] var/mob/living/carbon/human/H = host.resolve() diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 004d48b532..48d25e16a0 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -328,7 +328,7 @@ if(user == parent) INVOKE_ASYNC(src, PROC_REF(ui_interact), user) -/datum/component/personal_crafting/ui_state(mob/user, datum/tgui_module/module) +/datum/component/personal_crafting/ui_state() return GLOB.not_incapacitated_turf_state //For the UI related things we're going to assume the user is a mob rather than typesetting it to an atom as the UI isn't generated if the parent is an atom @@ -344,7 +344,7 @@ ui = new(user, src, "PersonalCrafting") ui.open() -/datum/component/personal_crafting/ui_data(mob/user) +/datum/component/personal_crafting/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["busy"] = busy data["category"] = cur_category @@ -368,7 +368,7 @@ data["craftability"] = craftability return data -/datum/component/personal_crafting/ui_static_data(mob/user) +/datum/component/personal_crafting/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/crafting_recipes = list() @@ -395,7 +395,7 @@ data["crafting_recipes"] = crafting_recipes return data -/datum/component/personal_crafting/ui_act(action, params) +/datum/component/personal_crafting/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) diff --git a/code/datums/components/turfs/transition_border.dm b/code/datums/components/turfs/transition_border.dm index bf885a186a..056b63042f 100644 --- a/code/datums/components/turfs/transition_border.dm +++ b/code/datums/components/turfs/transition_border.dm @@ -54,25 +54,29 @@ STACK_TRACE("no z index?! deleting self.") qdel(src) return - var/turf/target - switch(dir) - if(NORTH) - target = locate(our_turf.x, 2, z_index) - if(SOUTH) - target = locate(our_turf.x, world.maxy - 1, z_index) - if(EAST) - target = locate(2, our_turf.y, z_index) - if(WEST) - target = locate(world.maxx - 1, our_turf.y, z_index) - if(NORTHEAST) - target = locate(2, 2, z_index) - if(NORTHWEST) - target = locate(world.maxx - 1, 2, z_index) - if(SOUTHEAST) - target = locate(2, world.maxy - 1, z_index) - if(SOUTHWEST) - target = locate(world.maxx - 1, world.maxy - 1, z_index) - AM.locationTransitForceMove(target, recurse_levels = 2) + // todo: this is shit but we have to yield to prevent a Moved() before Moved() + spawn(0) + if(AM.loc != our_turf) + return + var/turf/target + switch(dir) + if(NORTH) + target = locate(our_turf.x, 2, z_index) + if(SOUTH) + target = locate(our_turf.x, world.maxy - 1, z_index) + if(EAST) + target = locate(2, our_turf.y, z_index) + if(WEST) + target = locate(world.maxx - 1, our_turf.y, z_index) + if(NORTHEAST) + target = locate(2, 2, z_index) + if(NORTHWEST) + target = locate(world.maxx - 1, 2, z_index) + if(SOUTHEAST) + target = locate(2, world.maxy - 1, z_index) + if(SOUTHWEST) + target = locate(world.maxx - 1, world.maxy - 1, z_index) + AM.locationTransitForceMove(target, recurse_levels = 2) /datum/component/transition_border/proc/rebuild() // reset first diff --git a/code/datums/recipe/stack_recipe.dm b/code/datums/recipe/stack_recipe.dm index 4d716d4e31..581d427a31 100644 --- a/code/datums/recipe/stack_recipe.dm +++ b/code/datums/recipe/stack_recipe.dm @@ -48,12 +48,17 @@ var/exclusitivity /// max amount to allow crafting at once. null for 1 non stack, infinity stack var/max_amount + /// we're a border object + var/on_border = FALSE // todo: material constraints /datum/stack_recipe/New() if(ispath(result_type, /obj/item/stack)) result_is_stack = TRUE + var/atom/casted = result_type + on_border = !!(initial(casted.atom_flags) & ATOM_BORDER) + /** * attepmt to craft * @@ -92,6 +97,9 @@ for(var/atom/movable/AM as anything in where) if(AM == user) continue + // border only collides with other border objs in the same dir + if((AM.atom_flags & ATOM_BORDER) && (!on_border || (AM.dir != use_dir))) + continue if(AM.density) if(!silent) user.action_feedback(SPAN_WARNING("[AM] is in the way.")) diff --git a/code/datums/underwear/socks.dm b/code/datums/underwear/socks.dm index 3b8533fab3..be6f1e9743 100644 --- a/code/datums/underwear/socks.dm +++ b/code/datums/underwear/socks.dm @@ -443,3 +443,12 @@ /datum/category_item/underwear/socks/pantyhose_rip_stirrup name = "Ripped Pantyhose (Stirrup)" icon_state = "pantyhose_ripped-stir" + +/datum/category_item/underwear/socks/asymmetrical_thigh_stirrups + name = "Asymmetrical Thigh (Stirrup)" + icon_state = "socks_thigh_asym_stirrup" + has_color = TRUE + +/datum/category_item/underwear/socks/asymmetrical_thigh_stirrups/reversed + name = "Asymmetrical Thigh (Stirrup) (Reversed)" + icon_state = "socks_thigh_asym_stirrup_r" diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index f1b15da6ca..e923ccd693 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -15,7 +15,7 @@ if(A.isElectrified()) if(A.shock(user, 100)) return FALSE - if(A.p_open) + if(A.panel_open) return TRUE return FALSE diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 110c1dff22..e7a2edfed2 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -92,10 +92,10 @@ ui = new(user, src, "Wires", "[proper_name] wires") ui.open() -/datum/wires/ui_state(mob/user, datum/tgui_module/module) +/datum/wires/ui_state() return GLOB.physical_state -/datum/wires/ui_data(mob/user) +/datum/wires/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/replace_colors @@ -150,7 +150,7 @@ data["status"] = status return data -/datum/wires/ui_act(action, list/params) +/datum/wires/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/game/area/Ship_Station_Areas.dm b/code/game/area/Ship_Station_Areas.dm index 0e0a373702..5a428eeeff 100644 --- a/code/game/area/Ship_Station_Areas.dm +++ b/code/game/area/Ship_Station_Areas.dm @@ -17,6 +17,69 @@ /area/main_map/hanger_cafe name = "Fuel Cafe" + +/** + * Turbolifts + * Medical + */ + +/area/turbolift/medical/EutheniaDeck3 + name = "Medical (Deck 3)" + lift_floor_label = "Medical Deck 3" + lift_floor_name = "Pyscology, Resleaving, Morgue, Storage" + lift_announce_str = "Arriving at Medical Deck 3." + +/area/turbolift/medical/EutheniaDeck2 + name = "Medical (Deck 2)" + lift_floor_label = "Medical Deck 2" + lift_floor_name = "Recovery, Virology, CMO Office" + lift_announce_str = "Arriving at Medical Deck 2." + +/area/turbolift/medical/EutheniaDeck1 + name = "Medical (Deck 1)" + lift_floor_label = "Medical Deck 1" + lift_floor_name = "Treatement, Surgery, Chemistry, Paramedic Office" + lift_announce_str = "Arriving at Medical Deck 1." + +/area/turbolift/medical/EutheniaDeck0 + name = "Medical (Flight Deck)" + lift_floor_label = "Medical Flight Deck" + lift_floor_name = "Medical Emergency Dock, MedEvac Shuttle" + lift_announce_str = "Arriving at Medical Flight Deck." +/** + * Cargo + */ + +/area/turbolift/cargo/EutheniaDeck4 + name = "Cargo (Deck 4)" + lift_floor_label = "Cargo Deck 4" + lift_floor_name = "Mining Operations" + lift_announce_str = "Arriving at Cargo Deck 4." +/area/turbolift/cargo/EutheniaDeck3 + name = "Cargo (Deck 3)" + lift_floor_label = "Cargo Deck 3" + lift_floor_name = "Warehouse, Supply Shuttle Dock" + lift_announce_str = "Arriving at Cargo Deck 3." + +/area/turbolift/cargo/EutheniaDeck2 + name = "Cargo (Deck 2)" + lift_floor_label = "Cargo Deck 2" + lift_floor_name = "Front Desk, QM Office" + lift_announce_str = "Arriving at Cargo Deck 2." + +/area/turbolift/cargo/EutheniaDeck1 + name = "Cargo (Deck 1)" + lift_floor_label = "Cargo Deck 1" + lift_floor_name = "Mail and Packages" + lift_announce_str = "Arriving at Cargo Deck 1." + +/area/turbolift/cargo/EutheniaDeck0 + name = "Cargo (Flight Deck)" + lift_floor_label = "Cargo Flight Deck" + lift_floor_name = "Salvage Operations" + lift_announce_str = "Arriving at Cargo Flight Deck." + + /** * Hallways */ @@ -157,6 +220,48 @@ /area/main_map/maintenance/engineering/deck4 /area/main_map/maintenance/engineering/deck4/secondary + +/** + *! Flight Deck Maint Areas + */ + +/area/main_map/maintenance/deck_zero + name = "\improper Flight Deck Maintenance" + icon_state = "maintcentral" + +/area/main_map/maintenance/deck_zero/port + name = "\improper Flight Deck Port Maintenance" + icon_state = "pmaint" + +/area/main_map/maintenance/deck_zero/starboard + name = "\improper Flight Deck Starboard Maintenance" + icon_state = "smaint" + +/area/main_map/maintenance/deck_zero/forward + name = "\improper Flight Deck Forward Maintenance" + icon_state = "fmaint" + +/area/main_map/maintenance/deck_zero/forward/port + name = "\improper Flight Deck Forward Port Maintenance" + icon_state = "fpmaint" + +/area/main_map/maintenance/deck_zero/forward/starboard + name = "\improper Flight Deck Forward Starboard Maintenance" + icon_state = "fsmaint" + +/area/main_map/maintenance/deck_zero/aft + name = "\improper Flight Deck Aft Maintenance" + icon_state = "amaint" + +/area/main_map/maintenance/deck_zero/aft/port + name = "\improper Flight Deck Aft Port Maintenance" + icon_state = "apmaint" + +/area/main_map/maintenance/deck_zero/aft/starboard + name = "\improper Flight Deck Aft Starboard Maintenance" + icon_state = "asmaint" + + /** *! Deck One Maint Areas */ diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 3498b98848..7f14e0dc78 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -33,6 +33,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station ambience = AMBIENCE_SPACE area_flags = AREA_FLAG_EXTERNAL is_outside = OUTSIDE_YES + nightshift_level = NONE /area/space/atmosalert() return @@ -1113,6 +1114,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/hallway/primary/ sound_env = LARGE_ENCLOSED ambience = AMBIENCE_GENERIC + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS /area/hallway/primary/fore name = "\improper Fore Primary Hallway" @@ -1146,6 +1148,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Central Primary Hallway - Port" icon_state = "hallC4" +/area/hallway/secondary + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS + /area/hallway/secondary/exit name = "\improper Escape Shuttle Hallway" icon_state = "escape" @@ -1291,63 +1296,77 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Bridge" icon_state = "bridge" music = "signal" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/bridge/bridge_hallway name = "Bridge Hallway" icon_state = "bridge" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_HALLWAYS /area/bridge/meeting_room name = "Heads of Staff Meeting Room" icon_state = "bridge" music = null sound_env = MEDIUM_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/bridge/office name = "Official On-Site Office" icon_state = "bridge" music = null sound_env = MEDIUM_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/bridge/hop_office name = "Head Of Personal Office" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/triumph/station/public_meeting_room name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/crew_quarters/captain name = "Command - Facility Director's Office" icon_state = "captain" sound_env = MEDIUM_SOFTFLOOR + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/hop name = "Command - HoP's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/blueshield name = "Command - Blueshield's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/hor name = "Research - RD's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/chief name = "Engineering - CE's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/hos name = "Security - HoS' Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/heads/cmo name = "Medbay - CMO's Office" icon_state = "head_quarters" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_FACILITIES /area/crew_quarters/courtroom name = "Courtroom" icon_state = "courtroom" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/mint name = "Mint" @@ -1368,6 +1387,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "crew_quarters" area_flags = AREA_RAD_SHIELDED ambience = AMBIENCE_GENERIC + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/crew_quarters/toilet name = "Dormitory Toilets" @@ -1652,6 +1672,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/crew_quarters/recreation_area_hallway name = "\improper Recreation Area Hallway" icon_state = "recreation_area_hallway" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_HALLWAYS /area/crew_quarters/recreation_area_restroom name = "\improper Recreation Area Restroom" @@ -1895,6 +1916,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Engineering" icon_state = "engineering" ambience = AMBIENCE_ENGINEERING + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/shield_gen name = "\improper Shield Generation" @@ -1905,6 +1927,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "atmos" sound_env = LARGE_ENCLOSED ambience = AMBIENCE_ATMOS + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/atmos/backup name = "\improper Backup Atmospherics" @@ -1918,48 +1941,62 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Atmospherics Storage" icon_state = "atmos_storage" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/processing name = "Atmospherics Processing" icon_state = "atmos" sound_env = LARGE_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/intake name = "\improper Atmospherics Intake" icon_state = "atmos" sound_env = MOUNTAINS + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/hallway name = "\improper Atmospherics Main Hallway" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/engineering/atmos/locker_room name = "\improper Engineering Atmos Locker Room" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/atmos/eva name = "\improper Engineering Atmos EVA" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + +/area/engineering/atmos/workshop + name = "\improper Atmospherics Workshop" /area/engineering/drone_fabrication name = "\improper Engineering Drone Fabrication" icon_state = "drone_fab" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/engineering/engine_smes name = "\improper Engineering SMES" icon_state = "engine_smes" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_room name = "\improper Engine Room" icon_state = "engine" sound_env = LARGE_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_airlock name = "\improper Engine Room Airlock" icon_state = "engine" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_monitoring name = "\improper Engine Monitoring Room" icon_state = "engine_monitoring" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/engineering/engine_waste name = "\improper Engine Waste Handling" @@ -1972,6 +2009,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/engineering/foyer name = "\improper Engineering Foyer" icon_state = "engineering_foyer" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/engineering/foyer/lower name = "\improper Lower Enginering Foyer" @@ -2054,6 +2092,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station requires_power = 1 always_unpowered = 1 ambience = AMBIENCE_SPACE + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/solar/auxport name = "\improper Fore Port Solar Array" @@ -2157,10 +2196,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "\improper Medical" icon_state = "medbay" music = 'sound/ambience/signal.ogg' + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/medical/medbay name = "\improper Medbay Hallway - Port" icon_state = "medbay" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/resleeving name = "Resleeving Lab" @@ -2170,14 +2211,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/medbay2 name = "\improper Medbay Hallway - Starboard" icon_state = "medbay2" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/medbay3 name = "\improper Medbay Hallway - Fore" icon_state = "medbay3" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/medbay4 name = "\improper Medbay Hallway - Aft" icon_state = "medbay4" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/biostorage name = "\improper Secondary Storage" @@ -2186,6 +2230,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/reception name = "\improper Medbay Reception" icon_state = "medbay" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/medbay_emt_bay name = "\improper Medical EMT Bay" @@ -2351,10 +2396,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/medical/first_aid_station_starboard name = "\improper Starboard First-Aid Station" icon_state = "medbay2" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/first_aid_station name = "\improper Port First-Aid Station" icon_state = "medbay2" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/medical/psych_ward name = "\improper Psych Ward" @@ -2362,13 +2409,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station //Security +/area/security + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + /area/security/main name = "\improper Security Office" icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/security/lobby name = "\improper Security Lobby" icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/security/brig name = "\improper Security - Brig" @@ -2403,6 +2455,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "armory" ambience = AMBIENCE_HIGHSEC area_flags = AREA_FLAG_BLUE_SHIELDED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/security/briefing_room name = "\improper Security - Briefing Room" @@ -2423,6 +2476,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/riot_control name = "\improper Security - Riot Control" icon_state = "riot_control" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/security/detectives_office name = "\improper Security - Forensic Office" @@ -2479,6 +2533,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/breakroom name = "\improper Security Breakroom" icon_state = "security" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/security/brig/visitation name = "\improper Visitation" @@ -2519,7 +2574,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/security/visitor name = "\improper Security Visitor Room" icon_state = "security" - + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /* New() @@ -2602,14 +2657,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster name = "\improper Quartermasters" icon_state = "quart" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/quartermaster/hallway name = "\improper Cargo Hallway" icon_state = "quart" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/quartermaster/office name = "\improper Cargo Office" icon_state = "quartoffice" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/quartermaster/storage name = "\improper Cargo Bay" @@ -2619,6 +2677,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/foyer name = "\improper Cargo Bay Foyer" icon_state = "quartstorage" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/quartermaster/warehouse name = "\improper Cargo Warehouse" @@ -2646,8 +2705,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/quartermaster/garage name = "\improper Cargo Garage" +/area/quartermaster/cargo_shelter_dock + name = "\improper Cargo Shuttle Dock" // SCIENCE +/area/rnd + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES + /area/rnd/research name = "\improper Research and Development" icon_state = "research" @@ -2655,15 +2719,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/research_foyer name = "\improper Research Foyer" icon_state = "research_foyer" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/research_foyer_auxiliary name = "\improper Research Foyer Auxiliary" icon_state = "research_foyer_aux" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/research_restroom name = "\improper Research Restroom" icon_state = "research_restroom" sound_env = SMALL_ENCLOSED + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/rnd/research_storage name = "\improper Research Storage" @@ -2731,10 +2798,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/breakroom name = "\improper Research Break Room" icon_state = "research" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/rnd/reception_desk name = "\improper Research Reception Desk" @@ -2751,6 +2820,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/rnd/hallway name = "\improper Research Lower Hallway" icon_state = "research" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/rnd/anomaly_lab name = "\improper Anomaly Lab" @@ -2951,33 +3021,41 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/storage/tools name = "Auxiliary Tool Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/primary name = "Primary Tool Storage" icon_state = "primarystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/autolathe name = "Autolathe Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/art name = "Art Supply Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/auxillary name = "Auxillary Storage" icon_state = "auxstorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/eva name = "EVA Storage" icon_state = "eva" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/surface_eva icon_state = "storage" name = "\improper Surface EVA" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/surface_eva/external name = "\improper Surface EVA Access" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/secure name = "Secure Storage" @@ -2986,30 +3064,37 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/storage/emergency_storage/emergency name = "Starboard Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency2 name = "Port Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency3 name = "Central Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency4 name = "Civilian Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency5 name = "Dock Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/emergency_storage/emergency6 name = "Cargo Emergency Storage" icon_state = "emergencystorage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/storage/tech name = "Technical Storage" icon_state = "auxstorage" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/storage/testroom requires_power = 0 @@ -3132,6 +3217,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/constructionsite name = "\improper Construction Site" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/constructionsite/storage name = "\improper Construction Site Storage Area" @@ -3231,50 +3317,60 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/ai_monitored/storage/eva name = "EVA Storage" icon_state = "eva" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/ai_monitored/storage/secure name = "Secure Storage" icon_state = "storage" ambience = AMBIENCE_HIGHSEC + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/ai_monitored/storage/emergency name = "Emergency Storage" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/ai_monitored/storage/emergency/eva name = "Emergency EVA" icon_state = "storage" + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES /area/ai_upload name = "\improper AI Upload Chamber" icon_state = "ai_upload" ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai_upload_foyer name = "AI Upload Access" icon_state = "ai_foyer" sound_env = SMALL_ENCLOSED ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai_server_room name = "Messaging Server Room" icon_state = "ai_server" sound_env = SMALL_ENCLOSED ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE /area/ai name = "\improper AI Chamber" icon_state = "ai_chamber" ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai/foyer name = "\improper AI Core Access" + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/ai_cyborg_station name = "\improper Cyborg Station" icon_state = "ai_cyborg" sound_env = SMALL_ENCLOSED ambience = AMBIENCE_AI + nightshift_level = NIGHTSHIFT_LEVEL_COMMAND_SENSITIVE /area/aisat name = "\improper AI Satellite" @@ -3462,43 +3558,51 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /area/exploration name = "\improper Exploration Foyer" icon_state = "purple" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS /area/exploration/excursion_dock name = "\improper Excursion Shuttle Dock" icon_state = "hangar" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/courser_dock name = "\improper Courser Shuttle Dock" icon_state = "hangar" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/explorer_prep name = "\improper Explorer Prep Room" icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/pilot_prep name = "\improper Pilot Prep Room" icon_state = "locker" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/meeting name = "\improper Explorer Meeting Room" icon_state = "northeast" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/exploration/showers name = "\improper Explorer Showers" icon_state = "restrooms" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE /area/exploration/medical name = "\improper Exploration Med Station" icon_state = "medbay" + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/exploration/pathfinder_office name = "\improper Pathfinder's Office" - + nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES /area/station/protean_nanite_room name = "\improper Nanite Chamber" icon_state = "blue" - + nightshift_level = NIGHTSHIFT_LEVEL_PUBLIC_FACILITIES //Elevator areas // Used for creating the exchange areas. diff --git a/code/game/area/Tether_areas.dm b/code/game/area/Tether_areas.dm index d0dcba548a..95783f7463 100644 --- a/code/game/area/Tether_areas.dm +++ b/code/game/area/Tether_areas.dm @@ -58,6 +58,43 @@ lift_floor_name = "Chapel, Cargo, EVA, Gateway" lift_announce_str = "Arriving at Station Level 2." +/area/turbolift/tether/elevator_two/transit + name = "tether (midway)" + lift_floor_label = "Tether Midpoint" + lift_floor_name = "Midpoint" + lift_announce_str = "Arriving at tether midway point." + delay_time = 5 SECONDS + +/area/turbolift/t_surface/elevator_two/level1 + name = "surface (level 1)" + lift_floor_label = "Surface 1" + lift_floor_name = "Tram, Dorms, Mining, Surf. EVA" + lift_announce_str = "Arriving at Base Level 1." + +/area/turbolift/t_surface/elevator_two/level2 + name = "surface (level 2)" + lift_floor_label = "Surface 2" + lift_floor_name = "Atmos, Maintenance" + lift_announce_str = "Arriving at Base Level 2." + +/area/turbolift/t_surface/elevator_two/level3 + name = "surface (level 3)" + lift_floor_label = "Surface 3" + lift_floor_name = "Bar, Bridge, Pool, Science" + lift_announce_str = "Arriving at Base Level 3." + +/area/turbolift/t_station/elevator_two/level1 + name = "asteroid (level 1)" + lift_floor_label = "Asteroid 1" + lift_floor_name = "AI Core, Eng, Exploration, Secondary Bridge" + lift_announce_str = "Arriving at Station Level 1." + +/area/turbolift/t_station/elevator_two/level2 + name = "asteroid (level 2)" + lift_floor_label = "Asteroid 2" + lift_floor_name = "Chapel, Cargo, EVA, Gateway" + lift_announce_str = "Arriving at Station Level 2." + /area/vacant/vacant_restaurant_upper name = "\improper Vacant Restaurant" icon_state = "vacant_site" @@ -1443,6 +1480,9 @@ requires_power = FALSE +/area/tether/elevator/two + name = "\improper Tether Elevator Two" + /area/tether/midpoint name = "\improper Tether Midpoint" diff --git a/code/game/area/area.dm b/code/game/area/area.dm index d0329eb5e6..c436fc18f1 100644 --- a/code/game/area/area.dm +++ b/code/game/area/area.dm @@ -30,6 +30,11 @@ /// default initial gas mix var/initial_gas_mix = GAS_STRING_STP + //? nightshift + /// nightshift level + /// in general, nightshift must be at or above this level for it to proc on areas. + var/nightshift_level = NIGHTSHIFT_LEVEL_UNSET + //? tracking lists for machinery /// holopads - lazyinit'd var/list/obj/machinery/holopad/holopads @@ -324,6 +329,8 @@ else if(!E.density) spawn(0) E.close() + for(var/obj/machinery/floor_inflatables/i in all_doors) + i.trigger() /// Open all firedoors in the area /area/proc/firedoors_open() diff --git a/code/game/atoms/movable/movement.dm b/code/game/atoms/movable/movement.dm index 66574fc78b..f12fb2c6a2 100644 --- a/code/game/atoms/movable/movement.dm +++ b/code/game/atoms/movable/movement.dm @@ -727,8 +727,7 @@ */ /atom/movable/proc/on_changed_z_level(old_z, new_z) SEND_SIGNAL(src, COMSIG_MOVABLE_Z_CHANGED, old_z, new_z) - for(var/item in src) // Notify contents of Z-transition. This can be overridden IF we know the items contents do not care. - var/atom/movable/AM = item + for(var/atom/movable/AM as anything in src) // Notify contents of Z-transition. This can be overridden IF we know the items contents do not care. AM.on_changed_z_level(old_z, new_z) //? Anchored diff --git a/code/game/atoms/movable/throwing.dm b/code/game/atoms/movable/throwing.dm index 082fa38890..e02590964b 100644 --- a/code/game/atoms/movable/throwing.dm +++ b/code/game/atoms/movable/throwing.dm @@ -17,7 +17,7 @@ return NONE /atom/movable/throw_impacted(atom/movable/AM, datum/thrownthing/TT) - if(!anchored && (TT?.force >= (move_resist * MOVE_FORCE_PUSH_RATIO)) && !(TT.throw_flags & THROW_AT_OVERHAND)) + if(!anchored && (TT?.force >= (move_resist * MOVE_FORCE_PUSH_RATIO)) && !(TT.throw_flags & (THROW_AT_OVERHAND | THROW_AT_IS_NEAT))) step(src, AM.dir) return ..() @@ -57,7 +57,7 @@ * - A - atom that we landed on * - TT - thrownthing datum */ -/atom/proc/throw_land(atom/A, datum/thrownthing/TT) +/atom/movable/proc/throw_land(atom/A, datum/thrownthing/TT) return NONE /** diff --git a/code/game/click/observer.dm b/code/game/click/observer.dm index ac0f8a93f0..dbd40e23ae 100644 --- a/code/game/click/observer.dm +++ b/code/game/click/observer.dm @@ -99,26 +99,3 @@ */ -//! ## VR FILE MERGE ## !// -/obj/item/paicard/attack_ghost(mob/user) - . = ..() - if(src.pai != null) //Have a person in them already? - user.examinate(src) - return - var/choice = input(user, "You sure you want to inhabit this PAI?") in list("Yes", "No") - var/pai_name = input(user, "Choose your character's name", "Character Name") as text - var/actual_pai_name = sanitize_species_name(pai_name) - var/pai_key - if (isnull(pai_name)) - return - if(choice == "Yes") - pai_key = user.key - else - return - var/turf/location = get_turf(src) - var/obj/item/paicard/card = new(location) - var/mob/living/silicon/pai/pai = new(card) - qdel(src) - pai.key = pai_key - card.setPersonality(pai) - pai.SetName(actual_pai_name) diff --git a/code/game/click/other_mobs.dm b/code/game/click/other_mobs.dm index 3e68c198d3..ae111a9234 100644 --- a/code/game/click/other_mobs.dm +++ b/code/game/click/other_mobs.dm @@ -66,7 +66,7 @@ // return FALSE return TRUE -/atom/ui_status(mob/user) +/atom/ui_status(mob/user, datum/ui_state/state) . = ..() if(!can_interact(user) && !IsAdminGhost(user)) . = min(., UI_UPDATE) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 8fb8a5159b..ff5617444f 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -80,10 +80,10 @@ src.go_out() for(var/obj/O in src) if((!istype(O,/obj/item/reagent_containers)) && (!istype(O,/obj/item/circuitboard/clonescanner)) && (!istype(O,/obj/item/stock_parts)) && (!istype(O,/obj/item/stack/cable_coil))) - O.loc = get_turf(src)//Ejects items that manage to get in there (exluding the components) + O.forceMove(get_turf(src)) if(!occupant) for(var/mob/M in src)//Failsafe so you can get mobs out - M.loc = get_turf(src) + M.forceMove(get_turf(src)) /** *? Allows borgs to clone people without external assistance. @@ -193,37 +193,6 @@ occupant = null icon_state = "scanner_0" -/obj/machinery/dna_scannernew/legacy_ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - legacy_ex_act(severity) - //Foreach goto(35) - //SN src = null - qdel(src) - return - if(2.0) - if (prob(50)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - legacy_ex_act(severity) - //Foreach goto(108) - //SN src = null - qdel(src) - return - if(3.0) - if (prob(25)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - legacy_ex_act(severity) - //Foreach goto(181) - //SN src = null - qdel(src) - return - else - return - /obj/machinery/computer/scan_consolenew name = "DNA Modifier Access Console" desc = "Scan DNA." @@ -659,7 +628,7 @@ if(href_list["ejectBeaker"]) if(connected.beaker) var/obj/item/reagent_containers/glass/B = connected.beaker - B.loc = connected.loc + B.forceMove(connected.loc) connected.beaker = null return 1 @@ -684,7 +653,7 @@ if (bufferOption == "ejectDisk") if (!src.disk) return - src.disk.loc = get_turf(src) + src.disk.forceMove(get_turf(src)) src.disk = null return 1 @@ -805,7 +774,7 @@ I.buf = buf waiting_for_user_input=0 if(success) - I.loc = src.loc + I.forceMove(loc) I.name += " ([buf.name])" //src.temphtml = "Injector created." src.injector_ready = 0 diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 2225991405..24bfde902b 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -16,7 +16,7 @@ var/list/implants = list() //Try to preserve implants. for(var/obj/item/implant/W in H) implants += W - W.loc = null + W.moveToNullspace() if(!connected) for(var/obj/item/W in (H.contents-implants)) @@ -55,14 +55,14 @@ for(var/obj/T in (M.contents-implants)) qdel(T) - O.loc = M.loc + O.forceMove(M.loc) if(M.mind) M.mind.transfer(O) //transfer our mind to the cute little monkey if (connected) //inside dna thing var/obj/machinery/dna_scannernew/C = connected - O.loc = C + O.forceMove(C) C.occupant = O connected = null O.real_name = "monkey ([copytext(md5(M.real_name), 2, 6)])" @@ -72,7 +72,7 @@ O.set_stat(M.stat) O.a_intent = INTENT_HARM for (var/obj/item/implant/I in implants) - I.loc = O + I.forceMove(O) I.implanted = O // O.update_icon = 1 //queue a full icon update at next life() call qdel(M) @@ -87,7 +87,7 @@ var/list/implants = list() //Still preserving implants for(var/obj/item/implant/W in Mo) implants += W - W.loc = null + W.moveToNullspace() if(!connected) for(var/obj/item/W in (Mo.contents-implants)) Mo.drop_from_inventory(W) @@ -125,15 +125,14 @@ // for(var/obj/T in M) // qdel(T) - - O.loc = M.loc + O.forceMove(M.loc) if(M.mind) M.mind.transfer(O) //transfer our mind to the human if (connected) //inside dna thing var/obj/machinery/dna_scannernew/C = connected - O.loc = C + O.forceMove(C) C.occupant = O connected = null @@ -156,7 +155,7 @@ O.adjustOxyLoss(M.getOxyLoss()) O.set_stat(M.stat) for (var/obj/item/implant/I in implants) - I.loc = O + I.forceMove(O) I.implanted = O // O.update_icon = 1 //queue a full icon update at next life() call qdel(M) diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index bda5b29080..f442501cbe 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -54,9 +54,11 @@ src.visible_message("[src] stabs [T] with the proboscis!") to_chat(T, "You feel a sharp stabbing pain!") add_attack_logs(src,T,"Absorbed (changeling)") - var/obj/item/organ/external/affecting = T.get_organ(src.zone_sel.selecting) - if(affecting.take_damage(39,0,1,0,"large organic needle")) - T:UpdateDamageIcon() + T.take_targeted_damage( + brute = 39, + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_REDIRECT, + weapon_descriptor = "large biological needle", + ) feedback_add_details("changeling_powers","A[stage]") if(!do_mob(src, T, 150) || G.state != GRAB_KILL) diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index fec2083c9f..4a8a8cee4a 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -131,7 +131,7 @@ icon_state = "lingboots" armor_type = /datum/armor/changeling/chitin siemens_coefficient = 0.3 - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE diff --git a/code/game/gamemodes/changeling/powers/lesser_form.dm b/code/game/gamemodes/changeling/powers/lesser_form.dm index cf301b6a33..211f4c7708 100644 --- a/code/game/gamemodes/changeling/powers/lesser_form.dm +++ b/code/game/gamemodes/changeling/powers/lesser_form.dm @@ -92,7 +92,7 @@ for(var/obj/T in C) qdel(T) - O.loc = C.loc + O.forceMove(C.loc) O.UpdateAppearance() domutcheck(O, null) @@ -102,7 +102,7 @@ O.adjustFireLoss(C.getFireLoss()) O.set_stat(C.stat) for (var/obj/item/implant/I in implants) - I.loc = O + I.forceMove(O) I.implanted = O C.mind.transfer(O) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 0e293510bf..4520868c69 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -61,7 +61,7 @@ inv_hide_flags = HIDEFACE body_cover_flags = HEAD armor_type = /datum/armor/cult/robes - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 204aa61a5f..d0fb469fd4 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -303,7 +303,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," if(iscultist(target)) return NONE add_attack_logs(user, L, "Hit with [name]") - L.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit + L.take_random_targeted_damage(brute = 0, burn = rand(5,20)) //really lucky - 5 hits for a crit for(var/mob/O in viewers(L, null)) O.show_message("\The [user] beats \the [L] with \the [src]!", 1) to_chat(target, "You feel searing heat inside!") diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 00c7ab770e..0375200cba 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -283,7 +283,7 @@ var/list/sacrificed = list() for(var/obj/item/organ/E in H.bad_external_organs) var/obj/item/organ/external/affected = E // fix bones - if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN // fix IB affected.cure_specific_wound(/datum/wound/internal_bleeding, all = TRUE) @@ -434,7 +434,7 @@ var/list/sacrificed = list() L.ajourn=0 return else - L.take_organ_damage(3, 0) + L.take_random_targeted_damage(brute = 3, burn = 0) sleep(100) return fizzle() @@ -488,7 +488,7 @@ var/list/sacrificed = list() log_and_message_admins("used a manifest rune.") var/mob/living/user = usr while(this_rune && user && user.stat==CONSCIOUS && user.client && user.loc==this_rune.loc) - user.take_organ_damage(1, 0) + user.take_random_targeted_damage(brute = 1) sleep(30) if(D) D.visible_message("[D] slowly dissipates into dust and bones.", \ @@ -793,7 +793,7 @@ var/list/sacrificed = list() usr.say("Khari[pick("'","`")]d! Eske'te tannin!") src.density = !src.density var/mob/living/user = usr - user.take_organ_damage(2, 0) + user.take_random_targeted_damage(brute = 2) if(src.density) to_chat(usr, "Your blood flows into the rune, and you feel that the very space over the rune thickens.") else diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 253a9206c1..2f0c72a15d 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -38,7 +38,7 @@ if("supply") supply() var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5, 0) + H?.take_random_targeted_damage(brute = 5, burn = 0) if(src && src.imbue!="supply" && src.imbue!="runestun") if(delete) qdel(src) @@ -50,7 +50,7 @@ if(isliving(user) && iscultist(user)) var/mob/living/L = user if(imbue == "runestun") - L.take_organ_damage(5, 0) + L.take_random_targeted_damage(brute = 5, burn = 0) call(TYPE_PROC_REF(/obj/effect/rune, runestun))(target) qdel(src) return CLICKCHAIN_DO_NOT_PROPAGATE diff --git a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm index a000ae841c..873451e389 100644 --- a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm +++ b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm @@ -13,7 +13,7 @@ siemens_coefficient = 0.6 slowdown = -1 - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE diff --git a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm index 502f070768..00630d77e3 100644 --- a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm +++ b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm @@ -15,9 +15,9 @@ icon_state = "regen" item_state = "graygloves" siemens_coefficient = 0 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/regen/equipped(mob/user, slot, flags) diff --git a/code/game/gamemodes/technomancer/spells/mend_organs.dm b/code/game/gamemodes/technomancer/spells/mend_organs.dm index 190c541f99..296afcc974 100644 --- a/code/game/gamemodes/technomancer/spells/mend_organs.dm +++ b/code/game/gamemodes/technomancer/spells/mend_organs.dm @@ -47,7 +47,7 @@ for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones var/obj/item/organ/external/affected = E - if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN // fix IB diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index f29cacf09d..a79921b437 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -118,6 +118,8 @@ /// Can be anchored / unanchored by players without deconstructing by default with a wrench. null for off, number for time needed. // todo: proc for allow / disallow, refactor, unify with can_be_unanchored var/default_unanchor + /// default deconstruct requires panel open + var/default_deconstruct_requires_panel_open = TRUE /// tool used for deconstruction var/tool_deconstruct = TOOL_CROWBAR /// tool used for panel open diff --git a/code/game/machinery/_machinery_construction.dm b/code/game/machinery/_machinery_construction.dm index 025d3d1b21..2421f81633 100644 --- a/code/game/machinery/_machinery_construction.dm +++ b/code/game/machinery/_machinery_construction.dm @@ -3,7 +3,7 @@ /obj/machinery/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args, list/hint_images = list()) . = list() - if(tool_deconstruct && !isnull(default_deconstruct) && panel_open) + if(tool_deconstruct && !isnull(default_deconstruct) && (!default_deconstruct_requires_panel_open || panel_open)) LAZYSET(.[tool_deconstruct], "deconstruct", dyntool_image_backward(tool_deconstruct)) if(tool_unanchor && !isnull(default_unanchor)) LAZYSET(.[tool_unanchor], anchored? "unanchor" : "anchor", anchored? dyntool_image_backward(tool_unanchor) : dyntool_image_forward(tool_unanchor)) @@ -15,7 +15,7 @@ if(INTERACTING_WITH_FOR(e_args.performer, src, INTERACTING_FOR_CONSTRUCTION)) return CLICKCHAIN_DO_NOT_PROPAGATE START_INTERACTING_WITH(e_args.performer, src, INTERACTING_FOR_CONSTRUCTION) - if(function == tool_deconstruct && !isnull(default_deconstruct)) + if(function == tool_deconstruct && !isnull(default_deconstruct) && (!default_deconstruct_requires_panel_open || panel_open)) if(default_deconstruction_dismantle(I, e_args, flags = flags)) . = CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE . = CLICKCHAIN_DO_NOT_PROPAGATE diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 8a232b6d31..44618bf10b 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -108,7 +108,7 @@ ui = new(user, src, "GeneralAtmoControl", name) ui.open() -/obj/machinery/computer/general_air_control/ui_data(mob/user) +/obj/machinery/computer/general_air_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/sensors_ui[0] if(sensors.len) @@ -144,7 +144,7 @@ var/pressure_setting = ONE_ATMOSPHERE * 45 circuit = /obj/item/circuitboard/air_management/tank_control -/obj/machinery/computer/general_air_control/large_tank_control/ui_data(mob/user) +/obj/machinery/computer/general_air_control/large_tank_control/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["tanks"] = 1 @@ -178,7 +178,7 @@ else ..(signal) -/obj/machinery/computer/general_air_control/large_tank_control/ui_act(action, params) +/obj/machinery/computer/general_air_control/large_tank_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -243,7 +243,7 @@ var/pressure_setting = 100 circuit = /obj/item/circuitboard/air_management/supermatter_core -/obj/machinery/computer/general_air_control/supermatter_core/ui_data(mob/user) +/obj/machinery/computer/general_air_control/supermatter_core/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["core"] = 1 @@ -279,7 +279,7 @@ else ..(signal) -/obj/machinery/computer/general_air_control/supermatter_core/ui_act(action, params) +/obj/machinery/computer/general_air_control/supermatter_core/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -372,7 +372,7 @@ ..() -/obj/machinery/computer/general_air_control/fuel_injection/ui_data(mob/user) +/obj/machinery/computer/general_air_control/fuel_injection/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["fuel"] = 1 data["automation"] = automation @@ -394,7 +394,7 @@ else ..(signal) -/obj/machinery/computer/general_air_control/fuel_injection/ui_act(action, params) +/obj/machinery/computer/general_air_control/fuel_injection/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 706e856847..6e870364fb 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -151,7 +151,7 @@ beaker = null update_appearance() -/obj/machinery/biogenerator/ui_status(mob/user) +/obj/machinery/biogenerator/ui_status(mob/user, datum/ui_state/state) if(machine_stat & BROKEN || panel_open) return UI_CLOSE return ..() @@ -162,7 +162,7 @@ ui = new(user, src, "Biogenerator", name) ui.open() -/obj/machinery/biogenerator/ui_data(mob/user) +/obj/machinery/biogenerator/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["build_eff"] = build_eff @@ -172,7 +172,7 @@ return data -/obj/machinery/biogenerator/ui_static_data(mob/user) +/obj/machinery/biogenerator/ui_static_data(mob/user, datum/tgui/ui) var/list/static_data[0] // Available items - in static data because we don't wanna compute this list every time! It hardly changes. @@ -186,7 +186,7 @@ return static_data -/obj/machinery/biogenerator/ui_act(action, list/params) +/obj/machinery/biogenerator/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/machinery/bomb_tester.dm b/code/game/machinery/bomb_tester.dm index ac36e0354b..070d81a1ff 100644 --- a/code/game/machinery/bomb_tester.dm +++ b/code/game/machinery/bomb_tester.dm @@ -117,7 +117,7 @@ ui = new(user, src, "BombTester", name) ui.open() -/obj/machinery/bomb_tester/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/bomb_tester/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["simulating"] = simulating diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 6ac42003ac..0ccf4f104f 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -23,6 +23,59 @@ return TRUE playsound(src, 'sound/machines/button.ogg', 100, TRUE) +/obj/machinery/button/windowtint + name = "window tint control" + icon = 'icons/obj/power.dmi' + icon_state = "light0" + desc = "A remote control switch for polarized windows." + var/range = 7 + +/obj/machinery/button/windowtint/attack_hand(mob/user, list/params) + if (..()) + return TRUE + else + toggle_tint() + +/obj/machinery/button/windowtint/proc/toggle_tint() + use_power(5) + + active = !active + update_appearance() + + for (var/obj/structure/window/reinforced/polarized/target_window in range(src, range)) + if (target_window.id == id || !target_window.id) + INVOKE_ASYNC(target_window, TYPE_PROC_REF(/obj/structure/window/reinforced/polarized, toggle)) + +/obj/machinery/button/windowtint/power_change() + ..() + if (active && !powered(power_channel)) + toggle_tint() + +/obj/machinery/button/windowtint/update_icon_state() + . = ..() + icon_state = "light[active]" + +/obj/machinery/button/windowtint/attackby(obj/item/object, mob/user) + if (istype(object, /obj/item/multitool)) + var/obj/item/multitool/MT = object + if (!id) + // If no ID is set yet (newly built button?) let them select an ID for first-time use! + var/new_id = tgui_input_text( + user = user, + message = "Enter the ID for the window.", + title = name, + ) + if (new_id && user.get_active_held_item() != object && in_range(src, user)) + id = new_id + to_chat(user, SPAN_NOTICE("The new ID of \the [src] is [id]")) + if (id) + // It already has an ID (or they just set one), buffer it for copying to windows. + to_chat(user, SPAN_NOTICE("You store \the [src] in \the [MT]'s buffer!")) + MT.connectable = src + MT.update_appearance() + return TRUE + return ..() + /obj/machinery/button/windowtint/multitint name = "tint control" desc = "A remote control switch for polarized windows and doors." @@ -37,8 +90,7 @@ if(W.id == src.id || !W.id) spawn(0) W.toggle() - for(var/obj/machinery/door/D in in_range) - if(D.icon_tinted) - if(D.id_tint == src.id || !D.id_tint) - spawn(0) - D.toggle() + for(var/obj/machinery/door/airlock/D in in_range) + if(D.glass && (D.id_tint == src.id)) + spawn(0) + D.toggle() diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 8e4958d14a..6a59c7a28a 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -1,7 +1,8 @@ +CREATE_WALL_MOUNTING_TYPES(/obj/machinery/camera) /obj/machinery/camera name = "security camera" desc = "It's used to monitor rooms." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/machinery/security_camera.dmi' icon_state = "camera" use_power = USE_POWER_ACTIVE idle_power_usage = 5 @@ -264,23 +265,6 @@ else icon_state = initial(icon_state) -/obj/machinery/camera/setDir(ndir) - . = ..() - base_pixel_x = 0 - base_pixel_y = 0 - var/turf/T = get_step(get_turf(src), turn(src.dir, 180)) - for(var/obj/O in T.contents) - if(O.density) - switch(dir) - if(SOUTH) - base_pixel_y = 21 - if(WEST) - base_pixel_x = 10 - if(EAST) - base_pixel_x = -10 - break - reset_pixel_offsets() - /obj/machinery/camera/proc/triggerCameraAlarm(duration = 0) alarm_on = 1 camera_alarm.triggerAlarm(loc, src, duration) @@ -312,24 +296,6 @@ see = hear(view_range, pos) return see -/atom/proc/auto_turn() - //Automatically turns based on nearby walls. - var/turf/simulated/wall/T = null - for(var/i = 1, i <= 8; i += i) - T = get_ranged_target_turf(src, i, 1) - if(istype(T)) - //If someone knows a better way to do this, let me know. -Giacom - switch(i) - if(NORTH) - src.setDir(SOUTH) - if(SOUTH) - src.setDir(NORTH) - if(WEST) - src.setDir(EAST) - if(EAST) - src.setDir(WEST) - break - //Return a working camera that can see a given mob //or null if none /proc/seen_by_camera(var/mob/M) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index ba756f64f2..9bff46e983 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -1,7 +1,7 @@ /obj/item/camera_assembly name = "camera assembly" desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface." - icon = 'icons/obj/monitors_vr.dmi' + icon = 'icons/machinery/security_camera.dmi' icon_state = "cameracase" w_class = ITEMSIZE_SMALL anchored = 0 @@ -35,7 +35,7 @@ anchored = 1 state = 1 update_icon() - auto_turn() + auto_orient_wallmount_single() return if(1) @@ -95,14 +95,10 @@ input = sanitizeSafe(input(usr, "How would you like to name the camera?", "Set Camera Name", camera_name ? camera_name : temptag), MAX_NAME_LEN) state = 4 - var/obj/machinery/camera/C = new(src.loc) - src.loc = C + var/obj/machinery/camera/auto_mount/C = new(src.loc) + forceMove(C) C.assembly = src - - C.auto_turn() - C.replace_networks(uniqueList(tempnetwork)) - C.c_tag = input for(var/i = 5; i >= 0; i -= 1) diff --git a/code/game/machinery/colormate.dm b/code/game/machinery/colormate.dm index 571635597c..1bb5aa7e0d 100644 --- a/code/game/machinery/colormate.dm +++ b/code/game/machinery/colormate.dm @@ -137,7 +137,7 @@ ui.set_autoupdate(FALSE) //This might be a bit intensive, better to not update it every few ticks ui.open() -/obj/machinery/gear_painter/ui_data(mob/user) +/obj/machinery/gear_painter/ui_data(mob/user, datum/tgui/ui) . = list() .["activemode"] = active_mode .["matrixcolors"] = list( @@ -167,7 +167,7 @@ else .["item"] = null -/obj/machinery/gear_painter/ui_act(action, params) +/obj/machinery/gear_painter/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 94e50904ce..e73cb84232 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -60,7 +60,7 @@ ui = new(user, src, "OperatingComputer", "Patient Monitor") ui.open() -/obj/machinery/computer/operating/ui_data(mob/user) +/obj/machinery/computer/operating/ui_data(mob/user, datum/tgui/ui) var/data[0] var/mob/living/carbon/human/occupant if(table) @@ -132,7 +132,7 @@ return data -/obj/machinery/computer/operating/ui_act(action, params) +/obj/machinery/computer/operating/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 123ea62006..ff694a8bba 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -59,7 +59,7 @@ ui = new(user, src, "AiRestorer", name) ui.open() -/obj/machinery/computer/aifixer/ui_data(mob/user) +/obj/machinery/computer/aifixer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["ejectable"] = FALSE @@ -80,7 +80,7 @@ return data -/obj/machinery/computer/aifixer/ui_act(action, params) +/obj/machinery/computer/aifixer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(!occupier) diff --git a/code/game/machinery/computer/arcade/claw_machine.dm b/code/game/machinery/computer/arcade/claw_machine.dm index 1ea2dcc61f..9d0e3bc741 100644 --- a/code/game/machinery/computer/arcade/claw_machine.dm +++ b/code/game/machinery/computer/arcade/claw_machine.dm @@ -174,7 +174,7 @@ ui.autoupdate = TRUE ui.open() -/obj/machinery/computer/arcade/clawmachine/ui_data(mob/user) +/obj/machinery/computer/arcade/clawmachine/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["wintick"] = wintick @@ -184,7 +184,7 @@ return data -/obj/machinery/computer/arcade/clawmachine/ui_act(action, params) +/obj/machinery/computer/arcade/clawmachine/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index 49fb5b7480..c2cb41cefa 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -156,7 +156,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) get_asset_datum(/datum/asset/spritesheet/moods), ) -/obj/machinery/computer/arcade/orion_trail/ui_data(mob/user) +/obj/machinery/computer/arcade/orion_trail/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["gamestatus"] = gameStatus @@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) return data -/obj/machinery/computer/arcade/orion_trail/ui_static_data(mob/user) +/obj/machinery/computer/arcade/orion_trail/ui_static_data(mob/user, datum/tgui/ui) var/list/static_data = list() static_data["gamename"] = name static_data["emagged"] = obj_flags & OBJ_EMAGGED @@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) static_data["settlermoods"] = settlermoods return static_data -/obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params) +/obj/machinery/computer/arcade/orion_trail/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 3a54262c39..d22cfb98a8 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -28,7 +28,7 @@ var/global/list/minor_air_alarms = list() ui = new(user, src, "AtmosAlertConsole", name) ui.open() -/obj/machinery/computer/atmos_alert/ui_data(mob/user) +/obj/machinery/computer/atmos_alert/ui_data(mob/user, datum/tgui/ui) . = ..() var/list/major_alarms = list() var/list/minor_alarms = list() @@ -58,7 +58,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/proc/on_alarm_update() update_icon() -/obj/machinery/computer/atmos_alert/ui_act(action, params) +/obj/machinery/computer/atmos_alert/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/command/card.dm b/code/game/machinery/computer/command/card.dm index 916d9cdf71..2428138350 100644 --- a/code/game/machinery/computer/command/card.dm +++ b/code/game/machinery/computer/command/card.dm @@ -21,7 +21,7 @@ QDEL_NULL(tgui_cardmod) return ..() -/obj/machinery/computer/card/ui_module_route(action, list/params, datum/tgui/ui, id) +/obj/machinery/computer/card/ui_route(action, list/params, datum/tgui/ui, id) . = ..() if(.) return @@ -29,14 +29,6 @@ if("modify") return tgui_cardmod.ui_act(action, params, ui) -/obj/machinery/computer/card/ui_module_data(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.data(user, editing, authing) - -/obj/machinery/computer/card/ui_module_static(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.static_data(user, editing, authing) - /** * for later use: authorized to change slots */ @@ -116,16 +108,17 @@ ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "IdentificationComputer", name) + ui.register_module(tgui_cardmod, "modify") ui.open() -/obj/machinery/computer/card/ui_static_data(mob/user) +/obj/machinery/computer/card/ui_static_data(mob/user, datum/tgui/ui) . = ..() //? manifest // todo: refactor PDA_Manifest and CrewManifest.js data_core.get_manifest_list() .["manifest"] = GLOB.PDA_Manifest -/obj/machinery/computer/card/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/card/ui_data(mob/user, datum/tgui/ui) . = ..() //? general diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index c9ab693d76..cde5b1d9c1 100755 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -115,7 +115,7 @@ deltimer(print_timer) print_timer = null -/obj/machinery/computer/guestpass/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/guestpass/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["access"] = SSjob.tgui_access_data() .["allowed"] = allowed_accesses() @@ -124,7 +124,7 @@ .["durationMin"] = min_duration .["auth"] = tgui_inserted_card() -/obj/machinery/computer/guestpass/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/guestpass/ui_data(mob/user, datum/tgui/ui) . = ..() .["guestName"] = guest_name .["guestReason"] = guest_reason diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 53e2f84637..1867b9da43 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -116,7 +116,7 @@ ui.set_autoupdate(FALSE) -/obj/machinery/computer/med_data/ui_data(mob/user) +/obj/machinery/computer/med_data/ui_data(mob/user, datum/tgui/ui) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -202,7 +202,7 @@ data["modal"] = ui_modal_data(src) return data -/obj/machinery/computer/med_data/ui_act(action, params) +/obj/machinery/computer/med_data/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/misc/bioscan.dm b/code/game/machinery/computer/misc/bioscan.dm index 73d22e9764..3811989d5f 100644 --- a/code/game/machinery/computer/misc/bioscan.dm +++ b/code/game/machinery/computer/misc/bioscan.dm @@ -25,7 +25,7 @@ ui = new(user, src, "BioscanConsole") ui.open() -/obj/machinery/computer/bioscan/ui_static_data(mob/user) +/obj/machinery/computer/bioscan/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["scan"] = buffer .["antennas"] = ui_antenna_data() @@ -46,12 +46,12 @@ "y" = T.y, )) -/obj/machinery/computer/bioscan/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/bioscan/ui_data(mob/user, datum/tgui/ui) . = ..() .["scan_ready"] = !on_cooldown() .["network"] = network_key || "" -/obj/machinery/computer/bioscan/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/bioscan/ui_act(action, list/params, datum/tgui/ui) . = ..() switch(action) if("scan") diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 3454c1ab93..9171a6cf61 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -27,7 +27,7 @@ ui = new(user, src, "PrisonerManagement", name) ui.open() -/obj/machinery/computer/prisoner/ui_data(mob/user) +/obj/machinery/computer/prisoner/ui_data(mob/user, datum/tgui/ui) var/list/chemImplants = list() var/list/trackImplants = list() if(screen) @@ -64,7 +64,7 @@ return list("locked" = !screen, "chemImplants" = chemImplants, "trackImplants" = trackImplants) -/obj/machinery/computer/prisoner/ui_act(action, list/params) +/obj/machinery/computer/prisoner/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 818dd977ac..477ab3ec77 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -121,7 +121,7 @@ ui = new(user, src, "RoboticsControlConsole", name) ui.open() -/obj/machinery/computer/robotics/ui_data(mob/user) +/obj/machinery/computer/robotics/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["auth"] = is_authenticated(user) data["can_hack"] = can_hack_any(user) @@ -150,7 +150,7 @@ data["show_detonate_all"] = (data["auth"] && length(data["cyborgs"]) > 0 && ishuman(user)) return data -/obj/machinery/computer/robotics/ui_act(action, params) +/obj/machinery/computer/robotics/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE . = FALSE diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 10cdd39ca8..edfeb3565c 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -101,7 +101,7 @@ ui.set_autoupdate(FALSE) -/obj/machinery/computer/secure_data/ui_data(mob/user) +/obj/machinery/computer/secure_data/ui_data(mob/user, datum/tgui/ui) var/data[0] data["temp"] = temp data["scan"] = scan ? scan.name : null @@ -185,7 +185,7 @@ data["modal"] = ui_modal_data(src) return data -/obj/machinery/computer/secure_data/ui_act(action, params) +/obj/machinery/computer/secure_data/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 88b58a19ec..e026411a30 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -80,7 +80,7 @@ ui.open() ui.set_autoupdate(FALSE) -/obj/machinery/computer/skills/ui_data(mob/user) +/obj/machinery/computer/skills/ui_data(mob/user, datum/tgui/ui) var/data[0] data["temp"] = temp @@ -134,7 +134,7 @@ data["modal"] = ui_modal_data(src) return data -/obj/machinery/computer/skills/ui_act(action, params) +/obj/machinery/computer/skills/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 1b8cdfdd51..a9aa2308ff 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -77,7 +77,7 @@ ui = new(user, src, "TimeClock", name) ui.open() -/obj/machinery/computer/timeclock/ui_data(mob/user) +/obj/machinery/computer/timeclock/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // Okay, data for showing the user's OWN PTO stuff diff --git a/code/game/machinery/doors/airlock/airlock.dm b/code/game/machinery/doors/airlock/airlock.dm index c89103137b..f587a639b8 100644 --- a/code/game/machinery/doors/airlock/airlock.dm +++ b/code/game/machinery/doors/airlock/airlock.dm @@ -100,9 +100,8 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( var/color_fill_file = 'icons/obj/doors/station/fill_color.dmi' var/stripe_file = 'icons/obj/doors/station/stripe.dmi' var/stripe_fill_file = 'icons/obj/doors/station/fill_stripe.dmi' - var/glass_file = 'icons/obj/doors/station/fill_glass.dmi' + //var/glass_file = 'icons/obj/doors/station/fill_glass.dmi' var/bolts_file = 'icons/obj/doors/station/lights_bolts.dmi' - var/deny_file = 'icons/obj/doors/station/lights_deny.dmi' var/lights_file = 'icons/obj/doors/station/lights_green.dmi' var/panel_file = 'icons/obj/doors/station/panel.dmi' var/sparks_damaged_file = 'icons/obj/doors/station/sparks_damaged.dmi' @@ -115,7 +114,8 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( /// Bandaid around a problem. var/last_spark = 0 - + var/tinted + var/id_tint /obj/machinery/door/airlock/proc/set_airlock_overlays(state) var/icon/color_overlay @@ -138,26 +138,21 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( color_overlay = new(color_file) color_overlay.Blend(door_color, ICON_MULTIPLY) GLOB.airlock_icon_cache["[ikey]"] = color_overlay - if(glass) - if (window_color && window_color != "none") - var/ikey = "[airlock_type]-[window_color]-windowcolor" - filling_overlay = GLOB.airlock_icon_cache["[ikey]"] - if (!filling_overlay) - filling_overlay = new(glass_file) + + if(door_color && !(door_color == "none")) + var/ikey = "[airlock_type]-[door_color]-fillcolor-[glass]" + filling_overlay = GLOB.airlock_icon_cache["[ikey]"] + if(!filling_overlay) + filling_overlay = new(fill_file) + if(!glass || tinted) + filling_overlay.Blend(door_color, ICON_MULTIPLY) + else filling_overlay.Blend(window_color, ICON_MULTIPLY) - GLOB.airlock_icon_cache["[ikey]"] = filling_overlay - else - filling_overlay = glass_file + GLOB.airlock_icon_cache["[ikey]"] = filling_overlay else - if(door_color && !(door_color == "none")) - var/ikey = "[airlock_type]-[door_color]-fillcolor" - filling_overlay = GLOB.airlock_icon_cache["[ikey]"] - if(!filling_overlay) - filling_overlay = new(color_fill_file) - filling_overlay.Blend(door_color, ICON_MULTIPLY) - GLOB.airlock_icon_cache["[ikey]"] = filling_overlay - else - filling_overlay = fill_file + filling_overlay = fill_file + + if(stripe_color && !(stripe_color == "none")) var/ikey = "[airlock_type]-[stripe_color]-stripe" stripe_overlay = GLOB.airlock_icon_cache["[ikey]"] @@ -180,11 +175,6 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( lights_overlay = bolts_file set_light(1, 2, l_color = COLOR_RED_LIGHT) - if(AIRLOCK_DENY) - if(lights) - lights_overlay = deny_file - set_light(1, 2, l_color = COLOR_RED_LIGHT) - if(AIRLOCK_EMAG) sparks_overlay = emag_file @@ -223,6 +213,7 @@ GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list( sparks_overlay, damage_overlay, )) + compile_overlays() /obj/machinery/door/airlock/attack_generic(var/mob/living/user, var/damage) // todo: refactor @@ -559,7 +550,7 @@ About the new airlock wires panel: ui.open() return TRUE -/obj/machinery/door/airlock/ui_data(mob/user) +/obj/machinery/door/airlock/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/power = list() @@ -666,14 +657,14 @@ About the new airlock wires panel: src.attack_alien(user) return - if(src.p_open) + if(src.panel_open) user.set_machine(src) wires.Interact(user) else ..(user) return -/obj/machinery/door/airlock/ui_act(action, params) +/obj/machinery/door/airlock/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(!user_allowed(usr)) @@ -774,7 +765,7 @@ About the new airlock wires panel: open() /obj/machinery/door/airlock/proc/can_remove_electronics() - return src.p_open && (operating < 0 || (!operating && welded && !src.arePowerSystemsOn() && density && (!src.locked || (machine_stat & BROKEN)))) + return src.panel_open && (operating < 0 || (!operating && welded && !src.arePowerSystemsOn() && density && (!src.locked || (machine_stat & BROKEN)))) /obj/machinery/door/airlock/attackby(obj/item/C, mob/user as mob) //TO_WORLD("airlock attackby src [src] obj [C] mob [user]") @@ -801,14 +792,14 @@ About the new airlock wires panel: else return else if(C.is_screwdriver()) - if (src.p_open) + if (src.panel_open) if (machine_stat & BROKEN) to_chat(usr, "The panel is broken and cannot be closed.") else - src.p_open = 0 + src.panel_open = 0 playsound(src, C.tool_sound, 50, 1) else - src.p_open = 1 + src.panel_open = 1 playsound(src, C.tool_sound, 50, 1) src.update_icon() else if(C.is_wirecutter()) @@ -869,7 +860,7 @@ About the new airlock wires panel: ..() /obj/machinery/door/airlock/atom_break() - src.p_open = 1 + src.panel_open = 1 if (secured_wires) lock() . = ..() @@ -927,6 +918,16 @@ About the new airlock wires panel: LEGACY_EX_ACT(killthis, 2, null)//Smashin windows return ..() +/obj/machinery/door/airlock/set_opacity_on_close() + if(visible) + if(glass) + if(tinted) + set_opacity(1) + else + set_opacity(0) + else + set_opacity(1) + /obj/machinery/door/airlock/can_open(var/forced=0) if(!forced) if(!arePowerSystemsOn() || wires.is_cut(WIRE_OPEN_DOOR)) @@ -1178,6 +1179,19 @@ About the new airlock wires panel: src.lock() return +/obj/machinery/door/airlock/proc/toggle() + if(!glass) + return + tinted = !tinted + if(tinted) + icon = initial(icon) + if(!operating && density) + set_opacity(1) + else + if(!operating) + set_opacity(0) + + set_airlock_overlays(src.state) /obj/machinery/door/airlock/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) switch(passed_mode) diff --git a/code/game/machinery/doors/airlock/airlock_control.dm b/code/game/machinery/doors/airlock/airlock_control.dm index 90960165da..5ecef8d2e2 100644 --- a/code/game/machinery/doors/airlock/airlock_control.dm +++ b/code/game/machinery/doors/airlock/airlock_control.dm @@ -163,7 +163,9 @@ var/on = 1 var/alert = 0 - var/previousPressure + var/previous_pressure + var/previous_phoron + var/previous_temperature /obj/machinery/airlock_sensor/update_icon() if(on) @@ -183,21 +185,39 @@ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) flick("airlock_sensor_cycle", src) +// Checks the change of the values, if the change is sufficently large on any of them, send a new signal +/obj/machinery/airlock_sensor/proc/delta_check(var/new_pressure, var/new_phoron, var/new_temperature) + if(previous_pressure == null || previous_phoron == null || previous_temperature == null) + return 1 + if(abs(new_pressure - previous_pressure) > 0.1) + return 1 + if(abs(new_phoron - previous_phoron) > 0.1) + return 1 + if(abs(previous_temperature - previous_temperature) > 0.1) + return 1 + return 0 + /obj/machinery/airlock_sensor/process(delta_time) if(on) var/datum/gas_mixture/air_sample = return_air() var/pressure = round(air_sample.return_pressure(),0.1) + var/phoron = (GAS_ID_PHORON in air_sample.gas) ? round(air_sample.gas[GAS_ID_PHORON], 0.1) : 0 + var/temperature = round(air_sample.temperature, 0.1) - if(abs(pressure - previousPressure) > 0.001 || previousPressure == null) + if(delta_check(pressure, phoron, temperature)) var/datum/signal/signal = new signal.transmission_method = TRANSMISSION_RADIO //radio signal signal.data["tag"] = id_tag signal.data["timestamp"] = world.time signal.data["pressure"] = num2text(pressure) + signal.data["phoron"] = num2text(phoron) + signal.data["temperature"] = num2text(temperature) radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) - previousPressure = pressure + previous_pressure = pressure + previous_phoron = phoron + previous_temperature = temperature alert = (pressure < ONE_ATMOSPHERE*0.8) @@ -218,10 +238,10 @@ return ..() /obj/machinery/airlock_sensor/airlock_interior - command = "cycle_interior" + command = "cycle_int" /obj/machinery/airlock_sensor/airlock_exterior - command = "cycle_exterior" + command = "cycle_ext" // Return the air from the turf in "front" of us (Used in shuttles, so it can be in the shuttle area but sense outside it) /obj/machinery/airlock_sensor/airlock_exterior/shuttle/return_air() @@ -292,8 +312,8 @@ /obj/machinery/access_button/airlock_interior frequency = 1379 - command = "cycle_interior" + command = "cycle_int" /obj/machinery/access_button/airlock_exterior frequency = 1379 - command = "cycle_exterior" + command = "cycle_ext" diff --git a/code/game/machinery/doors/airlock/airlock_electronics.dm b/code/game/machinery/doors/airlock/airlock_electronics.dm index 398eef26b6..987aecfb27 100644 --- a/code/game/machinery/doors/airlock/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock/airlock_electronics.dm @@ -16,11 +16,11 @@ ui = new(user, src, "AirlockElectronics") ui.open() -/obj/item/airlock_electronics/ui_static_data(mob/user) +/obj/item/airlock_electronics/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["access"] = SSjob.tgui_access_data() -/obj/item/airlock_electronics/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/airlock_electronics/ui_data(mob/user, datum/tgui/ui) . = ..() .["req_access"] = conf_req_access || list() .["req_one_access"] = conf_req_one_access || list() diff --git a/code/game/machinery/doors/airlock/airlock_subtypes.dm b/code/game/machinery/doors/airlock/airlock_subtypes.dm index fba2e5a6eb..4c77563600 100644 --- a/code/game/machinery/doors/airlock/airlock_subtypes.dm +++ b/code/game/machinery/doors/airlock/airlock_subtypes.dm @@ -96,13 +96,15 @@ fill_file = 'icons/obj/doors/external/fill_steel.dmi' color_file = 'icons/obj/doors/external/color.dmi' color_fill_file = 'icons/obj/doors/external/fill_color.dmi' - glass_file = 'icons/obj/doors/external/fill_glass.dmi' bolts_file = 'icons/obj/doors/external/lights_bolts.dmi' - deny_file = 'icons/obj/doors/external/lights_deny.dmi' lights_file = 'icons/obj/doors/external/lights_green.dmi' emag_file = 'icons/obj/doors/external/emag.dmi' door_color = COLOR_NT_RED +/obj/machinery/door/airlock/external/glass + name = "External Glass Airlock" + fill_file = 'icons/obj/doors/external/fill_glass.dmi' + /obj/machinery/door/airlock/external/glass/bolted window_color = GLASS_COLOR icon_state = "door_locked" // So it looks visibly bolted in map editor @@ -116,12 +118,10 @@ name = "External Airlock" airlock_type = "GExternal" icon = 'icons/obj/doors/external/door.dmi' - fill_file = 'icons/obj/doors/external/fill_steel.dmi' + fill_file = 'icons/obj/doors/external/fill_glass.dmi' color_file = 'icons/obj/doors/external/color.dmi' color_fill_file = 'icons/obj/doors/external/fill_color.dmi' - glass_file = 'icons/obj/doors/external/fill_glass.dmi' bolts_file = 'icons/obj/doors/external/lights_bolts.dmi' - deny_file = 'icons/obj/doors/external/lights_deny.dmi' lights_file = 'icons/obj/doors/external/lights_green.dmi' emag_file = 'icons/obj/doors/external/emag.dmi' opacity = FALSE @@ -143,7 +143,9 @@ explosion_resistance = 5 opacity = FALSE glass = TRUE + tinted = FALSE window_color = GLASS_COLOR + fill_file = 'icons/obj/doors/station/fill_glass.dmi' /obj/machinery/door/airlock/centcom name = "Centcom Airlock" @@ -174,6 +176,7 @@ close_sound_powered = 'sound/machines/door/vault1c.ogg' icon = 'icons/obj/doors/vault/door.dmi' fill_file = 'icons/obj/doors/vault/fill_steel.dmi' + panel_file = 'icons/obj/doors/vault/panel.dmi' heat_resistance = 6000 /obj/machinery/door/airlock/vault/bolted @@ -201,7 +204,6 @@ stripe_file = 'icons/obj/doors/hatch/stripe.dmi' stripe_fill_file = 'icons/obj/doors/hatch/fill_stripe.dmi' bolts_file = 'icons/obj/doors/hatch/lights_bolts.dmi' - deny_file = 'icons/obj/doors/hatch/lights_deny.dmi' lights_file = 'icons/obj/doors/hatch/lights_green.dmi' panel_file = 'icons/obj/doors/hatch/panel.dmi' welded_file = 'icons/obj/doors/hatch/welded.dmi' @@ -224,7 +226,6 @@ stripe_file = 'icons/obj/doors/hatch/stripe.dmi' stripe_fill_file = 'icons/obj/doors/hatch/fill_stripe.dmi' bolts_file = 'icons/obj/doors/hatch/lights_bolts.dmi' - deny_file = 'icons/obj/doors/hatch/lights_deny.dmi' lights_file = 'icons/obj/doors/hatch/lights_green.dmi' panel_file = 'icons/obj/doors/hatch/panel.dmi' welded_file = 'icons/obj/doors/hatch/welded.dmi' diff --git a/code/game/machinery/doors/airlock/airlock_vr.dm b/code/game/machinery/doors/airlock/airlock_vr.dm index 858ce86170..114dec9f56 100644 --- a/code/game/machinery/doors/airlock/airlock_vr.dm +++ b/code/game/machinery/doors/airlock/airlock_vr.dm @@ -23,12 +23,9 @@ /obj/machinery/door/airlock/glass/security/polarized name = "Electrochromic Security Airlock" - icon_tinted = 'icons/obj/doors/Doorsectinted_vr.dmi' /obj/machinery/door/airlock/glass/medical/polarized name = "Electrochromic Medical Airlock" - icon_tinted = 'icons/obj/doors/doormedtinted_vr.dmi' /obj/machinery/door/airlock/glass/command/polarized name = "Electrochormic Command Airlock" - icon_tinted = 'icons/obj/doors/Doorcomtinted_vr.dmi' diff --git a/code/game/machinery/doors/airlock/phoronlocks.dm b/code/game/machinery/doors/airlock/phoronlocks.dm index 28400e95cb..54fe5e4b89 100644 --- a/code/game/machinery/doors/airlock/phoronlocks.dm +++ b/code/game/machinery/doors/airlock/phoronlocks.dm @@ -17,38 +17,19 @@ icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_sensor_off" name = "phoronlock sensor" - var/previousPhoron - -/obj/machinery/airlock_sensor/phoron/process() - if(on) - var/datum/gas_mixture/air_sample = return_air() - var/pressure = round(air_sample.return_pressure(), 0.1) - var/phoron = (GAS_ID_PHORON in air_sample.gas) ? round(air_sample.gas[GAS_ID_PHORON], 0.1) : 0 - - if(abs(pressure - previousPressure) > 0.1 || previousPressure == null || abs(phoron - previousPhoron) > 0.1 || previousPhoron == null) - var/datum/signal/signal = new - signal.transmission_method = TRANSMISSION_RADIO //radio signal - signal.data["tag"] = id_tag - signal.data["timestamp"] = world.time - signal.data["pressure"] = num2text(pressure) - signal.data["phoron"] = num2text(phoron) - radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, radio_filter = RADIO_AIRLOCK) - previousPressure = pressure - previousPhoron = phoron - alert = (pressure < ONE_ATMOSPHERE*0.8) || (phoron > 0.5) - update_icon() /obj/machinery/airlock_sensor/phoron/airlock_interior - command = "cycle_interior" + command = "cycle_int" /obj/machinery/airlock_sensor/phoron/airlock_exterior - command = "cycle_exterior" + command = "cycle_ext" // Radio remote control /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary var/frequency = 0 var/datum/radio_frequency/radio_connection + scrubbing_ids = list("phoron", "co2") /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize(mapload) . = ..() @@ -116,9 +97,6 @@ // // PHORON LOCK CONTROLLER // -/obj/machinery/embedded_controller/radio/airlock/phoron - var/tag_scrubber - /obj/machinery/embedded_controller/radio/airlock/phoron/Initialize(mapload) . = ..() program = new/datum/computer/file/embedded_program/airlock/phoron(src) @@ -127,11 +105,13 @@ /obj/machinery/embedded_controller/radio/airlock/phoron name = "Phoron Lock Controller" valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "secure") + var/tag_scrubber -/obj/machinery/embedded_controller/radio/airlock/phoron/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/phoron/ui_data(mob/user, datum/tgui/ui) . = list( "chamber_pressure" = program.memory["chamber_sensor_pressure"], "chamber_phoron" = program.memory["chamber_sensor_phoron"], + "chamber_temperature" = round(program.memory["chamber_sensor_temperature"] - 273.15, 0.1), "exterior_status" = program.memory["exterior_status"], "interior_status" = program.memory["interior_status"], "processing" = program.memory["processing"], @@ -144,15 +124,6 @@ //Handles the control of airlocks -#define STATE_IDLE 0 -#define STATE_PREPARE 1 -#define STATE_CLEAN 16 -#define STATE_PRESSURIZE 17 - -#define TARGET_NONE 0 -#define TARGET_INOPEN -1 -#define TARGET_OUTOPEN -2 - /datum/computer/file/embedded_program/airlock/phoron var/tag_scrubber @@ -164,6 +135,7 @@ memory["external_sensor_pressure"] = 82.4 memory["external_sensor_phoron"] = (82.4*CELL_VOLUME) / (8.134 * 234) // n = pv/rt memory["internal_sensor_phoron"] = 0 + memory["target_temperature"] = T20C memory["scrubber_status"] = "unknown" memory["target_phoron"] = 0.1 memory["secure"] = 1 @@ -178,14 +150,19 @@ if(..()) return 1 if(receive_tag==tag_chamber_sensor) - memory["chamber_sensor_phoron"] = text2num(signal.data["phoron"]) - memory["chamber_sensor_pressure"] = text2num(signal.data["pressure"]) + memory["chamber_sensor_phoron"] = round(text2num(signal.data["phoron"]), 0.1) + memory["chamber_sensor_pressure"] = round(text2num(signal.data["pressure"]), 0.1) + memory["chamber_sensor_temperature"] = round(text2num(signal.data["temperature"]), 0.1) else if(receive_tag==tag_exterior_sensor) - memory["external_sensor_phoron"] = text2num(signal.data["phoron"]) + memory["external_sensor_phoron"] = round(text2num(signal.data["phoron"]), 0.1) + memory["external_sensor_pressure"] = round(text2num(signal.data["pressure"]), 0.1) + memory["external_sensor_temperature"] = round(text2num(signal.data["temperature"]), 0.1) else if(receive_tag==tag_interior_sensor) - memory["internal_sensor_phoron"] = text2num(signal.data["phoron"]) + memory["internal_sensor_phoron"] = round(text2num(signal.data["phoron"]), 0.1) + memory["internal_sensor_pressure"] = round(text2num(signal.data["pressure"]), 0.1) + memory["internal_sensor_temperature"] = round(text2num(signal.data["temperature"]), 0.1) else if(receive_tag==tag_scrubber) if(signal.data["power"]) @@ -198,88 +175,60 @@ // But lets evaluate how it actually works in the game. /datum/computer/file/embedded_program/airlock/phoron/process() switch(state) - if(STATE_IDLE) - if(target_state == TARGET_INOPEN) - // TODO - Check if okay to just open immediately - close_doors() - state = STATE_PREPARE - else if(target_state == TARGET_OUTOPEN) - close_doors() - state = STATE_PREPARE - // else if(memory["scrubber_status"] != "off") - // signalScrubber(tag_scrubber, 0) // Keep scrubbers off while idle - // else if(memory["pump_status"] != "off") - // signalPump(tag_airpump, 0) // Keep vent pump off while idle - - if(STATE_PREPARE) - if (check_doors_secured()) - if(target_state == TARGET_INOPEN) - playsound(master, 'sound/AI/airlockin.ogg', 100, 0) - if(memory["chamber_sensor_phoron"] > memory["target_phoron"]) - state = STATE_CLEAN - signalScrubber(tag_scrubber, 1) // Start cleaning - signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // And pressurizng to offset losses - else // We can go directly to pressurize - state = STATE_PRESSURIZE - signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // Send a signal to start pressurizing - // We must be cycling outwards! Shut down the pumps and such! - else if(memory["scrubber_status"] != "off") - signalScrubber(tag_scrubber, 0) - else if(memory["pump_status"] != "off") - signalPump(tag_airpump, 0) - else - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) - cycleDoors(target_state) - state = STATE_IDLE - target_state = TARGET_NONE - - if(STATE_CLEAN) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(!check_doors_secured()) - //the airlock will not allow itself to continue to cycle when any of the doors are forced open. - stop_cycling() - else if(memory["chamber_sensor_phoron"] <= memory["target_phoron"]) - // Okay, we reached target phoron! Turn off the scrubber + if(STATE_UNDEFINED) + return + if(STATE_CLOSED)//First the three stable states: + return + if(STATE_OPEN_IN) + return + if(STATE_OPEN_OUT) + return + if(STATE_CYCLING_IN)//Now the changing states: + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else if(fuzzy_smaller_check(memory["target_phoron"], memory["chamber_sensor_phoron"], 0))//target phoron is already 0.1 + signalScrubber(tag_scrubber, 1) // Start cleaning + signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // And pressurizng to offset losses + memory["processing"] = TRUE + else if(fuzzy_smaller_check(memory["chamber_sensor_temperature"], memory["target_temperature"])) + signalScrubber(tag_scrubber, 1)//the scrubbers also work as heats because fuck making sense + memory["processing"] = TRUE + else if(fuzzy_smaller_check(memory["chamber_sensor_pressure"], memory["internal_sensor_pressure"])) + signalScrubber(tag_scrubber, 0) // stop cleaning + signalPump(tag_airpump, 1, 1, memory["target_pressure"]) // continue pressurizng to offset losses + memory["processing"] = TRUE + else // both phoron and pressure levels are acceptable + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") signalScrubber(tag_scrubber, 0) - // And proceed to finishing pressurization - state = STATE_PRESSURIZE - - if(STATE_PRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(!check_doors_secured()) - //the airlock will not allow itself to continue to cycle when any of the doors are forced open. - stop_cycling() - else if(memory["chamber_sensor_pressure"] >= memory["target_pressure"] * 0.95) - signalPump(tag_airpump, 0) // send a signal to stop pumping. No need to wait for it tho. - cycleDoors(target_state) - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) - state = STATE_IDLE - target_state = TARGET_NONE - - memory["processing"] = (state != target_state) + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_IN + memory["processing"] = FALSE + if(STATE_CYCLING_OUT) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else if((memory["chamber_sensor_pressure"] - memory["external_sensor_pressure"]) > 1 ) + signalPump(tag_airpump, 1, 0, memory["external_sensor_pressure"]) // siphon air out to avoid being pulled from your feet + memory["processing"] = TRUE + else if(memory["interior_status"]["state"] == "open") //double check + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else // pressure levels are acceptable and interior doors are closed + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_OUT + memory["processing"] = FALSE + if(STATE_SEALING) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + memory["processing"] = TRUE + else if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + memory["processing"] = TRUE + else + state = STATE_CLOSED + memory["processing"] = FALSE return 1 -/datum/computer/file/embedded_program/airlock/phoron/stop_cycling() - state = STATE_IDLE - target_state = TARGET_NONE - signalPump(tag_airpump, 0) - signalScrubber(tag_scrubber, 0) - -/datum/computer/file/embedded_program/airlock/phoron/proc/signalScrubber(var/tag, var/power) - var/datum/signal/signal = new - signal.data = list( - "tag" = tag, - "sigtype" = "command", - "power" = "[power]", - ) - post_signal(signal) - - -#undef STATE_IDLE -#undef STATE_PREPARE -#undef STATE_CLEAN -#undef STATE_PRESSURIZE +/datum/computer/file/embedded_program/airlock/phoron/stop_everything() + . = ..() + signalScrubber(tag_scrubber, 0)//Turn off scrubbers -#undef TARGET_NONE -#undef TARGET_INOPEN -#undef TARGET_OUTOPEN diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 6380048ff7..645acadfb2 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -27,10 +27,9 @@ var/closed_layer = DOOR_CLOSED_LAYER var/visible = 1 - var/p_open = 0//[bool]is the door open? var/operating = 0//[bool]Is the door opening or closing? var/autoclose = 0//[bool]should the door close automaticly - var/glass = 0 + var/glass = 0 //[bool] is the door see-through? var/normalspeed = 1 var/heat_resistance = 1000 // For glass airlocks/opacity firedoors var/air_properties_vary_with_direction = 0 @@ -46,9 +45,7 @@ var/atom/movable/overlay/c_animation = null var/reinforcing = 0 - var/tintable = 0 - var/icon_tinted - var/id_tint + /obj/machinery/door/Initialize(mapload, newdir) . = ..() @@ -100,7 +97,7 @@ /obj/machinery/door/Bumped(atom/AM) . = ..() - if(p_open || operating) + if(panel_open || operating) return if(ismob(AM)) var/mob/M = AM @@ -311,12 +308,12 @@ /obj/machinery/door/proc/do_animate(animation) switch(animation) if(DOOR_ANIMATION_OPEN) - if(p_open) + if(panel_open) flick("o_doorc0", src) else flick("doorc0", src) if(DOOR_ANIMATION_CLOSE) - if(p_open) + if(panel_open) flick("o_doorc1", src) else flick("doorc1", src) @@ -368,8 +365,8 @@ update_nearby_tiles() sleep(7) update_icon() - if(visible && !glass) - set_opacity(1) //caaaaarn! + set_opacity_on_close() + rad_insulation = initial(rad_insulation) operating = 0 @@ -380,6 +377,10 @@ return 1 +/obj/machinery/door/proc/set_opacity_on_close() + if(visible && !glass) + set_opacity(1) + /obj/machinery/door/proc/toggle_open(var/forced) if(density) open(forced) diff --git a/code/game/machinery/doors/door_timer.dm b/code/game/machinery/doors/door_timer.dm index 6b85947e5c..e45245f39a 100644 --- a/code/game/machinery/doors/door_timer.dm +++ b/code/game/machinery/doors/door_timer.dm @@ -212,7 +212,7 @@ ui = new(user, src, "BrigTimer", name) ui.open() -/obj/machinery/door_timer/ui_data() +/obj/machinery/door_timer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/time_left = time_left(seconds = TRUE) data["seconds"] = round(time_left % 60) @@ -229,7 +229,7 @@ break return data -/obj/machinery/door_timer/ui_act(action, params) +/obj/machinery/door_timer/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/game/machinery/doors/door_vr.dm b/code/game/machinery/doors/door_vr.dm index e2d1eae616..dee9c5e42e 100644 --- a/code/game/machinery/doors/door_vr.dm +++ b/code/game/machinery/doors/door_vr.dm @@ -61,30 +61,3 @@ return TRUE return FALSE - -/obj/machinery/door/proc/toggle() - if(glass) - icon = icon_tinted - glass = 0 - if(!operating && density) - set_opacity(1) - else - icon = initial(icon) - glass = 1 - if(!operating) - set_opacity(0) - -/obj/machinery/button/windowtint/doortint - name = "door tint control" - desc = "A remote control switch for polarized glass doors." - -/obj/machinery/button/windowtint/doortint/toggle_tint() - use_power(5) - active = !active - update_icon() - - for(var/obj/machinery/door/D in range(src,range)) - if(D.icon_tinted && (D.id_tint == src.id || !D.id_tint)) - spawn(0) - D.toggle() - return diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index fff8d5df94..ced37e6c7f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -7,8 +7,7 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( /obj/structure/window/reinforced/polarized/full, /obj/structure/wall_frame/prepainted/, /obj/structure/wall_frame, - /obj/machinery/door/airlock/multi_tile, - /obj/machinery/door/airlock))) + /obj/machinery/door))) //comedy. /// kPa #define FIREDOOR_MAX_PRESSURE_DIFF 25 /// °C @@ -52,12 +51,10 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( var/next_process_time = 0 var/low_profile = FALSE - var/hatch_open = 0 - power_channel = ENVIRON use_power = USE_POWER_IDLE idle_power_usage = 5 - autoset_dir = FALSE + autoset_dir = TRUE var/list/tile_info[4] var/list/dir_alerts[4] // 4 dirs, bitflags @@ -88,7 +85,32 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return INITIALIZE_HINT_LATELOAD /obj/machinery/door/firedoor/LateInitialize() - setDir(dir) + . = ..() + if(autoset_dir) + for (var/cardinal in GLOB.cardinal) + var/turf/step_turf = get_step(src, cardinal) + if (step_turf.density == TRUE) + switch(cardinal) + if(EAST) + setDir(SOUTH) + if(WEST) + setDir(SOUTH) + if(NORTH) + setDir(WEST) + if(SOUTH) + setDir(WEST) + for(var/atom/thing as anything in step_turf) + if(thing.type in GLOB.firelock_align_types) + switch(cardinal) + if(EAST) + setDir(SOUTH) + if(WEST) + setDir(SOUTH) + if(NORTH) + setDir(WEST) + if(SOUTH) + setDir(WEST) + break /obj/machinery/door/firedoor/Destroy() for(var/area/A in areas_added) @@ -135,7 +157,7 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( . += "These people have opened \the [src] during an alert: [users_to_open_string]." /obj/machinery/door/firedoor/Bumped(atom/AM) - if(p_open || operating) + if(panel_open || operating) return if(!density) return ..() @@ -279,21 +301,21 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return if(density && C.is_screwdriver()) - hatch_open = !hatch_open + panel_open = !panel_open playsound(src, C.tool_sound, 50, 1) - user.visible_message("[user] has [hatch_open ? "opened" : "closed"] \the [src] maintenance hatch.", - "You have [hatch_open ? "opened" : "closed"] the [src] maintenance hatch.") + user.visible_message("[user] has [panel_open ? "opened" : "closed"] \the [src] maintenance hatch.", + "You have [panel_open ? "opened" : "closed"] the [src] maintenance hatch.") update_icon() return if(blocked && C.is_crowbar() && !repairing) - if(!hatch_open) + if(!panel_open) to_chat(user, "You must open the maintenance hatch first!") else user.visible_message("[user] is removing the electronics from \the [src].", "You start to remove the electronics from [src].") if(do_after(user,30)) - if(blocked && density && hatch_open) + if(blocked && density && panel_open) playsound(src, C.tool_sound, 50, 1) user.visible_message("[user] has removed the electronics from \the [src].", "You have removed the electronics from [src].") @@ -425,8 +447,8 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return ..() /obj/machinery/door/firedoor/open(var/forced = 0) - if(hatch_open) - hatch_open = 0 + if(panel_open) + panel_open = 0 visible_message("The maintenance hatch of \the [src] closes.") update_icon() @@ -444,10 +466,10 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( /obj/machinery/door/firedoor/do_animate(animation) switch(animation) - if("opening") + if(DOOR_ANIMATION_OPEN) flick("opening", src) playsound(src, 'sound/machines/firelockopen.ogg', 37, 1) - if("closing") + if(DOOR_ANIMATION_CLOSE) playsound(src, 'sound/machines/firelockclose.ogg', 37, 1) flick("closing", src) return @@ -486,42 +508,6 @@ GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list( return -/obj/machinery/door/firedoor/setDir(ndir) - for(var/D in GLOB.cardinal) - var/turf/T = get_step(src, D) - for(var/obj/A in T.contents) - if(A.type in GLOB.firelock_align_types) //this is mainly for the cases where mappers can't manually align firelocks, i.e window spawners. - switch(D) - if(NORTH) - dir = WEST - break - if(EAST) - dir = SOUTH - break - if(SOUTH) - dir = WEST - break - if(WEST) - dir = SOUTH - break - if(T.density) - switch(D) - if(NORTH) - dir = WEST - break - if(EAST) - dir = SOUTH - break - if(SOUTH) - dir = WEST - break - if(WEST) - dir = SOUTH - break - ..() - - - /obj/machinery/door/firedoor/border_only /* icon = 'icons/obj/doors/edge_Doorfire.dmi' diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index f561aecd4e..d1c58efa04 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -12,10 +12,9 @@ fill_file = 'icons/obj/doors/double/fill_steel.dmi' color_file = 'icons/obj/doors/double/color.dmi' color_fill_file = 'icons/obj/doors/double/fill_color.dmi' - glass_file = 'icons/obj/doors/double/fill_glass.dmi' bolts_file = 'icons/obj/doors/double/lights_bolts.dmi' - deny_file = 'icons/obj/doors/double/lights_deny.dmi' lights_file = 'icons/obj/doors/double/lights_green.dmi' + panel_file = 'icons/obj/doors/double/panel.dmi' emag_file = 'icons/obj/doors/double/emag.dmi' stripe_file = 'icons/obj/doors/double/stripe.dmi' stripe_fill_file = 'icons/obj/doors/double/fill_stripe.dmi' @@ -42,26 +41,6 @@ . = ..() SetBounds() -/obj/machinery/door/airlock/multi_tile/open() - . = ..() - - if(filler1) - filler1.set_opacity(opacity) - if(filler2) - filler2.set_opacity(opacity) - - return . - -/obj/machinery/door/airlock/multi_tile/close() - . = ..() - - if(filler1) - filler1.set_opacity(opacity) - if(filler2) - filler2.set_opacity(opacity) - - return . - /obj/machinery/door/airlock/multi_tile/proc/SetBounds() if(width > 1) if(dir in list(EAST, WEST)) @@ -95,7 +74,11 @@ glass = 1 assembly_type = /obj/structure/door_assembly/multi_tile window_color = GLASS_COLOR + fill_file = 'icons/obj/doors/double/fill_glass.dmi' +/obj/machinery/door/airlock/multi_tile/set_opacity(var/new_opacity) + filler1.set_opacity(new_opacity) + filler2.set_opacity(new_opacity) /obj/machinery/door/airlock/multi_tile/metal name = "Airlock" diff --git a/code/game/machinery/doors/multi_tile_vr.dm b/code/game/machinery/doors/multi_tile_vr.dm index a18727c6ab..09947ad05f 100644 --- a/code/game/machinery/doors/multi_tile_vr.dm +++ b/code/game/machinery/doors/multi_tile_vr.dm @@ -1,6 +1,5 @@ /obj/machinery/door/airlock/multi_tile/glass/polarized name = "Electrochromic Glass Airlock" - icon_tinted = 'icons/obj/doors/Door2x1tinted_vr.dmi' /obj/machinery/door/airlock/multi_tile/glass/polarized/Initialize(mapload) . = ..() diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index f83bc4bcfb..31fb444e1c 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -25,7 +25,7 @@ //dummy_terminals.Cut() return ..() -/obj/machinery/embedded_controller/radio/airlock/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/obj/machinery/embedded_controller/radio/airlock/ui_status(mob/user, datum/ui_state/state) . = ..() if(!allowed(user)) return min(UI_UPDATE, .) @@ -34,7 +34,7 @@ /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller name = "Advanced Airlock Controller" -/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, datum/tgui/ui) . = list( "chamber_pressure" = round(program.memory["chamber_sensor_pressure"]), "external_pressure" = round(program.memory["external_sensor_pressure"]), @@ -52,7 +52,7 @@ tag_secure = 1 valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort") -/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, datum/tgui/ui) . = list( "chamber_pressure" = round(program.memory["chamber_sensor_pressure"]), "exterior_status" = program.memory["exterior_status"], @@ -68,7 +68,8 @@ name = "Access Controller" tag_secure = 1 - valid_actions = list("cycle_ext_door", "cycle_int_door", "force_ext", "force_int") + valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int") + program = /datum/computer/file/embedded_program/airlock/access_controll /obj/machinery/embedded_controller/radio/airlock/access_controller/update_icon() @@ -80,7 +81,7 @@ else icon_state = "access_control_off" -/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, datum/tgui/ui) . = list( "exterior_status" = program.memory["exterior_status"], "interior_status" = program.memory["interior_status"], diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index 2d017876ab..6a2f46f4aa 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -15,6 +15,12 @@ tag_secure = 1 valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "toggle_override") +/obj/machinery/embedded_controller/radio/airlock/docking_port/process() + airlock_program?.process() + docking_program?.process() + + update_icon() + /obj/machinery/embedded_controller/radio/airlock/docking_port/Initialize(mapload) . = ..() airlock_program = new/datum/computer/file/embedded_program/airlock/docking(src) @@ -35,7 +41,7 @@ else ..() -/obj/machinery/embedded_controller/radio/airlock/docking_port/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/docking_port/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/airlock/docking_program = program var/datum/computer/file/embedded_program/airlock/docking/airlock_program = docking_program.airlock_program @@ -84,28 +90,26 @@ //tell the docking port to start getting ready for docking - e.g. pressurize /datum/computer/file/embedded_program/docking/airlock/prepare_for_docking() - airlock_program.begin_dock_cycle() + airlock_program.state = STATE_CYCLING_IN //are we ready for docking? /datum/computer/file/embedded_program/docking/airlock/ready_for_docking() - return !airlock_program || airlock_program.done_cycling() + return airlock_program.state == STATE_OPEN_IN //we are docked, open the doors or whatever. /datum/computer/file/embedded_program/docking/airlock/finish_docking() airlock_program.enable_mech_regulation() airlock_program.open_doors() +// TODO IMPLEMENT THESE procs that return 0 + //tell the docking port to start getting ready for undocking - e.g. close those doors. /datum/computer/file/embedded_program/docking/airlock/prepare_for_undocking() - airlock_program.stop_cycling() - airlock_program.close_doors() - airlock_program.disable_mech_regulation() + airlock_program.state = STATE_SEALING //are we ready for undocking? /datum/computer/file/embedded_program/docking/airlock/ready_for_undocking() - var/ext_closed = airlock_program.check_exterior_door_secured() - var/int_closed = airlock_program.check_interior_door_secured() - return (ext_closed || int_closed) + return airlock_program.state == STATE_CLOSED /////////////////////////////////////////////////////////////////////////////// //An airlock controller to be used by the airlock-based docking port controller. @@ -128,10 +132,6 @@ toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open") -/datum/computer/file/embedded_program/airlock/docking/cycleDoors(var/target) - if (master_prog.undocked() || master_prog.override_enabled) //only allow the port to be used as an airlock if nothing is docked here or the override is enabled - ..(target) - /*** DEBUG VERBS *** /datum/computer/file/embedded_program/docking/proc/print_state() diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index a0ff624e8d..375d6a02f6 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -15,7 +15,7 @@ for (var/i = 1; i <= tags.len; i++) child_names[tags[i]] = names[i] -/obj/machinery/embedded_controller/radio/docking_port_multi/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/docking_port_multi/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/multi/docking_program = program // Cast to proper type var/list/airlocks[child_names.len] @@ -29,7 +29,7 @@ "internalTemplateName" = "DockingConsoleMulti", ) -/obj/machinery/embedded_controller/radio/docking_port_multi/ui_act(action, params) +/obj/machinery/embedded_controller/radio/docking_port_multi/ui_act(action, list/params, datum/tgui/ui) . = ..() return //Apparently we swallow all input (this is corrected legacy code) @@ -43,7 +43,7 @@ valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "toggle_override") -/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/airlock/multi_docking/airlock_program = program // Cast to proper type . = list( diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm index 2878f5e220..c2ccc1ccee 100644 --- a/code/game/machinery/embedded_controller/airlock_program.dm +++ b/code/game/machinery/embedded_controller/airlock_program.dm @@ -1,18 +1,9 @@ //Handles the control of airlocks -#define STATE_IDLE 0 -#define STATE_PREPARE 1 -#define STATE_DEPRESSURIZE 2 -#define STATE_PRESSURIZE 3 +/// Never try to pump to pure vacuum, its not happening. +#define MIN_TARGET_PRESSURE (ONE_ATMOSPHERE * 0.01) -#define TARGET_NONE 0 -#define TARGET_INOPEN -1 -#define TARGET_OUTOPEN -2 -/// Never try to pump to pure vacuum, its not happening. -#define MIN_TARGET_PRESSURE (ONE_ATMOSPHERE * 0.05) -/// Skip cycling airlock (just open the doors) if pressures are within this range. -#define SKIPCYCLE_MARGIN 1 /datum/computer/file/embedded_program/airlock var/tag_exterior_door var/tag_interior_door @@ -23,12 +14,10 @@ var/tag_airlock_mech_sensor var/tag_shuttle_mech_sensor - var/state = STATE_IDLE - var/target_state = TARGET_NONE + var/state = STATE_CLOSED - var/cycle_to_external_air = 0 - var/tag_pump_out_external - var/tag_pump_out_internal + //var/tag_pump_out_external not part of basic airlocks + //var/tag_pump_out_internal /datum/computer/file/embedded_program/airlock/New(var/obj/machinery/embedded_controller/M) ..(M) @@ -45,10 +34,6 @@ if (istype(M, /obj/machinery/embedded_controller/radio/airlock)) //if our controller is an airlock controller than we can auto-init our tags var/obj/machinery/embedded_controller/radio/airlock/controller = M - cycle_to_external_air = controller.cycle_to_external_air - if(cycle_to_external_air) - tag_pump_out_external = "[id_tag]_pump_out_external" - tag_pump_out_internal = "[id_tag]_pump_out_internal" tag_exterior_door = controller.tag_exterior_door? controller.tag_exterior_door : "[id_tag]_outer" tag_interior_door = controller.tag_interior_door? controller.tag_interior_door : "[id_tag]_inner" tag_airpump = controller.tag_airpump? controller.tag_airpump : "[id_tag]_pump" @@ -85,79 +70,49 @@ memory["interior_status"]["state"] = signal.data["door_status"] memory["interior_status"]["lock"] = signal.data["lock_status"] - else if(receive_tag==tag_airpump || receive_tag==tag_pump_out_internal) + else if(receive_tag==tag_airpump) if(signal.data["power"]) memory["pump_status"] = signal.data["direction"] else memory["pump_status"] = "off" else if(receive_tag==id_tag) - if(istype(master, /obj/machinery/embedded_controller/radio/airlock/access_controller)) - switch(signal.data["command"]) - if("cycle_exterior") - receive_user_command("cycle_ext_door") - if("cycle_interior") - receive_user_command("cycle_int_door") - if("cycle") - if(memory["interior_status"]["state"] == "open") //handle backwards compatibility - receive_user_command("cycle_ext") - else - receive_user_command("cycle_int") - else - switch(signal.data["command"]) - if("cycle_exterior") - receive_user_command("cycle_ext") - if("cycle_interior") - receive_user_command("cycle_int") - if("cycle") - if(memory["interior_status"]["state"] == "open") //handle backwards compatibility - receive_user_command("cycle_ext") - else - receive_user_command("cycle_int") - + receive_user_command(signal.data["command"]) /datum/computer/file/embedded_program/airlock/receive_user_command(command) - var/shutdown_pump = 0 . = TRUE switch(command) if("cycle_ext") - //If airlock is already cycled in this direction, just toggle the doors. - if(!memory["purge"] && abs(memory["external_sensor_pressure"] - memory["chamber_sensor_pressure"]) <= SKIPCYCLE_MARGIN) - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "toggle") - //only respond to these commands if the airlock isn't already doing something - //prevents the controller from getting confused and doing strange things - else if(state == target_state) - begin_cycle_out() - + state = STATE_CYCLING_OUT + memory["processing"] = TRUE if("cycle_int") - if(!memory["purge"] && abs(memory["internal_sensor_pressure"] - memory["chamber_sensor_pressure"]) <= SKIPCYCLE_MARGIN) - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "toggle") - else if(state == target_state) - begin_cycle_in() - - if("cycle_ext_door") - cycleDoors(TARGET_OUTOPEN) - - if("cycle_int_door") - cycleDoors(TARGET_INOPEN) - - if("abort") - stop_cycling() - + state = STATE_CYCLING_IN + memory["processing"] = TRUE + if("secure") + state = STATE_SEALING + memory["processing"] = TRUE if("force_ext") - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "toggle") - + state = STATE_UNDEFINED + memory["processing"] = FALSE + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else if(memory["exterior_status"]["state"] == "closed") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") if("force_int") - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "toggle") - + state = STATE_UNDEFINED + memory["processing"] = FALSE + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else if(memory["interior_status"]["state"] == "closed") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") + if("abort") + stop_everything() if("purge") - memory["purge"] = !memory["purge"] - if(memory["purge"]) - close_doors() - state = STATE_PREPARE - target_state = TARGET_NONE - - if("secure") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + signalPump(tag_airpump, 1, 0, MIN_TARGET_PRESSURE) + state = STATE_UNDEFINED + if("bypass") memory["secure"] = !memory["secure"] if(memory["secure"]) signalDoor(tag_interior_door, "lock") @@ -168,152 +123,65 @@ else . = FALSE - if(shutdown_pump) - signalPump(tag_airpump, 0) //send a signal to stop pressurizing - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - - - /datum/computer/file/embedded_program/airlock/process() - if(!state) //Idle - if(target_state) - switch(target_state) - if(TARGET_INOPEN) - memory["target_pressure"] = memory["internal_sensor_pressure"] - if(TARGET_OUTOPEN) - memory["target_pressure"] = memory["external_sensor_pressure"] - - //lock down the airlock before activating pumps - close_doors() - - state = STATE_PREPARE - else - //make sure to return to a sane idle state - if(memory["pump_status"] != "off") //send a signal to stop pumping - signalPump(tag_airpump, 0) - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - - if ((state == STATE_PRESSURIZE || state == STATE_DEPRESSURIZE) && !check_doors_secured()) - //the airlock will not allow itself to continue to cycle when any of the doors are forced open. - stop_cycling() - switch(state) - if(STATE_PREPARE) - if (check_doors_secured()) - var/chamber_pressure = memory["chamber_sensor_pressure"] - var/target_pressure = memory["target_pressure"] - - if(memory["purge"]) - //purge apparently means clearing the airlock chamber to vacuum (then refilling, handled later) - target_pressure = 0 - state = STATE_DEPRESSURIZE - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) //TODO: Remove all of Virgo's TTS. Doesn't match anything. - if(!cycle_to_external_air || target_state == TARGET_OUTOPEN) // if going outside, pump internal air into air tank - signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing - else - signalPump(tag_pump_out_internal, 1, 0, target_pressure) // if going inside, pump external air out of the airlock - signalPump(tag_pump_out_external, 1, 1, 15000) // make sure the air is actually going outside - - else if(chamber_pressure <= target_pressure) - state = STATE_PRESSURIZE - playsound(master, 'sound/AI/airlockin.ogg', 100, 0) - if(!cycle_to_external_air || target_state == TARGET_INOPEN) // if going inside, pump air into airlock - signalPump(tag_airpump, 1, 1, target_pressure) //send a signal to start pressurizing - else - signalPump(tag_pump_out_internal, 1, 1, target_pressure) // if going outside, fill airlock with external air - signalPump(tag_pump_out_external, 1, 0, 0) - - else if(chamber_pressure > target_pressure) - if(!cycle_to_external_air) - state = STATE_DEPRESSURIZE - playsound(master, 'sound/AI/airlockout.ogg', 100, 0) - signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing - else - memory["purge"] = 1 // should always purge first if using external air, chamber pressure should never be higher than target pressure here - //Make sure the airlock isn't aiming for pure vacuum - an impossibility - memory["target_pressure"] = max(target_pressure, MIN_TARGET_PRESSURE) - - if(STATE_PRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(memory["chamber_sensor_pressure"] >= memory["target_pressure"] * 0.95) - //not done until the pump has reported that it's off - if(memory["pump_status"] != "off") - signalPump(tag_airpump, 0) //send a signal to stop pumping - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - else - cycleDoors(target_state) - state = STATE_IDLE - target_state = TARGET_NONE - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) - - - if(STATE_DEPRESSURIZE) - playsound(master, 'sound/machines/2beep.ogg', 100, 0) - if(memory["chamber_sensor_pressure"] <= max(memory["target_pressure"] * 1.05, MIN_TARGET_PRESSURE)) - if(memory["pump_status"] != "off") - signalPump(tag_airpump, 0) - if(cycle_to_external_air) - signalPump(tag_pump_out_internal, 0) - signalPump(tag_pump_out_external, 0) - else if(memory["purge"]) - memory["purge"] = 0 - memory["target_pressure"] = (target_state == TARGET_INOPEN ? memory["internal_sensor_pressure"] : memory["external_sensor_pressure"]) - if (memory["target_pressure"] > SKIPCYCLE_MARGIN) - state = STATE_PREPARE // Skip pressurizing if target pressure is already close enough. - else - cycleDoors(target_state) - state = STATE_IDLE - target_state = TARGET_NONE - playsound(master, 'sound/AI/airlockdone.ogg', 100, 0) - - - memory["processing"] = (state != target_state) + if(STATE_OPEN_OUT) + return 1 + if(STATE_OPEN_IN) + return 1 + if(STATE_CLOSED) + return 1 + if(STATE_BYPASS) + return 1 + if(STATE_CYCLING_IN) + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else if(fuzzy_smaller_check(memory["chamber_sensor_pressure"], memory["internal_sensor_pressure"])) + signalPump(tag_airpump, 1, 1, memory["target_pressure"]+0.1) + memory["processing"] = TRUE + else + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_IN + memory["processing"] = FALSE + if(STATE_CYCLING_OUT) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else if(fuzzy_smaller_check(MIN_TARGET_PRESSURE, memory["chamber_sensor_pressure"])) + signalPump(tag_airpump, 1, 0, MIN_TARGET_PRESSURE) // siphon air out to avoid being pulled from your feet + memory["processing"] = TRUE + else if(memory["interior_status"]["state"] == "open") //double check + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else // pressure levels are acceptable and interior doors are closed + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_OUT + memory["processing"] = FALSE + if(STATE_SEALING) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + memory["processing"] = TRUE + else if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + memory["processing"] = TRUE + else + state = STATE_CLOSED + memory["processing"] = FALSE + if(STATE_BYPASSING) + signalDoor(tag_interior_door, "unlock") + signalDoor(tag_exterior_door, "unlock") + state = STATE_BYPASS + else + state = STATE_UNDEFINED return 1 //these are here so that other types don't have to make so many assuptions about our implementation -/datum/computer/file/embedded_program/airlock/proc/begin_cycle_in() - state = STATE_IDLE - target_state = TARGET_INOPEN - memory["purge"] = cycle_to_external_air - -/datum/computer/file/embedded_program/airlock/proc/begin_dock_cycle() - state = STATE_IDLE - target_state = TARGET_INOPEN -/datum/computer/file/embedded_program/airlock/proc/begin_cycle_out() - state = STATE_IDLE - target_state = TARGET_OUTOPEN - memory["purge"] = cycle_to_external_air - /datum/computer/file/embedded_program/airlock/proc/close_doors() toggleDoor(memory["interior_status"], tag_interior_door, 1, "close") toggleDoor(memory["exterior_status"], tag_exterior_door, 1, "close") -/datum/computer/file/embedded_program/airlock/proc/stop_cycling() - state = STATE_IDLE - target_state = TARGET_NONE - -/datum/computer/file/embedded_program/airlock/proc/done_cycling() - return (state == STATE_IDLE && target_state == TARGET_NONE) - -//are the doors closed and locked? -/datum/computer/file/embedded_program/airlock/proc/check_exterior_door_secured() - return (memory["exterior_status"]["state"] == "closed" && memory["exterior_status"]["lock"] == "locked") - -/datum/computer/file/embedded_program/airlock/proc/check_interior_door_secured() - return (memory["interior_status"]["state"] == "closed" && memory["interior_status"]["lock"] == "locked") - -/datum/computer/file/embedded_program/airlock/proc/check_doors_secured() - var/ext_closed = check_exterior_door_secured() - var/int_closed = check_interior_door_secured() - return (ext_closed && int_closed) /datum/computer/file/embedded_program/airlock/proc/signalDoor(var/tag, var/command) var/datum/signal/signal = new @@ -332,22 +200,14 @@ ) post_signal(signal) -//this is called to set the appropriate door state at the end of a cycling process, or for the exterior buttons -/datum/computer/file/embedded_program/airlock/proc/cycleDoors(var/target) - switch(target) - if(TARGET_OUTOPEN) - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "close") - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open") - - if(TARGET_INOPEN) - toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "close") - toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") - if(TARGET_NONE) - var/command = "unlock" - if(memory["secure"]) - command = "lock" - signalDoor(tag_exterior_door, command) - signalDoor(tag_interior_door, command) +/datum/computer/file/embedded_program/airlock/proc/signalScrubber(var/tag, var/power) + var/datum/signal/signal = new + signal.data = list( + "tag" = tag, + "sigtype" = "command", + "power" = "[power]", + ) + post_signal(signal) /datum/computer/file/embedded_program/airlock/proc/signal_mech_sensor(command, sensor) var/datum/signal/signal = new @@ -363,6 +223,16 @@ signal_mech_sensor("disable", tag_shuttle_mech_sensor) signal_mech_sensor("disable", tag_airlock_mech_sensor) +/datum/computer/file/embedded_program/airlock/proc/stop_everything() + signalPump(tag_airpump, 0, 1, memory["target_pressure"])//Stop the pumps + state = STATE_UNDEFINED + memory["processing"] = FALSE + +/datum/computer/file/embedded_program/airlock/proc/delta_check(var/to_check, var/target_value, var/delta) + return (abs(to_check - target_value) <= delta) + +/datum/computer/file/embedded_program/airlock/proc/fuzzy_smaller_check(var/to_check, var/target_value, var/fuzz = 0.1) + return (to_check < (target_value - fuzz)) /*---------------------------------------------------------- toggleDoor() @@ -416,12 +286,46 @@ send an additional command to open the door again. if(doorCommand) signalDoor(doorTag, doorCommand) -#undef SKIPCYCLE_MARGIN - -#undef STATE_IDLE -#undef STATE_DEPRESSURIZE -#undef STATE_PRESSURIZE +/datum/computer/file/embedded_program/airlock/access_controll/process() + switch(state) + if(STATE_OPEN_OUT) + return 1 + if(STATE_OPEN_IN) + return 1 + if(STATE_CLOSED) + return 1 + if(STATE_BYPASS) + return 1 + if(STATE_CYCLING_IN) + if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + else + toggleDoor(memory["interior_status"],tag_interior_door, 1, "open") + state = STATE_OPEN_IN + memory["processing"] = FALSE + if(STATE_CYCLING_OUT) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + else + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "open") + signalPump(tag_airpump, 0, 1, memory["external_sensor_pressure"])//Turn the pump off + state = STATE_OPEN_OUT + memory["processing"] = FALSE + if(STATE_SEALING) + if(memory["interior_status"]["state"] == "open") + toggleDoor(memory["interior_status"],tag_interior_door, 1, "close") + memory["processing"] = TRUE + else if(memory["exterior_status"]["state"] == "open") + toggleDoor(memory["exterior_status"],tag_exterior_door, 1, "close") + memory["processing"] = TRUE + else + state = STATE_CLOSED + memory["processing"] = FALSE + if(STATE_BYPASSING) + signalDoor(tag_interior_door, "unlock") + signalDoor(tag_exterior_door, "unlock") + state = STATE_BYPASS -#undef TARGET_NONE -#undef TARGET_INOPEN -#undef TARGET_OUTOPEN + else + state = STATE_UNDEFINED + return 1 diff --git a/code/game/machinery/embedded_controller/docking_program_multi.dm b/code/game/machinery/embedded_controller/docking_program_multi.dm index a4ad7d2985..56f4b1b48c 100644 --- a/code/game/machinery/embedded_controller/docking_program_multi.dm +++ b/code/game/machinery/embedded_controller/docking_program_multi.dm @@ -159,14 +159,15 @@ response_sent = 0 if (!override_enabled) - begin_cycle_in() + return + //begin_cycle_in() if ("prepare_for_undocking") docking_mode = 1 response_sent = 0 if (!override_enabled) - stop_cycling() + //stop_cycling() close_doors() disable_mech_regulation() @@ -195,21 +196,18 @@ //checks if we are ready for docking /datum/computer/file/embedded_program/airlock/multi_docking/proc/ready_for_docking() - return done_cycling() + return 0 //checks if we are ready for undocking /datum/computer/file/embedded_program/airlock/multi_docking/proc/ready_for_undocking() - var/ext_closed = check_exterior_door_secured() - var/int_closed = check_interior_door_secured() - return (ext_closed || int_closed) + return 0 /datum/computer/file/embedded_program/airlock/multi_docking/proc/open_doors() toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open") -/datum/computer/file/embedded_program/airlock/multi_docking/cycleDoors(var/target) - if (!docking_enabled|| override_enabled) //only allow the port to be used as an airlock if nothing is docked here or the override is enabled - ..(target) +/datum/computer/file/embedded_program/airlock/multi_docking/proc/cycleDoors(var/target) + return 0 /datum/computer/file/embedded_program/airlock/multi_docking/proc/send_signal_to_master(var/command) var/datum/signal/signal = new diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 49b686f3c8..5cc1846c54 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -30,7 +30,7 @@ . = ..() stack_trace("WARNING: Embedded controller [src] ([type]) had Topic() called unexpectedly. Please report this.") -/obj/machinery/embedded_controller/ui_act(action, params) +/obj/machinery/embedded_controller/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(LAZYLEN(valid_actions)) diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm index 8d9e165d19..008e940a45 100644 --- a/code/game/machinery/embedded_controller/mapping_helpers.dm +++ b/code/game/machinery/embedded_controller/mapping_helpers.dm @@ -133,7 +133,11 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 icon_state = "pumpdout" tag_addon = "_pump_out_external" - +/obj/map_helper/airlock/atmos/scrubber + name = "chamber scrubber" + my_device_type = /obj/machinery/atmospherics/component/unary/vent_scrubber + icon_state = "scrubber" + tag_addon = "_scrubber" /* Sensors - did you know they function as buttons? You don't also need a button. */ @@ -155,7 +159,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 name = "exterior sensor" icon_state = "sensout" tag_addon = "_exterior_sensor" - command = "cycle_exterior" + command = "cycle_ext" /obj/map_helper/airlock/sensor/chamber_sensor name = "chamber sensor" @@ -167,7 +171,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 name = "interior sensor" icon_state = "sensin" tag_addon = "_interior_sensor" - command = "cycle_interior" + command = "cycle_int" /* Buttons diff --git a/code/game/machinery/embedded_controller/simple_docking_controller.dm b/code/game/machinery/embedded_controller/simple_docking_controller.dm index eebdc9ea48..82a756b617 100644 --- a/code/game/machinery/embedded_controller/simple_docking_controller.dm +++ b/code/game/machinery/embedded_controller/simple_docking_controller.dm @@ -5,7 +5,7 @@ var/tag_door valid_actions = list("force_door", "toggle_override") -/obj/machinery/embedded_controller/radio/simple_docking_controller/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/simple_docking_controller/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/simple/docking_program = program // Cast to proper type . = list( diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index 6671564f50..fb6c5c49b8 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_EMPTY(exonet_nodes) // Proc: ui_data() // Parameters: 1 (user - the person using the interface) // Description: Allows the user to turn the machine on or off, or open or close certain 'ports' for things like external PDA messages, newscasters, etc. -/obj/machinery/exonet_node/ui_data(mob/user) +/obj/machinery/exonet_node/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/list/data = list() @@ -133,7 +133,7 @@ GLOBAL_LIST_EMPTY(exonet_nodes) // Proc: ui_act() // Parameters: 2 (standard ui_act arguments) // Description: Responds to button presses on the TGUI interface. -/obj/machinery/exonet_node/ui_act(action, params) +/obj/machinery/exonet_node/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 4e7298ec91..4208f449d7 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -1,7 +1,8 @@ /* FIRE ALARM */ -/obj/machinery/firealarm +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/fire_alarm, 21) +/obj/machinery/fire_alarm name = "fire alarm" desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever." icon = 'icons/obj/firealarm.dmi' @@ -25,36 +26,21 @@ FIRE ALARM /// If the alarms from this machine are visible on consoles. var/alarms_hidden = FALSE -/obj/machinery/firealarm/alarms_hidden +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/fire_alarm/alarms_hidden, 21) +/obj/machinery/fire_alarm/alarms_hidden alarms_hidden = TRUE -/obj/machinery/firealarm/preloading_dir(datum/map_preloader/preloader) +/obj/machinery/fire_alarm/preloading_dir(datum/map_preloader/preloader) dir = turn(dir, -preloader.turn_angle) return FALSE -/obj/machinery/firealarm/north - dir = NORTH - pixel_y = -21 - -/obj/machinery/firealarm/south - dir = SOUTH - pixel_y = 21 - -/obj/machinery/firealarm/east - dir = EAST - pixel_x = 21 - -/obj/machinery/firealarm/west - dir = WEST - pixel_x = -21 - -/obj/machinery/firealarm/Initialize(mapload) +/obj/machinery/fire_alarm/Initialize(mapload) . = ..() if(z in (LEGACY_MAP_DATUM).contact_levels) set_security_level(GLOB.security_level ? get_security_level() : "green") setDir(dir) -/obj/machinery/firealarm/setDir(ndir) +/obj/machinery/fire_alarm/setDir(ndir) . = ..() base_pixel_x = 0 base_pixel_y = 0 @@ -64,12 +50,12 @@ FIRE ALARM if(SOUTH) base_pixel_y = 21 if(WEST) - base_pixel_x = -21 - if(EAST) base_pixel_x = 21 + if(EAST) + base_pixel_x = -21 reset_pixel_offsets() -/obj/machinery/firealarm/update_icon() +/obj/machinery/fire_alarm/update_icon() cut_overlays() add_overlay("casing") @@ -130,24 +116,24 @@ FIRE ALARM add_overlay(alarm_img2) set_light(l_range = 4, l_power = 0.9, l_color = "#FF6633") -/obj/machinery/firealarm/fire_act(datum/gas_mixture/air, temperature, volume) +/obj/machinery/fire_alarm/fire_act(datum/gas_mixture/air, temperature, volume) if(detecting) if(temperature > T0C + 200) alarm() // added check of detector status here return -/obj/machinery/firealarm/attack_ai(mob/user) +/obj/machinery/fire_alarm/attack_ai(mob/user) return attack_hand(user) -/obj/machinery/firealarm/bullet_act() +/obj/machinery/fire_alarm/bullet_act() return alarm() -/obj/machinery/firealarm/emp_act(severity) +/obj/machinery/fire_alarm/emp_act(severity) if(prob(50 / severity)) alarm(rand(30 / severity, 60 / severity)) ..() -/obj/machinery/firealarm/attackby(obj/item/W, mob/user) +/obj/machinery/fire_alarm/attackby(obj/item/W, mob/user) add_fingerprint(user) if(alarm_deconstruction_screwdriver(user, W)) @@ -171,7 +157,7 @@ FIRE ALARM alarm() return -/obj/machinery/firealarm/process()//Note: this processing was mostly phased out due to other code, and only runs when needed +/obj/machinery/fire_alarm/process()//Note: this processing was mostly phased out due to other code, and only runs when needed if(machine_stat & (NOPOWER|BROKEN)) return @@ -191,12 +177,12 @@ FIRE ALARM return -/obj/machinery/firealarm/power_change() +/obj/machinery/fire_alarm/power_change() ..() spawn(rand(0,15)) update_icon() -/obj/machinery/firealarm/attack_hand(mob/user, list/params) +/obj/machinery/fire_alarm/attack_hand(mob/user, list/params) if(user.stat || machine_stat & (NOPOWER | BROKEN)) return @@ -237,7 +223,7 @@ FIRE ALARM onclose(user, "firealarm") return -/obj/machinery/firealarm/Topic(href, href_list) +/obj/machinery/fire_alarm/Topic(href, href_list) ..() if(usr.stat || machine_stat & (BROKEN | NOPOWER)) return @@ -265,26 +251,26 @@ FIRE ALARM return return -/obj/machinery/firealarm/proc/reset() +/obj/machinery/fire_alarm/proc/reset() if(!(working)) return var/area/area = get_area(src) - for(var/obj/machinery/firealarm/FA in area) + for(var/obj/machinery/fire_alarm/FA in area) fire_alarm.clearAlarm(src.loc, FA) update_icon() return -/obj/machinery/firealarm/proc/alarm(var/duration = 0) +/obj/machinery/fire_alarm/proc/alarm(var/duration = 0) if(!(working)) return var/area/area = get_area(src) - for(var/obj/machinery/firealarm/FA in area) + for(var/obj/machinery/fire_alarm/FA in area) fire_alarm.triggerAlarm(loc, FA, duration, hidden = alarms_hidden) update_icon() playsound(src.loc, 'sound/machines/airalarm.ogg', 25, 0, 4) return -/obj/machinery/firealarm/proc/set_security_level(var/newlevel) +/obj/machinery/fire_alarm/proc/set_security_level(var/newlevel) if(seclevel != newlevel) seclevel = newlevel update_icon() diff --git a/code/game/machinery/floor_inflatables.dm b/code/game/machinery/floor_inflatables.dm new file mode 100644 index 0000000000..d755ec044b --- /dev/null +++ b/code/game/machinery/floor_inflatables.dm @@ -0,0 +1,54 @@ +/** + * A compartment in the floor for storing an inflatable wall, which is automatically deployed when air alarms trigger + */ + +/obj/machinery/floor_inflatables + name = "floor mounted inflatables" + icon = 'icons/obj/doors/hazard/floor_inflatables.dmi' + icon_state = "setup" + density = 0 + opacity = 0 + var/obj/item/inflatable/stored + +/obj/machinery/floor_inflatables/Initialize(mapload) + . = ..() + stored = new(src) + var/area/A = get_area(src) + ASSERT(istype(A)) + LAZYADD(A.all_doors, src) + update_icon() + +/obj/machinery/floor_inflatables/update_icon(updates) + . = ..() + if(stored) + icon_state = "setup" + else + icon_state = "deployed" + +/obj/machinery/floor_inflatables/proc/trigger() + if(!stored) + return + if(istype(stored)) + stored.inflate(location = get_turf(src)) + else + stored.forceMove(get_turf(src)) + stored = null + update_icon() + +/obj/machinery/floor_inflatables/attackby(obj/item/C as obj, mob/user as mob) + add_fingerprint(user, 0, C) + add_fingerprint(user, 0, src) + if(istype(C)) + if(C.w_class <= ITEMSIZE_NORMAL) + C.forceMove(src) + stored = C + to_chat(user, "You slide [C] into the compartment and close it.") + update_icon() + else + to_chat(user, "[C] is to large for [src]") + +/obj/machinery/floor_inflatables/attack_hand(mob/user, list/params) + . = ..() + var/confirm = input(user, "Do you want to trigger [src]'s deployment?","Trigger Floormount") as null|anything in list("Yes","No") + if(confirm && confirm == "Yes") + trigger() diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index b9c0494b8b..510b838e49 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -178,6 +178,8 @@ var/list/floor_light_cache = list() name = "changing floor light" /obj/machinery/floor_light/changing/process(delta_time) + if(!on) + return . = ..() update_color() @@ -205,4 +207,5 @@ var/list/floor_light_cache = list() /obj/machinery/floor_light/changing/prebuilt anchored = TRUE + on = FALSE diff --git a/code/game/machinery/holopad.dm b/code/game/machinery/holopad.dm index 2c33429ea9..0209055dcd 100644 --- a/code/game/machinery/holopad.dm +++ b/code/game/machinery/holopad.dm @@ -447,7 +447,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) ui = new(user, src, "Holopad") ui.open() -/obj/machinery/holopad/ui_static_data(mob/user) +/obj/machinery/holopad/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["connectivity"] = ui_connectivity_data() .["isAI"] = isAI(user) @@ -462,7 +462,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) .["ringerToggle"] = ringer_toggleable .["autoToggle"] = call_auto_toggle -/obj/machinery/holopad/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/holopad/ui_data(mob/user, datum/tgui/ui) . = ..() .["isAIProjecting"] = isAI(user) && is_ai_projecting(user) .["aiRequested"] = !request_ai_cooldown() @@ -477,7 +477,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) ringing[++ringing.len] = holocall.ui_caller_id_source() .["ringing"] = ringing -/obj/machinery/holopad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/holopad/ui_act(action, list/params, datum/tgui/ui) . = ..() switch(action) // user requesting ai @@ -583,7 +583,7 @@ GLOBAL_VAR_INIT(holopad_connectivity_rebuild_queued, FALSE) outgoing_call.cleanup_remote_presence() return TRUE -/obj/machinery/holopad/ui_close(mob/user) +/obj/machinery/holopad/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() // if they were remoting, kick 'em - they do get buttons on top left but // we want to enforce interface being open. diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 95cafc6124..023687111b 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -48,7 +48,7 @@ ui = new(user, src, "IVDrip", name) ui.open() -/obj/machinery/iv_drip/ui_data(mob/user) +/obj/machinery/iv_drip/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["transferRate"] = transfer_rate data["maxInjectRate"] = MAX_IV_TRANSFER_RATE @@ -58,7 +58,7 @@ data["beakerAttached"] = reagent_container ? TRUE : FALSE return data -/obj/machinery/iv_drip/ui_act(action, params) +/obj/machinery/iv_drip/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -182,7 +182,11 @@ to_chat(attached_victim, SPAN_USERDANGER("The IV drip needle is ripped out of you, leaving an open bleeding wound!")) var/list/arm_zones = shuffle(list(BP_R_ARM, BP_L_ARM)) var/obj/item/organ/external/chosen_limb = attached_victim.get_organ(arm_zones[1]) || attached_victim.get_organ(arm_zones[2]) || attached_victim.get_organ(BP_TORSO) - chosen_limb.take_damage(3) + chosen_limb.inflict_bodypart_damage( + brute = 3, + damage_mode = DAMAGE_MODE_SHARP, + weapon_descriptor = "a needle", + ) chosen_limb.create_wound(CUT, 5) detach_iv() return PROCESS_KILL diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 73ba949f33..25758ac5be 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -159,7 +159,7 @@ if (panel_open) add_overlay("panel_open") -/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui, datum/tgui_module/module) +/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -211,7 +211,7 @@ return ui_interact(user) -/obj/machinery/media/jukebox/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/media/jukebox/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["playing"] = playing @@ -240,7 +240,7 @@ ui = new(user, src, "Jukebox", "RetroBox - Space Style") ui.open() -/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/media/jukebox/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/lathes/lathe.dm b/code/game/machinery/lathes/lathe.dm index 458d959da6..df2a42c9ed 100644 --- a/code/game/machinery/lathes/lathe.dm +++ b/code/game/machinery/lathes/lathe.dm @@ -579,7 +579,7 @@ /// items to use for design - order matters! uses weakref's. var/list/ingredient_parts -/datum/lathe_queue_entry/ui_data() +/datum/lathe_queue_entry/ui_data(mob/user, datum/tgui/ui) return list( "design" = design_id, "amount" = amount, diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 7c055ad255..d9adc6922e 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -27,7 +27,7 @@ ui = new(user, src, "PipeDispenser", name) ui.open() -/obj/machinery/pipedispenser/ui_data(mob/user) +/obj/machinery/pipedispenser/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "disposals" = disposals, "p_layer" = p_layer, @@ -59,7 +59,7 @@ return data -/obj/machinery/pipedispenser/ui_act(action, params) +/obj/machinery/pipedispenser/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index 2c4c8a0b3c..4d71af4a61 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) PD.Deactivate() return TRUE -/obj/machinery/pointdefense_control/ui_data(mob/user) +/obj/machinery/pointdefense_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["id"] = id_tag var/list/turrets = list() diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index 10cc8d9a8c..ed8a64779b 100644 --- a/code/game/machinery/suit_storage/suit_cycler.dm +++ b/code/game/machinery/suit_storage/suit_cycler.dm @@ -410,9 +410,9 @@ if(prob(radiation_level*2)) occupant.emote("scream") if(radiation_level > 2) - occupant.take_organ_damage(0,radiation_level*2 + rand(1,3)) + occupant.take_random_targeted_damage(0,radiation_level*2 + rand(1,3)) if(radiation_level > 1) - occupant.take_organ_damage(0,radiation_level + rand(1,3)) + occupant.take_random_targeted_damage(0,radiation_level + rand(1,3)) occupant.apply_effect(radiation_level * 200, IRRADIATE) /obj/machinery/suit_cycler/proc/finished_job() diff --git a/code/game/machinery/suit_storage/suit_storage_unit.dm b/code/game/machinery/suit_storage/suit_storage_unit.dm index 5546eeb3de..d856bbafe9 100644 --- a/code/game/machinery/suit_storage/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage/suit_storage_unit.dm @@ -87,7 +87,7 @@ return 0 ui_interact(user) -/obj/machinery/suit_storage_unit/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/suit_storage_unit/ui_state() return GLOB.notcontained_state /obj/machinery/suit_storage_unit/ui_interact(mob/user, datum/tgui/ui) @@ -96,7 +96,7 @@ ui = new(user, src, "SuitStorageUnit", name) ui.open() -/obj/machinery/suit_storage_unit/ui_data() +/obj/machinery/suit_storage_unit/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["broken"] = isbroken @@ -130,7 +130,7 @@ data["occupied"] = FALSE return data -/obj/machinery/suit_storage_unit/ui_act(action, params) //I fucking HATE this proc +/obj/machinery/suit_storage_unit/ui_act(action, list/params, datum/tgui/ui) if(..() || isUV || isbroken) return TRUE @@ -320,10 +320,10 @@ occupant.emote("scream") if(issuperUV) var/burndamage = rand(28,35) - occupant.take_organ_damage(0,burndamage) + occupant.take_random_targeted_damage(brute = 0, brute = burndamage) else var/burndamage = rand(6,10) - occupant.take_organ_damage(0,burndamage) + occupant.take_random_targeted_damage(brute = 0, brute = burndamage) if(i==3) //End of the cycle if(!issuperUV) if(helmet_stored) @@ -369,10 +369,10 @@ spawn(50) if(occupant) if(issuperUV) - occupant.take_organ_damage(0,40) + occupant.take_random_targeted_damage(brute = 0, burn = 40) to_chat(user, "Test. You gave him 40 damage") else - occupant.take_organ_damage(0,8) + occupant.take_random_targeted_damage(brute = 0, burn = 8) to_chat(user, "Test. You gave him 8 damage") return*/ diff --git a/code/game/machinery/telecomms/_telecomms.dm b/code/game/machinery/telecomms/_telecomms.dm index 6742110c24..7c9f141ca3 100644 --- a/code/game/machinery/telecomms/_telecomms.dm +++ b/code/game/machinery/telecomms/_telecomms.dm @@ -305,7 +305,7 @@ /obj/machinery/telecomms/attack_ai(var/mob/user as mob) attack_hand(user) -/obj/machinery/telecomms/ui_data(mob/user) +/obj/machinery/telecomms/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["temp"] = temp @@ -357,7 +357,7 @@ return data -/obj/machinery/telecomms/ui_status(mob/user) +/obj/machinery/telecomms/ui_status(mob/user, datum/ui_state/state) if(!issilicon(user)) if(!istype(user.get_active_held_item(), /obj/item/multitool)) return UI_CLOSE @@ -539,7 +539,7 @@ overmap_range = clamp(new_range, overmap_range_min, overmap_range_max) update_idle_power_usage(initial(idle_power_usage)**(overmap_range+1)) -/obj/machinery/telecomms/ui_act(action, params) +/obj/machinery/telecomms/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index deb1bc024e..c1c33182ca 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -18,7 +18,7 @@ req_access = list(ACCESS_ENGINEERING_TELECOMMS) -/obj/machinery/computer/telecomms/server/ui_data(mob/user) +/obj/machinery/computer/telecomms/server/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["universal_translate"] = universal_translate @@ -73,7 +73,7 @@ ui = new(user, src, "TelecommsLogBrowser", name) ui.open() -/obj/machinery/computer/telecomms/server/ui_act(action, params) +/obj/machinery/computer/telecomms/server/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index f23e06aab2..3538ddd6d0 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -20,7 +20,7 @@ var/list/temp = null // temporary feedback messages -/obj/machinery/computer/telecomms/monitor/ui_data(mob/user) +/obj/machinery/computer/telecomms/monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["network"] = network @@ -61,7 +61,7 @@ ui = new(user, src, "TelecommsMachineBrowser", name) ui.open() -/obj/machinery/computer/telecomms/monitor/ui_act(action, params) +/obj/machinery/computer/telecomms/monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/machinery/teleporter/console.dm b/code/game/machinery/teleporter/console.dm index 1f57687b2a..6b5a96a447 100644 --- a/code/game/machinery/teleporter/console.dm +++ b/code/game/machinery/teleporter/console.dm @@ -95,7 +95,7 @@ ui = new(user, src, "TeleporterConsole", name) // 500, 800 ui.open() -/obj/machinery/computer/teleporter/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/teleporter/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["disabled"] = is_disabled() diff --git a/code/game/machinery/turnstile.dm b/code/game/machinery/turnstile.dm index 4b5b83eaec..a520d926c4 100644 --- a/code/game/machinery/turnstile.dm +++ b/code/game/machinery/turnstile.dm @@ -88,8 +88,8 @@ /obj/machinery/turnstile/entry name = "\improper Entrance" - req_one_access = 111 + req_one_access = list(111) /obj/machinery/turnstile/exit name = "\improper Exit" - req_one_access = 112 + req_one_access = list(112) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index b5605ff003..95484cd260 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -65,9 +65,13 @@ switch(damtype) if("brute") H.afflict_unconscious(20 * 1) - update |= temp.take_damage(rand(force/2, force), 0) + temp.inflict_bodypart_damage( + brute = rand(force / 2, force), + ) if("fire") - update |= temp.take_damage(0, rand(force/2, force)) + temp.inflict_bodypart_damage( + burn = rand(force / 2, force), + ) if("tox") if(H.reagents) if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) diff --git a/code/game/mecha/equipment/tools/armor_ranged.dm b/code/game/mecha/equipment/tools/armor_ranged.dm index caae1a42ff..2167fe13b6 100644 --- a/code/game/mecha/equipment/tools/armor_ranged.dm +++ b/code/game/mecha/equipment/tools/armor_ranged.dm @@ -97,7 +97,7 @@ chassis.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) var/mob/living/M = A - M.take_organ_damage(10) + M.take_random_targeted_damage(brute = 10) else if(istype(A, /obj)) var/obj/O = A if(O.throw_force) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 33c486e549..f320235f3a 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -84,7 +84,7 @@ S.icon_state = initial(S.icon_state) S.icon = initial(S.icon) S.reagents.trans_to_mob(M, S.reagents.total_volume, CHEM_INJECT) - M.take_organ_damage(2) + M.take_random_targeted_damage(brute = 2) S.visible_message(" [M] was hit by the syringe!") break else if(S.loc == trg) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d2f0957b91..8d2e3af026 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -496,7 +496,7 @@ ui = new(user, src, "ExosuitFabricator", name) ui.open() -/obj/machinery/mecha_part_fabricator/ui_static_data(mob/user) +/obj/machinery/mecha_part_fabricator/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/final_sets = list() @@ -533,7 +533,7 @@ return data -/obj/machinery/mecha_part_fabricator/ui_data(mob/user) +/obj/machinery/mecha_part_fabricator/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["materials"] = output_available_resources() @@ -559,7 +559,7 @@ return data -/obj/machinery/mecha_part_fabricator/ui_act(action, var/list/params) +/obj/machinery/mecha_part_fabricator/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index c9c2814e83..a8fd686c0b 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -79,7 +79,7 @@ for(var/i in I.materials_base) I.materials_base[i] = I.materials_base[i] * component_coeff -/obj/machinery/mecha_part_fabricator/pros/ui_data(mob/user) +/obj/machinery/mecha_part_fabricator/pros/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["species_types"] = species_types diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9b1550bda1..fc65bdce15 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1087,7 +1087,7 @@ src.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) var/mob/living/M = A - M.take_organ_damage(10) + M.take_random_targeted_damage(brute = 10) else if(istype(A, /obj)) var/obj/O = A if(O.throw_force) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 5c807d5fe5..cd4f58454e 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -24,7 +24,7 @@ ui = new(user, src, "MechaControlConsole", name) ui.open() -/obj/machinery/computer/mecha/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/mecha/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["beacons"] = list() @@ -75,7 +75,7 @@ icon_state = "motion2" origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 2) -/obj/item/mecha_parts/mecha_tracking/ui_data(mob/user) +/obj/item/mecha_parts/mecha_tracking/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(!in_mecha()) return FALSE diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index d9e6cc2c52..d2f478a8b8 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -51,9 +51,13 @@ var/update = 0 switch(damtype) if("brute") - update |= temp.take_damage(rand(force/2, force), 0) + temp.inflict_bodypart_damage( + brute = rand(force / 2, force), + ) if("fire") - update |= temp.take_damage(0, rand(force/2, force)) + temp.inflict_bodypart_damage( + burn = rand(force / 2, force), + ) if("tox") if(H.reagents) if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 826773e9c3..785f046735 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -29,10 +29,7 @@ /obj/mecha/working/ripley/Destroy() for(var/atom/movable/A in src.cargo) - A.loc = loc - var/turf/T = loc - if(istype(T)) - T.Entered(A) + A.forceMove(loc) step_rand(A) cargo.Cut() ..() diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm index 51d9759c1f..1313166d56 100644 --- a/code/game/mecha/working/working.dm +++ b/code/game/mecha/working/working.dm @@ -12,52 +12,5 @@ if(isPlayerLevel(T.z)) new /obj/item/mecha_parts/mecha_tracking(src) -/* This stuff has been generalized! -/obj/mecha/working/Destroy() - for(var/mob/M in src) - if(M==src.occupant) - continue - M.loc = get_turf(src) - M.loc.Entered(M) - step_rand(M) - for(var/atom/movable/A in src.cargo) - A.loc = get_turf(src) - var/turf/T = get_turf(A) - if(T) - T.Entered(A) - step_rand(A) - ..() - return - -/obj/mecha/working/Topic(href, href_list) - ..() - if(href_list["drop_from_cargo"]) - var/obj/O = locate(href_list["drop_from_cargo"]) - if(O && O in src.cargo) - src.occupant_message("You unload [O].") - O.loc = get_turf(src) - src.cargo -= O - var/turf/T = get_turf(O) - if(T) - T.Entered(O) - src.log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]") - return - -/obj/mecha/working/Exit(atom/movable/O) - if(O in cargo) - return 0 - return ..() - -/obj/mecha/working/get_stats_part() - var/output = ..() - output += "Cargo Compartment Contents:
" - if(src.cargo.len) - for(var/obj/O in src.cargo) - output += "Unload : [O]
" - else - output += "Nothing" - output += "
" - return output -*/ /obj/mecha/working/range_action(atom/target as obj|mob|turf) return diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index ef76cea481..557cd497a5 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -152,7 +152,7 @@ // todo: remove this shit if(QDELETED(src)) return - loc = exit_vent + forceMove(exit_vent) var/travel_time = round(get_dist(loc, exit_vent.loc) / 2) spawn(travel_time) // todo: remove this shit @@ -160,7 +160,7 @@ return if(!exit_vent || exit_vent.welded) - loc = entry_vent + forceMove(entry_vent) entry_vent = null return @@ -172,10 +172,10 @@ return if(!exit_vent || exit_vent.welded) - loc = entry_vent + forceMove(entry_vent) entry_vent = null return - loc = exit_vent.loc + forceMove(exit_vent) entry_vent = null var/area/new_area = get_area(loc) if(new_area) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index eefe23344e..a83d190cef 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -22,6 +22,12 @@ /// flags for the bodyparts this item covers when worn. /// These flags are listed in [code/__DEFINES/inventory/item_flags.dm]. var/body_cover_flags = NONE + /// Flags which determine which body parts are protected from heat. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm + /// These flags are listed in [code/__DEFINES/inventory/item_flags.dm]. + var/heat_protection_cover = NONE + /// Flags which determine which body parts are protected from cold. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm + /// These flags are listed in [code/__DEFINES/inventory/item_flags.dm]. + var/cold_protection_cover = NONE /// This is used to determine on which slots an item can fit, for inventory slots that use flags to determine this. /// These flags are listed in [code/__DEFINES/inventory/slots.dm]. var/slot_flags = NONE @@ -86,10 +92,6 @@ */ var/list/attack_verb = "attacked" - /// Flags which determine which body parts are protected from heat. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm - var/heat_protection = 0 - /// Flags which determine which body parts are protected from cold. Use the HEAD, UPPER_TORSO, LOWER_TORSO, etc. flags. See setup.dm - var/cold_protection = 0 /// Set this variable to determine up to which temperature (IN KELVIN) the item protects against heat damage. Keep at null to disable protection. Only protects areas set by heat_protection flags. var/max_heat_protection_temperature /// Set this variable to determine down to which temperature (IN KELVIN) the item protects against cold damage. 0 is NOT an acceptable number due to if(varname) tests!! Keep at null to disable protection. Only protects areas set by cold_protection flags. @@ -243,7 +245,6 @@ var/turf/T = src.loc src.loc = null - src.loc = T /// See inventory_sizes.dm for the defines. @@ -486,7 +487,7 @@ else playsound(src, drop_sound, 30, preference = /datum/client_preference/drop_sounds) -/obj/item/throw_landed(atom/movable/AM, datum/thrownthing/TT) +/obj/item/throw_land(atom/A, datum/thrownthing/TT) . = ..() if(TT.throw_flags & THROW_AT_IS_NEAT) return @@ -628,10 +629,11 @@ if(M.stat != 2) to_chat(M, "You go blind!") var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD) - if(affecting.take_damage(7)) - M:UpdateDamageIcon() + affecting.inflict_bodypart_damage( + brute = 7, + ) else - M.take_organ_damage(7) + M.take_random_targeted_damage(brute = 7) M.eye_blurry += rand(3,4) return diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e643bfba9b..fcf428d6f4 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -970,7 +970,7 @@ GLOBAL_LIST_EMPTY(PDAs) if("2") // Eject pAI device var/turf/T = get_turf_or_move(src.loc) if(T) - pai.loc = T + pai.forceMove(T) pai = null else @@ -1084,7 +1084,7 @@ GLOBAL_LIST_EMPTY(PDAs) M.put_in_hands(O) to_chat(usr, "You remove \the [O] from \the [src].") return - O.loc = get_turf(src) + O.forceMove(get_turf(src)) else to_chat(usr, "This PDA does not have a pen in it.") diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 3078364962..cb25a42365 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -101,7 +101,7 @@ icon_state = new_iconstate overlays = new_overlays setDir(O.dir) - M.loc = src + M.forceMove(src) master = C master.active_dummy = src diff --git a/code/game/objects/items/devices/communicator/UI_tgui.dm b/code/game/objects/items/devices/communicator/UI_tgui.dm index 365a1af802..60aaeb2f05 100644 --- a/code/game/objects/items/devices/communicator/UI_tgui.dm +++ b/code/game/objects/items/devices/communicator/UI_tgui.dm @@ -83,7 +83,7 @@ // Proc: ui_state() // Parameters: User // Description: This tells TGUI to only allow us to be interacted with while in a mob inventory. -/obj/item/communicator/ui_state(mob/user, datum/tgui_module/module) +/obj/item/communicator/ui_state() return GLOB.inventory_state // Proc: ui_interact() @@ -108,7 +108,7 @@ if(custom_state) // Just in case ui.set_state(custom_state) -/obj/item/communicator/ui_close(mob/user, datum/tgui_module/module) +/obj/item/communicator/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(isnull(user.client)) return // what??? @@ -118,7 +118,7 @@ // Proc: ui_data() // Parameters: User, UI, State // Description: Uses a bunch of for loops to turn lists into lists of lists, so they can be displayed in nanoUI, then displays various buttons to the user. -/obj/item/communicator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/communicator/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/list/data = list() //General nanoUI information var/list/communicators = list() //List of communicators @@ -298,7 +298,7 @@ // Proc: ui_static_data() // Parameters: User, UI, State // Description: Just like ui_data, except it only gets called once when the user opens the UI, not every tick. -/obj/item/communicator/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/communicator/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() // Update manifest' if(data_core) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index f8e2648b7c..d3e3cf61ed 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -344,11 +344,11 @@ /obj/item/gps/proc/push_waypoint_data() push_ui_data(data = list("waypoints" = ui_waypoint_data())) -/obj/item/gps/ui_static_data(mob/user) +/obj/item/gps/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["waypoints"] = ui_waypoint_data() -/obj/item/gps/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/gps/ui_data(mob/user, datum/tgui/ui) . = ..() .["on"] = !!on @@ -412,7 +412,7 @@ if(!tag_as) return FALSE var/turf/T = get_turf(src) - add_waypoint(tag_as, text2num(params["x"]) || T.x, text2num(params["y"]) || T.y, params["level_id"] || SSmapping.level_id(T.z)) + add_waypoint(tag_as, text2num(params["x"]) || T.x, text2num(params["y"]) || T.y, params["level_id"] || SSmapping.fluff_level_id(T.z)) return FALSE // add waypoint pushes data already if("del_waypoint") //* RAW LOCATE IN HREF WARNING: RECEIVING PROC WILL SANITY CHECK. diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index e935a0f6b8..48b1e2d8c3 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -292,6 +292,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) setEmotion("null") src.forceMove(get_turf(src)) pai.open_up() + pai.update_action_buttons() /obj/item/paicard/proc/removePersonality() QDEL_NULL(pai) @@ -383,3 +384,45 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) /obj/item/paicard/proc/stop_displaying_hologram() displaying_hologram = FALSE update_icons() + +/// Handling for ghosts going into empty pAI cards +/obj/item/paicard/attack_ghost(mob/user) + . = ..() + + if(src.pai != null) //Have a person in them already? + user.examinate(src) + return + + var/datum/category_item/player_setup_item/player_global/pai/pai_pref = user.client.prefs.preference_by_type[/datum/category_item/player_setup_item/player_global/pai] + var/datum/paiCandidate/prefs = pai_pref?.candidate + var/has_pAI_data = !isnull(prefs) && !isnull(prefs.name) + var/options = (has_pAI_data ? list("Yes (As [prefs.name])") : list()) + list("Yes (Pick Name)", "No") + + var/choice = input(user, "Do you wish to inhabit this PAI?") in options + if(choice == "No" || isnull(choice)) + return + + var/pai_name + var/actual_pai_name + + if(choice == "Yes (Pick Name)") + pai_name = input(user, "Choose your character's name", "Character Name") as text + actual_pai_name = sanitize_species_name(pai_name) + else + actual_pai_name = sanitize_species_name(prefs.name) + + if(isnull(actual_pai_name)) + return + + var/pai_key = user.key + var/turf/location = get_turf(src) + var/obj/item/paicard/card = new(location) + var/mob/living/silicon/pai/pai = new(card) + qdel(src) + + if(choice != "Yes (Pick Name)") + pai.desc = prefs.description + + pai.key = pai_key + card.setPersonality(pai) + pai.SetName(actual_pai_name) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 44487f9ee0..66aeb30156 100755 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -70,7 +70,7 @@ return ..(freq, level) return -1 -/obj/item/radio/headset/ui_state(mob/user, datum/tgui_module/module) +/obj/item/radio/headset/ui_state() return GLOB.inventory_state /obj/item/radio/headset/syndicate @@ -378,7 +378,7 @@ if(keyslot1) var/turf/T = get_turf(user) if(T) - keyslot1.loc = T + keyslot1.forceMove(T) keyslot1 = null @@ -386,7 +386,7 @@ if(keyslot2) var/turf/T = get_turf(user) if(T) - keyslot2.loc = T + keyslot2.forceMove(T) keyslot2 = null recalculateChannels() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index a57119fdb8..c9c6601d44 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -1,3 +1,4 @@ +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/item/radio/intercom, 28) /obj/item/radio/intercom name = "station intercom (General)" desc = "Talk through this." @@ -15,6 +16,21 @@ var/wiresexposed = 0 var/overlay_color = PIPE_COLOR_GREEN +/obj/item/radio/intercom/setDir(ndir) + . = ..() + base_pixel_x = 0 + base_pixel_y = 0 + switch(dir) + if(NORTH) + base_pixel_y = -28 + if(SOUTH) + base_pixel_y = 28 + if(WEST) + base_pixel_x = 28 + if(EAST) + base_pixel_x = -28 + reset_pixel_offsets() + /obj/item/radio/intercom/update_icon(updates) cut_overlays() if(!on) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index d5073ab793..6c688e783a 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( ui = new(user, src, "Radio", name) ui.open() -/obj/item/radio/ui_data(mob/user) +/obj/item/radio/ui_data(mob/user, datum/tgui/ui) var/data[0] data["rawfreq"] = frequency @@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( return data -/obj/item/radio/ui_act(action, params) +/obj/item/radio/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -688,7 +688,7 @@ GLOBAL_DATUM_INIT(virtual_announcer_ai, /mob/living/silicon/ai/announcer, new(nu if(keyslot) var/turf/T = get_turf(user) if(T) - keyslot.loc = T + keyslot.forceMove(T) keyslot = null recalculateChannels() diff --git a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm index 7bc2ef7874..918510e368 100644 --- a/code/game/objects/items/devices/tape_recorder/tape_recorder.dm +++ b/code/game/objects/items/devices/tape_recorder/tape_recorder.dm @@ -168,6 +168,9 @@ if(user && !silent) to_chat(user, SPAN_WARNING("[src] failed to lock the tape for reading.")) return + if(!tape.reel || !length(tape.reel)) + to_chat(user, SPAN_WARNING("[src] has nothing to play!")) + return if(!silent) audible_message("[SPAN_BOLD("[src]")]: Playback started.") playing = TRUE diff --git a/code/game/objects/items/devices/text_to_speech.dm b/code/game/objects/items/devices/text_to_speech.dm index e2b96dd446..25c5f20bfa 100644 --- a/code/game/objects/items/devices/text_to_speech.dm +++ b/code/game/objects/items/devices/text_to_speech.dm @@ -2,39 +2,57 @@ name = "TTS device" desc = "A device that speaks an inputted message. Given to crew which can not speak properly or at all." icon = 'icons/obj/integrated_electronics/electronic_setups.dmi' - icon_state = "setup_small" + icon_state = "setup_small_off" w_class = ITEMSIZE_SMALL var/named + var/activated = FALSE + var/mob/linked_user /obj/item/text_to_speech/attack_self(mob/user) . = ..() if(.) return - if(user.incapacitated(INCAPACITATION_KNOCKDOWN) || user.incapacitated(INCAPACITATION_DISABLED)) // EDIT: We can use the device only if we are not in certain types of incapacitation. We don't want chairs stopping us from texting!! + if(user.incapacitated(INCAPACITATION_STUNNED)) // EDIT: We can use the device only if we are not in certain types of incapacitation. We don't want chairs stopping us from texting!! to_chat(user, "You cannot activate the device in your state.") return - if(!named) - to_chat(user, "You input your name into the device.") - name = "[initial(name)] ([user.real_name])" - desc = "[initial(desc)] This one is assigned to [user.real_name]." - named = 1 - /* //Another way of naming the device. Gives more freedom, but could lead to issues. - device_name = copytext(sanitize(input(user, "What would you like to name your device? You must input a name before the device can be used.", "Name your device", "") as null|text),1,MAX_NAME_LEN) - name = "[initial(name)] - [device_name]" - named = 1 - */ - playsound(src, 'sound/items/tts/started_type.ogg', 25, TRUE) - user.say_overhead("typing...") - var/message = sanitize(input(user,"Choose a message to relay to those around you.") as text|null) - if(message) - var/obj/item/text_to_speech/O = src - audible_message("[icon2html(thing = O, target = world)] \The [O.name] states, \"[message]\"") - user.say_overhead(message, FALSE, MESSAGE_RANGE_COMBAT_LOUD) // I don't like this, I wish I could just invoke what this calls directly! - else - playsound(src, 'sound/items/tts/stopped_type.ogg', 25, TRUE) - user.say_overhead("stopped typing.") + activated = !activated + icon_state = activated ? "setup_small" : "setup_small_off" + + to_chat(user, "You [activated ? "activate" : "deactivate"] the device.") + +/obj/item/text_to_speech/equipped(mob/user, slot, accessory, creation, silent) + link_to_user(user) + . = ..() + +/obj/item/text_to_speech/unequipped(mob/user, slot, flags) + unlink() + . = ..() -/obj/item/text_to_speech/AltClick(mob/user) // QOL Change - attack_self(user) +/obj/item/text_to_speech/proc/link_to_user(mob/user) + linked_user = user + RegisterSignal(user, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + name = "[initial(name)] ([user.real_name])" + desc = "[initial(desc)] This one is assigned to [user.real_name]." + +/obj/item/text_to_speech/proc/unlink() + UnregisterSignal(linked_user, COMSIG_MOB_SAY) + name = initial(name) + desc = initial(desc) + +/obj/item/text_to_speech/proc/handle_speech(datum/source, list/message_args) + if(loc != linked_user) // this should never happen, but it's best to be safe in case an unsafe unequip happens somehow + unlink() + // you can't use TTS if knocked down or otherwise incapacitated + if(linked_user.incapacitated(INCAPACITATION_STUNNED)) + return + + if(activated) + var/message = message_args["message"] + var/whispering = message_args["whispering"] + message_args["cancelled"] = TRUE + audible_message("[icon2html(thing = src, target = world)] \The [name] [whispering ? "quietly states" : "states"], \"[message]\"", null, whispering ? 2 : world.view) + if(!whispering) + linked_user.say_overhead(message, FALSE, MESSAGE_RANGE_COMBAT_LOUD) + playsound(src, 'sound/items/tts/stopped_type.ogg', 25, TRUE) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 47b3a19302..8363b56abb 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -76,7 +76,7 @@ return ui_interact(user) -/obj/item/transfer_valve/ui_state(mob/user, datum/tgui_module/module) +/obj/item/transfer_valve/ui_state() return GLOB.inventory_state /obj/item/transfer_valve/ui_interact(mob/user, datum/tgui/ui = null) @@ -85,7 +85,7 @@ ui = new(user, src, "TransferValve", name) // 460, 320 ui.open() -/obj/item/transfer_valve/ui_data(mob/user) +/obj/item/transfer_valve/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["tank_one"] = tank_one ? tank_one.name : null data["tank_two"] = tank_two ? tank_two.name : null @@ -93,7 +93,7 @@ data["valve"] = valve_open return data -/obj/item/transfer_valve/ui_act(action, params) +/obj/item/transfer_valve/ui_act(action, list/params, datum/tgui/ui) if(..()) return . = TRUE diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 36453b49ad..ac04f62cef 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -48,21 +48,21 @@ switch(contains) if(1) for(var/obj/O in src) - O.loc = user.loc + O.forceMove(user.loc) to_chat(user, "You take money out of \the [src].") contains = 0 update_icon() return if(2) for(var/mob/M in src) - M.loc = user.loc + M.forceMove(user.loc) user.visible_message("[user] releases [M] from \the [src].", "You release [M] from \the [src].") contains = 0 update_icon() return if(3) for(var/obj/effect/spider/spiderling/S in src) - S.loc = user.loc + S.forceMove(user.loc) user.visible_message("[user] releases [S] from \the [src].", "You release [S] from \the [src].") START_PROCESSING(SSobj, S) // They can grow after being let out though contains = 0 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index ef7c24a640..ee5ea49454 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -211,8 +211,8 @@ O.add_language(L.name) O.job = "Cyborg" O.cell = chest.cell - O.cell.loc = O - W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. + O.cell.forceMove(O) + W.forceMove(O) //Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. // Since we "magically" installed a cell, we also have to update the correct component. if(O.cell) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 07b83075f1..77fb8e9c57 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -162,7 +162,7 @@ /obj/item/borg/upgrade/advhealth name = "advanced health analyzer module" - desc = "A carbon dioxide jetpack suitable for low-gravity operations." + desc = "An upgrade to improve a station-bound synthetic's health analyzer." icon_state = "cyborg_upgrade3" item_state = "cyborg_upgrade" require_module = TRUE @@ -184,6 +184,39 @@ to_chat(usr, "There's no mounting point for the module!") return FALSE + +/obj/item/borg/upgrade/bluespaceorebag + name = "bluespace mining satchel module" + desc = "Improves the ore satchels of mining units to hold a lot more ores." + icon_state = "cyborg_upgrade3" + item_state = "cyborg_upgrade" + module_flags = BORG_MODULE_MINER + require_module = TRUE + +/obj/item/borg/upgrade/bluespaceorebag/action(var/mob/living/silicon/robot/R) + if(..()) + return FALSE + + var/obj/item/storage/bag/ore/O = locate() in R.module + if(!O) + O = locate() in R.module.contents + if(!O) + O = locate() in R.module.modules + if(!O) //there should be one though... + R.module.modules += new/obj/item/storage/bag/ore/bluespace(R.module) + return TRUE + if(O) + if(istype(O,/obj/item/storage/bag/ore/bluespace)) + to_chat(R, "Upgrade mounting error! Upgrade already present.") + to_chat(usr, SPAN_WARNING("[R] already has this upgrade!")) + return FALSE + else + R.uneq_all() + O.deconstruct(ATOM_DECONSTRUCT_DISASSEMBLED) //drops all ores previous satchel was carrying using this method + R.module.modules += new/obj/item/storage/bag/ore/bluespace(R.module) + return TRUE + + /obj/item/borg/upgrade/syndicate name = "scrambled equipment module" desc = "Unlocks new and often deadly module specific items of a robot" @@ -218,7 +251,7 @@ //Robot resizing module, moved from robot/upgrades_vr - Papalus /obj/item/borg/upgrade/sizeshift name = "robot size alteration module" - desc = "Using technology similar to one used in sizeguns, allows cyborgs to adjust their own size as neccesary." + desc = "Using technology similar to one used in size guns, allows cyborgs to adjust their own size as necessary." icon_state = "cyborg_upgrade2" item_state = "cyborg_upgrade" require_module = 1 diff --git a/code/game/objects/items/scanners/plant.dm b/code/game/objects/items/scanners/plant.dm index 31eb5b14ca..a06add0802 100644 --- a/code/game/objects/items/scanners/plant.dm +++ b/code/game/objects/items/scanners/plant.dm @@ -18,10 +18,10 @@ ui = new(user, src, "PlantAnalyzer", name) ui.open() -/obj/item/plant_analyzer/ui_state(mob/user, datum/tgui_module/module) +/obj/item/plant_analyzer/ui_state() return GLOB.inventory_state -/obj/item/plant_analyzer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/plant_analyzer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/datum/seed/grown_seed = locate(last_seed) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index f2ed4d9d5f..6f42300ce1 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -79,7 +79,7 @@ ui = new(user, src, "StackCrafting") ui.open() -/obj/item/stack/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/stack/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["recipes"] = tgui_recipes() .["maxAmount"] = max_amount @@ -94,7 +94,7 @@ assembled[++assembled.len] = recipe.tgui_recipe_data() return assembled -/obj/item/stack/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/stack/ui_data(mob/user, datum/tgui/ui) . = ..() .["amount"] = get_amount() diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 558ba61397..c1f39b35ae 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -125,7 +125,7 @@ can_hold = list(/obj/item/stack/ore) var/stored_ore = list() var/total_ore = 0 //current ore stored - var/max_ore = 200 //how much ore it can hold + var/max_ore = 300 //how much ore it can hold var/last_update = 0 /obj/item/storage/bag/ore/update_w_class() @@ -209,7 +209,7 @@ /obj/item/storage/bag/ore/proc/take(obj/item/stack/ore/O) if(!istype(O)) - return + return FALSE var/overflow = max((total_ore + O.amount) - max_ore, 0) var/store_amount = O.amount - overflow @@ -222,8 +222,10 @@ if(overflow) O.use(store_amount) O.forceMove(drop_location()) + return FALSE else qdel(O) + return TRUE /obj/item/storage/bag/ore/proc/deposit(atom/newloc, amount = 50) if(isOreEmpty()) @@ -269,6 +271,14 @@ icon = 'icons/obj/lavaland.dmi' icon_state = "golisatchel" +//Bluespace. +/obj/item/storage/bag/ore/bluespace + name = "mining satchel of holding" + desc = "This advanced spacious storage efficiently stores and transports ores using bluespace technology. It's like having an ore box latched onto your pocket!" + icon_state = "satchel_bspace" + max_ore = SHORT_REAL_LIMIT //if someone manages to reach 16+ million ores in a single 5 hour round, they'd have to be something else. + + // ----------------------------- // Plant bag // ----------------------------- diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index ce0c3912d9..367b4c79bc 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -157,7 +157,7 @@ //Returns the amount of fuel in the welder /obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("fuel") + return reagents.get_reagent_amount(/datum/reagent/fuel) /obj/item/weldingtool/proc/get_max_fuel() return max_fuel diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 85a2cb1fbd..e1ddadbd76 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -117,7 +117,7 @@ get_asset_datum(/datum/asset/spritesheet/pipes), ) -/obj/item/pipe_dispenser/ui_state(mob/user, datum/tgui_module/module) +/obj/item/pipe_dispenser/ui_state() return GLOB.inventory_state /obj/item/pipe_dispenser/ui_interact(mob/user, datum/tgui/ui) @@ -127,11 +127,11 @@ ui = new(user, src, "RapidPipeDispenser", name) ui.open() -/obj/item/pipe_dispenser/ui_static_data(mob/user) +/obj/item/pipe_dispenser/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list("paint_colors" = GLOB.pipe_paint_colors) return data -/obj/item/pipe_dispenser/ui_data(mob/user) +/obj/item/pipe_dispenser/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "category" = category, "piping_layer" = piping_layer, @@ -165,7 +165,7 @@ data["init_directions"] = init_directions return data -/obj/item/pipe_dispenser/ui_act(action, params) +/obj/item/pipe_dispenser/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index d902d74c9c..036b90ef18 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -9,6 +9,7 @@ light_color = "#E09D37" var/wax = 2000 var/icon_type = "candle" + var/light_range_lit = 3 /obj/item/flame/candle/Initialize(mapload) . = ..() @@ -42,12 +43,11 @@ if(C.lit) light() - /obj/item/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [src].") if(!lit) lit = TRUE visible_message(flavor_text) - set_light(CANDLE_LUM) + set_light(light_range_lit) START_PROCESSING(SSobj, src) /obj/item/flame/candle/process(delta_time) @@ -116,10 +116,13 @@ light("\The [src] mysteriously lights itself!.") /obj/item/flame/candle/everburn/white + name = "white candle" desc = "a white pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments." icon_state = "whitecandle" icon_type = "whitecandle" + /obj/item/flame/candle/everburn/black + name = "black candle" desc = "a black pillar candle. Ominous." icon_state = "blackcandle" icon_type = "blackcandle" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 26c7a6a4d9..9fa66090e3 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -105,6 +105,7 @@ user.drop_all_held_items() user.stop_pulling() +/* grimdark code that's disabled for code quality reasons - readd later if we care var/last_chew = 0 /mob/living/carbon/human/RestrainedClickOn(var/atom/A) if (A != src) return ..() @@ -130,6 +131,7 @@ var/last_chew = 0 H:UpdateDamageIcon() last_chew = world.time +*/ /obj/item/handcuffs/fuzzy name = "fuzzy cuffs" diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm deleted file mode 100644 index 0ce4b552f4..0000000000 --- a/code/game/objects/items/weapons/hydroponics.dm +++ /dev/null @@ -1,116 +0,0 @@ -/* - * SeedBag - */ -//uncomment when this is updated to match storage update -/* -/obj/item/seedbag - icon = 'icons/obj/hydroponics_machines.dmi' - icon_state = "seedbag" - name = "Seed Bag" - desc = "A small satchel made for organizing seeds." - var/mode = 1; //0 = pick one at a time, 1 = pick all on tile - var/capacity = 500; //the number of seeds it can carry. - slot_flags = SLOT_BELT - w_class = ITEMSIZE_TINY - var/list/item_quants = list() - -/obj/item/seedbag/attack_self(mob/user) - . = ..() - if(.) - return - user.machine = src - interact(user) - -/obj/item/seedbag/verb/toggle_mode() - set name = "Switch Bagging Method" - set category = "Object" - - mode = !mode - switch (mode) - if(1) - to_chat(usr, "The bag now picks up all seeds in a tile at once.") - if(0) - to_chat(usr, "The bag now picks up one seed pouch at a time.") - -/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob) - ..() - if (istype(O, /obj/item/seedbag)) - var/obj/item/seedbag/S = O - if (S.mode == 1) - for (var/obj/item/seeds/G in locate(src.x,src.y,src.z)) - if (S.contents.len < S.capacity) - S.contents += G; - if(S.item_quants[G.name]) - S.item_quants[G.name]++ - else - S.item_quants[G.name] = 1 - else - to_chat(user, "The seed bag is full.") - S.updateUsrDialog() - return - to_chat(user, "You pick up all the seeds.") - else - if (S.contents.len < S.capacity) - S.contents += src; - if(S.item_quants[name]) - S.item_quants[name]++ - else - S.item_quants[name] = 1 - else - to_chat(user, "The seed bag is full.") - S.updateUsrDialog() - return - -/obj/item/seedbag/interact(mob/user as mob) - - var/dat = "Select an item:
" - - if (contents.len == 0) - dat += "No seeds loaded!" - else - for (var/O in item_quants) - if(item_quants[O] > 0) - var/N = item_quants[O] - dat += "[capitalize(O)]:" - dat += " [N] " - dat += "Vend" - dat += "
" - - dat += "
Unload All" - dat += "" - user << browse("Seedbag Supplies[dat]", "window=seedbag") - onclose(user, "seedbag") - return - -/obj/item/seedbag/Topic(href, href_list) - if(..()) - return - - usr.machine = src - if ( href_list["vend"] ) - var/N = href_list["vend"] - - if(item_quants[N] <= 0) // Sanity check, there are probably ways to press the button when it shouldn't be possible. - return - - item_quants[N] -= 1 - for(var/obj/O in contents) - if(O.name == N) - O.loc = get_turf(src) - usr.put_in_hands(O) - break - - else if ( href_list["unload"] ) - item_quants.Cut() - for(var/obj/O in contents ) - O.loc = get_turf(src) - - src.updateUsrDialog() - return - -/obj/item/seedbag/updateUsrDialog() - var/list/nearby = range(1, src) - for(var/mob/M in nearby) - if ((M.client && M.machine == src)) - src.attack_self(M) -*/ diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index f0891c5d90..ad2647dc7f 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -55,7 +55,10 @@ /obj/item/implant/proc/meltdown() //breaks it down, making implant unrecongizible to_chat(imp_in, "You feel something melting inside [part ? "your [part.name]" : "you"]!") if (part) - part.take_damage(burn = 15, used_weapon = "Electronics meltdown") + part.inflict_bodypart_damage( + burn = 15, + weapon_descriptor = "component meltdown", + ) else var/mob/living/M = imp_in M.apply_damage(15,BURN) diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 7a9d74f4d4..2c0a66bc19 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -103,7 +103,7 @@ /obj/item/material/knife/attack(target as mob, mob/living/user as mob) if ((MUTATION_CLUMSY in user.mutations) && prob(50)) to_chat(user, "You accidentally cut yourself with \the [src].") - user.take_organ_damage(20) + user.take_random_targeted_damage(brute = 20) return return ..() */ @@ -130,7 +130,7 @@ return ..() if ((MUTATION_CLUMSY in L.mutations) && prob(50)) to_chat(user, "\The [src] slips out of your hand and hits your head.") - L.take_organ_damage(10) + L.take_random_targeted_damage(brute = 10) L.afflict_unconscious(20 * 2) return CLICKCHAIN_DO_NOT_PROPAGATE return ..() diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index d2642c7f9a..00f632ce0f 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -133,11 +133,11 @@ if(affecting) if(affecting.robotic >= ORGAN_ROBOT) return - if(affecting.take_damage(damage_force, 0)) - H.UpdateDamageIcon() - H.update_health() + affecting.inflict_bodypart_damage( + brute = damage_force, + ) if(affecting.organ_can_feel_pain()) - H.afflict_paralyze(20 * 3) + H.afflict_paralyze(20 * 2) return check -= picked return diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 3d3d6380d0..1bbadc77cc 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -90,7 +90,7 @@ user.visible_message("\The [user] accidentally cuts [TU.himself] with \the [src].",\ "You accidentally cut yourself with \the [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H.take_organ_damage(5,5) + H.take_random_targeted_damage(brute = 5, burn = 5) deactivate(user) else activate(user) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index c2c9c253b1..226cce82a3 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -403,7 +403,7 @@ return else G.stun_effect_act(10 , 50, BP_TORSO, src) - G.take_organ_damage(10) + G.take_random_targeted_damage(brute = 10) G.afflict_unconscious(20 * 20) playsound(src.loc, "sparks", 50, 1) return diff --git a/code/game/objects/items/weapons/nullrod.dm b/code/game/objects/items/weapons/nullrod.dm index 8a9188863e..022893442c 100644 --- a/code/game/objects/items/weapons/nullrod.dm +++ b/code/game/objects/items/weapons/nullrod.dm @@ -138,8 +138,8 @@ name = "holy claymore" desc = "A weapon fit for a crusade!" slot_flags = SLOT_BACK|SLOT_BELT + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE projectile_parry_chance = 30 - sharp = 1 attack_sound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -157,8 +157,7 @@ name = "sacred chainsaw sword" desc = "Suffer not a heretic to live." slot_flags = SLOT_BELT - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE attack_verb = list("sawed", "torn", "cut", "chopped", "diced") attack_sound = 'sound/weapons/chainsaw_attack.ogg' @@ -225,8 +224,7 @@ desc = "Ask not for whom the bell tolls..." armor_penetration = 35 slot_flags = SLOT_BACK - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE attack_verb = list("chopped", "sliced", "cut", "reaped") /obj/item/nullrod/scythe/vibro @@ -257,8 +255,7 @@ desc = "Good? Bad? You're the guy with the chainsaw hand." icon_state = "chainsaw_on" item_state = "mounted_chainsaw" - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE attack_verb = list("sawed", "torn", "cut", "chopped", "diced") attack_sound = 'sound/weapons/chainsaw_attack.ogg' @@ -273,7 +270,7 @@ name = "clown dagger" desc = "Used for absolutely hilarious sacrifices." attack_sound = 'sound/items/bikehorn.ogg' - sharp = 1 + damage_mode = DAMAGE_MODE_SHARP attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") /obj/item/nullrod/pride_hammer @@ -315,12 +312,12 @@ icon_state = "fedora" item_state = "fedora" slot_flags = SLOT_HEAD + damage_mode = DAMAGE_MODE_SHARP icon = 'icons/obj/clothing/hats.dmi' damage_force = 0 throw_speed = 4 throw_range = 7 throw_force = 30 - sharp = 1 attack_verb = list("enlightened", "redpilled") /obj/item/nullrod/armblade @@ -328,8 +325,7 @@ desc = "Particularly twisted deities grant gifts of dubious value." icon_state = "arm_blade" item_state = "arm_blade" - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE /obj/item/nullrod/armblade/Initialize(mapload) . = ..() @@ -372,7 +368,7 @@ damage_force = 15 defend_chance = 40 slot_flags = SLOT_BACK - sharp = 1 + damage_mode = DAMAGE_MODE_SHARP attack_sound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") icon_state = "bostaff0" @@ -407,8 +403,7 @@ item_state = "crysknife" name = "arrhythmic knife" desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn." - sharp = 1 - edge = 1 + damage_mode = DAMAGE_MODE_SHARP attack_sound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -422,14 +417,14 @@ desc = "Holding this makes you look absolutely devilish." attack_verb = list("poked", "impaled", "pierced", "jabbed") attack_sound = 'sound/weapons/bladeslice.ogg' - sharp = 1 + damage_mode = DAMAGE_MODE_SHARP /obj/item/nullrod/egyptian name = "egyptian staff" desc = "A tutorial in mummification is carved into the staff. You could probably craft the wraps if you had some cloth." icon_state = "pharaoh_sceptre" item_state = "pharaoh_sceptre" - attack_verb = list("bashes", "smacks", "whacks") + attack_verb = list("bashed", "smacked", "whacked") /obj/item/nullrod/rosary icon_state = "rosary" diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 244c885ee6..3e4238780e 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -90,7 +90,7 @@ break if(!success) - user.loc = pick(L) + user.forceMove(pick(L)) smoke.start() src.uses -= 1 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 7fe72fb72f..eea328313b 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -331,7 +331,7 @@ if ((MUTATION_CLUMSY in user.mutations) && prob(50)) to_chat(user, "You beat yourself in the head with [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5) + H?.take_random_targeted_damage(brute = 5) active = !active if (active) damage_force = 10 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index e005143e6e..fbae63a4aa 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -28,7 +28,7 @@ var/mob/living/carbon/human/H = user H.apply_damage(2*damage_force, BRUTE, BP_HEAD) else - L.take_organ_damage(2*damage_force) + L.take_random_targeted_damage(brute = 2*damage_force) return return ..() @@ -106,7 +106,7 @@ H.apply_damage(2*damage_force, BRUTE, BP_HEAD) else if(isliving(user)) var/mob/living/L = user - L.take_organ_damage(2*damage_force) + L.take_random_targeted_damage(brute = 2*damage_force) return var/old_damtype = damtype var/old_attack_verb = attack_verb diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index d223e575b2..a3477920d8 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -224,7 +224,7 @@ var/list/global/tank_gauge_cache = list() if (src.proxyassembly.assembly) src.proxyassembly.assembly.attack_self(user) -/obj/item/weapon/tank/ui_state(mob/user, datum/tgui_module/module) +/obj/item/weapon/tank/ui_state() return GLOB.deep_inventory_state /obj/item/tank/ui_interact(mob/user, datum/tgui/ui) @@ -233,7 +233,7 @@ var/list/global/tank_gauge_cache = list() ui = new(user, src, "Tank", name) ui.open() -/obj/item/tank/ui_static_data(mob/user) +/obj/item/tank/ui_static_data(mob/user, datum/tgui/ui) . = list ( "defaultReleasePressure" = round(TANK_DEFAULT_RELEASE_PRESSURE), "minReleasePressure" = round(TANK_MIN_RELEASE_PRESSURE), @@ -242,7 +242,7 @@ var/list/global/tank_gauge_cache = list() "fragmentPressure" = round(TANK_FRAGMENT_PRESSURE) ) -/obj/item/tank/ui_data(mob/user) +/obj/item/tank/ui_data(mob/user, datum/tgui/ui) . = list( "tankPressure" = round(air_contents.return_pressure()), "releasePressure" = round(distribute_pressure) @@ -266,7 +266,7 @@ var/list/global/tank_gauge_cache = list() return . -/obj/item/tank/ui_act(action, params) +/obj/item/tank/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 6232c70c54..8f148088dc 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -38,7 +38,7 @@ if((MUTATION_CLUMSY in L.mutations) && prob(50)) //What if he's a clown? to_chat(victim, "You accidentally slam yourself with the [src]!") L.afflict_paralyze(20 * 1) - L.take_organ_damage(2) + L.take_random_targeted_damage(brute = 2) if(prob(50)) playsound(victim, 'sound/items/trayhit1.ogg', 50, 1) return @@ -60,9 +60,9 @@ if(prob(15)) victim.afflict_paralyze(20 * 3) - victim.take_organ_damage(3) + victim.take_random_targeted_damage(brute = 3) else - victim.take_organ_damage(5) + victim.take_random_targeted_damage(brute = 5) if(prob(50)) playsound(victim, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(victim, null)) @@ -106,10 +106,10 @@ O.show_message(SPAN_DANGER("[L] slams [victim] with the tray!"), SAYCODE_TYPE_VISIBLE) if(prob(10)) victim.afflict_stun(20 * rand(1,3)) - victim.take_organ_damage(3) + victim.take_random_targeted_damage(brute = 3) return else - victim.take_organ_damage(5) + victim.take_random_targeted_damage(brute = 5) return else //No eye or head protection, tough luck! @@ -130,10 +130,10 @@ O.show_message(SPAN_DANGER("[L] slams [victim] in the face with the tray!"), SAYCODE_TYPE_VISIBLE) if(prob(30)) victim.afflict_stun(20 * rand(2,4)) - victim.take_organ_damage(4) + victim.take_random_targeted_damage(brute = 4) return else - victim.take_organ_damage(8) + victim.take_random_targeted_damage(brute = 8) if(prob(30)) victim.afflict_paralyze(20 * 2) return diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 17d1162fa0..5157e7229f 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -321,7 +321,7 @@ e_args.performer.put_in_hands_or_drop(obj_cell_slot.remove_cell(e_args.performer)) return TRUE -//? Cells / Inducers +//* Cells / Inducers *// /** * get cell slot @@ -338,7 +338,7 @@ if(!isnull(obj_cell_slot?.cell) && !obj_cell_slot.primary && obj_cell_slot.receive_inducer) things_to_induce += obj_cell_slot.cell -//? Climbing +//* Climbing *// /obj/MouseDroppedOn(atom/dropping, mob/user, proximity, params) if(drag_drop_climb_interaction(user, dropping)) @@ -470,7 +470,7 @@ H.update_health() */ -//? Context +//* Context *// /obj/context_query(datum/event_args/actor/e_args) . = ..() @@ -507,14 +507,14 @@ return TRUE return ..() -//? EMP +//* EMP *// /obj/emp_act(severity) . = ..() if(obj_cell_slot?.receive_emp) obj_cell_slot?.cell?.emp_act(severity) -//? Hiding / Underfloor +//* Hiding / Underfloor *// /obj/proc/is_hidden_underfloor() return FALSE @@ -522,7 +522,7 @@ /obj/proc/should_hide_underfloor() return FALSE -//* Examine +//* Examine *// /obj/examine(mob/user, dist) . = ..() @@ -552,7 +552,29 @@ else . += SPAN_BOLDWARNING("It's falling apart!") -//* Resists +//* Orientation *// + +/** + * Standard wallmount orientation: face away + */ +/obj/proc/auto_orient_wallmount_single() + for(var/dir in GLOB.cardinal) + if(get_step(src, dir)?.get_wallmount_anchor()) + setDir(turn(dir, 180)) + return + +/** + * Standard wallmount orientation: face away + * + * Directly sets dir without setDir() + */ +/obj/proc/auto_orient_wallmount_single_preinit() + for(var/dir in GLOB.cardinal) + if(get_step(src, dir)?.get_wallmount_anchor()) + src.dir = turn(dir, 180) + return + +//* Resists *// /** * called when something tries to resist out from inside us. @@ -625,7 +647,7 @@ animate(src, transform=turn(matrix(), 8*shake_dir), pixel_x=init_px + 2*shake_dir, time=1) animate(transform=null, pixel_x=init_px, time=6, easing=ELASTIC_EASING) -//? Tool System +//* Tool System *// /obj/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args, list/hint_images = list()) if(isnull(obj_cell_slot) || !obj_cell_slot.remove_tool_behavior || !obj_cell_slot.interaction_active(e_args.performer)) diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index c60289bde9..02803fa76d 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -252,7 +252,7 @@ ), prob(2);list( /obj/item/hardsuit/industrial/equipped, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/structure/closet/crate/engineering ), prob(2);list( @@ -311,43 +311,43 @@ ), prob(2);list( /obj/item/pickaxe/silver, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/drill, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/jackhammer, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/diamond, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/diamonddrill, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/gold, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), prob(2);list( /obj/item/pickaxe/plasmacutter, - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering ), diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index b6fc32dbd1..f4aad4afb1 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -70,6 +70,16 @@ /obj/item/tool/wrench/clockwork, /obj/item/multitool/clockwork) +/obj/random/ore_bag + name = "random mining satchel" + desc = "This is a random mining satchel." + icon = 'icons/obj/mining.dmi' + icon_state = "satchel_bspace" + +/obj/random/ore_bag/item_to_spawn() + return pick(prob(6);/obj/item/storage/bag/ore, + prob(1);/obj/item/storage/bag/ore/bluespace) + /obj/random/technology_scanner name = "random scanner" desc = "This is a random technology scanner." @@ -1060,7 +1070,7 @@ /obj/random/multiple/ores/item_to_spawn() return pick( prob(9);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/shovel, /obj/item/stack/ore/glass, //TODO: replace this legacy loot nonsense. /obj/item/stack/ore/glass, @@ -1080,7 +1090,7 @@ /obj/item/stack/ore/hydrogen ), prob(7);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/pickaxe, /obj/item/stack/ore/osmium, /obj/item/stack/ore/osmium, diff --git a/code/game/objects/random/underdark.dm b/code/game/objects/random/underdark.dm index 8df29b2705..4b79d82da0 100644 --- a/code/game/objects/random/underdark.dm +++ b/code/game/objects/random/underdark.dm @@ -40,7 +40,7 @@ /obj/random/multiple/underdark/ores/item_to_spawn() return pick( prob(9);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/shovel, /obj/item/stack/ore/glass, //TODO: tell this legacy loot bullshit to fuck off so we don't have this happening. /obj/item/stack/ore/glass, @@ -60,7 +60,7 @@ /obj/item/stack/ore/hydrogen ), prob(7);list( - /obj/item/storage/bag/ore, + /obj/random/ore_bag, /obj/item/pickaxe, /obj/item/stack/ore/osmium, /obj/item/stack/ore/osmium, diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 3c4278b805..ec2ae31c51 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -32,7 +32,7 @@ LINEN BINS add_fingerprint(user) /obj/item/bedsheet/attackby(obj/item/I, mob/user) - if(is_sharp(I)) + if(is_sharp(I) || I.tool_check(TOOL_WIRECUTTER)) user.visible_message("\The [user] begins cutting up [src] with [I].", "You begin cutting up [src] with [I].") if(do_after(user, 50)) to_chat(user, "You cut [src] into pieces!") diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index 99393dc3cd..e5cfe97fa4 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -26,6 +26,8 @@ /obj/structure/catwalk/Initialize(mapload) . = ..() + if(istype(loc, /turf/simulated/floor/water)) + layer = ABOVE_TURF_LAYER for(var/obj/structure/catwalk/O in range(1)) O.update_icon() for(var/obj/structure/catwalk/C in get_turf(src)) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 0bb46b31e6..4b6d3cafce 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -77,6 +77,8 @@ return 1 /obj/structure/closet/crate/attackby(obj/item/W as obj, mob/user as mob) + if(user.a_intent == INTENT_HARM) + return ..() if(opened) if(isrobot(user)) return diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index e9c7a16f5a..abf55da59e 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -253,7 +253,8 @@ /obj/structure/girder/drop_products(method, atom/where) . = ..() material_structure.place_dismantled_product(where, 2) - material_reinforcing.place_dismantled_product(where, 1) + if(material_reinforcing) + material_reinforcing.place_dismantled_product(where, 1) /obj/structure/girder/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode) var/turf/simulated/T = get_turf(src) diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index f16820a612..21227f6cc2 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -77,7 +77,9 @@ GLOBAL_LIST_INIT(wallframe_typecache, typecacheof(list( var/obj/structure/wall_frame/neighbor = locate() in step_turf if(neighbor) continue - if(!can_area_smooth(step_turf)) + var/can_area_smooth + CAN_AREAS_SMOOTH(src, step_turf, can_area_smooth) + if(isnull(can_area_smooth)) continue for(var/atom/movable/movable_thing as anything in step_turf) if(GLOB.wallframe_typecache[movable_thing.type]) diff --git a/code/game/objects/structures/tables/flipping.dm b/code/game/objects/structures/tables/flipping.dm index 84d1a66766..1f5f41ead0 100644 --- a/code/game/objects/structures/tables/flipping.dm +++ b/code/game/objects/structures/tables/flipping.dm @@ -123,8 +123,8 @@ break if(failed) to_chat(usr, SPAN_WARNING("[blocking? "[blocking] is in the way!" : "It won't budge."]")) - - unflip() + else + unflip() /obj/structure/table/proc/flip(var/direction) var/list/obj/structure/table/tables = tableflip_closure(direction) diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index dff69f3027..c0a849a6e4 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -31,6 +31,8 @@ //A variant that will can be hidden underneath tiles similiar to pipes and such /obj/structure/transit_tube/hidden level = 1 + plane = TURF_PLANE + layer = BELOW_TURF_LAYER // A place where tube pods stop, and people can get in or out. // Mappers: use "Generate Instances from Directions" for this @@ -59,32 +61,8 @@ /obj/structure/transit_tube_pod/Destroy() for(var/atom/movable/AM in contents) - AM.loc = loc - - ..() - - - -// When destroyed by explosions, properly handle contents. -/obj/structure/transit_tube_pod/legacy_ex_act(severity) - switch(severity) - if(1.0) - for(var/atom/movable/AM in contents) - AM.loc = loc - LEGACY_EX_ACT(AM, severity + 1, null) - - qdel(src) - return - if(2.0) - if(prob(50)) - for(var/atom/movable/AM in contents) - AM.loc = loc - LEGACY_EX_ACT(AM, severity + 1, null) - - qdel(src) - return - if(3.0) - return + AM.forceMove(loc) + return ..() /obj/structure/transit_tube_pod/Initialize(mapload) . = ..() @@ -115,7 +93,7 @@ to_chat(AM, "The tube's support pylons block your way.") return ..() else - AM.loc = src.loc + AM.forceMove(loc) to_chat(AM, "You slip under the tube.") /obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj) @@ -125,7 +103,7 @@ to_chat(AM, "The pod is already occupied.") return else if(!pod.moving && (pod.dir in directions())) - AM.loc = pod + AM.forceMove(pod) return @@ -332,7 +310,7 @@ last_delay = current_tube.enter_delay(src, next_dir) sleep(last_delay) setDir(next_dir) - loc = next_loc // When moving from one tube to another, skip collision and such. + forceMove(next_loc) // When moving from one tube to another, skip collision and such. density = current_tube.density if(current_tube && current_tube.should_stop_pod(src, next_dir)) @@ -379,7 +357,7 @@ if(istype(mob, /mob) && mob.client) // If the pod is not in a tube at all, you can get out at any time. if(!(locate(/obj/structure/transit_tube) in loc)) - mob.loc = loc + mob.forceMove(loc) mob.client.Move(get_step(loc, direction), direction) //if(moving && istype(loc, /turf/space)) @@ -392,7 +370,7 @@ if(!station.pod_moving) if(direction == station.dir) if(station.icon_state == "open") - mob.loc = loc + mob.forceMove(loc) mob.client.Move(get_step(loc, direction), direction) else diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b1adaf1250..b73334fb62 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -33,7 +33,7 @@ if(ishuman(user)) user.put_in_hands(I) else - I.loc = get_turf(src) + I.forceMove(get_turf(src)) to_chat(user, "You find \an [I] in the cistern.") w_items -= I.w_class return @@ -351,7 +351,7 @@ var/temperature = temperature_settings[watertemp] var/temp_adj = between(BODYTEMP_COOLING_MAX, temperature - M.bodytemperature, BODYTEMP_HEATING_MAX) - M.bodytemperature += temp_adj + M.adjust_bodytemperature(temp_adj) if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 227add68c5..e793d4fe94 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -722,59 +722,6 @@ animate(src, color = GLASS_COLOR_FROSTED, time=5) set_opacity(TRUE) -/obj/machinery/button/windowtint - name = "window tint control" - icon = 'icons/obj/power.dmi' - icon_state = "light0" - desc = "A remote control switch for polarized windows." - var/range = 7 - -/obj/machinery/button/windowtint/attack_hand(mob/user, list/params) - if (..()) - return TRUE - else - toggle_tint() - -/obj/machinery/button/windowtint/proc/toggle_tint() - use_power(5) - - active = !active - update_appearance() - - for (var/obj/structure/window/reinforced/polarized/target_window in range(src, range)) - if (target_window.id == id || !target_window.id) - INVOKE_ASYNC(target_window, TYPE_PROC_REF(/obj/structure/window/reinforced/polarized, toggle)) - -/obj/machinery/button/windowtint/power_change() - ..() - if (active && !powered(power_channel)) - toggle_tint() - -/obj/machinery/button/windowtint/update_icon_state() - . = ..() - icon_state = "light[active]" - -/obj/machinery/button/windowtint/attackby(obj/item/object, mob/user) - if (istype(object, /obj/item/multitool)) - var/obj/item/multitool/MT = object - if (!id) - // If no ID is set yet (newly built button?) let them select an ID for first-time use! - var/new_id = tgui_input_text( - user = user, - message = "Enter the ID for the window.", - title = name, - ) - if (new_id && user.get_active_held_item() != object && in_range(src, user)) - id = new_id - to_chat(user, SPAN_NOTICE("The new ID of \the [src] is [id]")) - if (id) - // It already has an ID (or they just set one), buffer it for copying to windows. - to_chat(user, SPAN_NOTICE("You store \the [src] in \the [MT]'s buffer!")) - MT.connectable = src - MT.update_appearance() - return TRUE - return ..() - /obj/structure/window/wooden name = "wooden panel" desc = "A set of wooden panelling, designed to hide the drab grey walls." diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index c50f76ac51..098d0c54e7 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -10,6 +10,7 @@ icon = 'icons/obj/structures/window_spawners.dmi' icon_state = "wingrille" density = TRUE + layer = WINDOW_LAYER anchored = 1.0 pressure_resistance = 4*ONE_ATMOSPHERE CanAtmosPass = ATMOS_PASS_AIR_BLOCKED diff --git a/code/game/turfs/simulated/floor_types/river.dm b/code/game/turfs/simulated/floor_types/river.dm new file mode 100644 index 0000000000..77bab49dc2 --- /dev/null +++ b/code/game/turfs/simulated/floor_types/river.dm @@ -0,0 +1,126 @@ +/turf/simulated/floor/water/river + name = "shallow river" + desc = "A moving body of water. It seems shallow enough to walk through, if needed." + icon = 'icons/turf/outdoors.dmi' + icon_state = "seashallow" // So it shows up in the map editor as water. + water_state = "rivershallow" + water_file = 'icons/turf/river.dmi' + under_state = "desert" + var/delta_sum = 0 + var/float_delay = 10 + var/moving_dir = SOUTH + +/turf/simulated/floor/water/river/update_icon() + switch(moving_dir) + if(NORTH) + water_state = initial(water_state) + "_north" + if(SOUTH) + water_state = initial(water_state) + "_south" + if(EAST) + water_state = initial(water_state) + "_east" + if(WEST) + water_state = initial(water_state) + "_west" + else + message_admins("[src.type] ([src.x];[src.y];[src.z]) without a properly set moving dir, defaulting to north.") + moving_dir = NORTH + water_state = initial(water_state) + "_north" + . = ..() +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/south) +/turf/simulated/floor/water/river/south + dir = SOUTH + moving_dir = SOUTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/north) +/turf/simulated/floor/water/river/north + dir = NORTH + moving_dir = NORTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/east) +/turf/simulated/floor/water/river/east + dir = EAST + moving_dir = EAST + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/west) +/turf/simulated/floor/water/river/west + dir = WEST + moving_dir = WEST + +/turf/simulated/floor/water/river/deep + name = "deep river" + desc = "A deep moving body of water. Walking through this is gonna be a pain." + icon_state = "seadeep" + water_state = "riverdeep" + under_state = "abyss" + slowdown = 8 + depth = 2 + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/south) +/turf/simulated/floor/water/river/deep/south + dir = SOUTH + moving_dir = SOUTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/north) +/turf/simulated/floor/water/river/deep/north + dir = NORTH + moving_dir = NORTH + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/east) +/turf/simulated/floor/water/river/deep/east + dir = EAST + moving_dir = EAST + +CREATE_STANDARD_TURFS(/turf/simulated/floor/water/river/deep/west) +/turf/simulated/floor/water/river/deep/west + dir = WEST + moving_dir = WEST + +/turf/simulated/floor/water/river/Entered(atom/movable/AM, atom/oldloc) + . = ..() + START_PROCESSING(SSobj, src) + +/turf/simulated/floor/water/river/Exited(atom/movable/AM, atom/newloc) + . = ..() + STOP_PROCESSING(SSobj, src) + +/turf/simulated/floor/water/river/process(delta_time) + if(!LAZYLEN(contents)) + STOP_PROCESSING(SSobj, src)//Failsafe, no need to process if we dont have any contents + return + if(!((locate(/obj/item) in contents) || (locate(/obj/vehicle) in contents) || (locate(/mob/living) in contents))) + STOP_PROCESSING(SSobj, src) + return + if(locate(/obj/structure/catwalk) in contents) + return//Stop floating stuff down stream when there is a catwalk + delta_sum += delta_time + if(delta_sum > float_delay) + addtimer(CALLBACK(src, PROC_REF(convey), src.contents), 1) + delta_sum = 0 + float_delay = rand(5, 20) + +/turf/simulated/floor/water/river/proc/convey(list/affecting) + var/turf/T = get_step(src, moving_dir) + if(!T) + return + var/list/to_move + LAZYINITLIST(to_move) + for(var/atom/movable/A in affecting) + if(istype(A, /atom/movable/lighting_overlay)) + continue + if(!(A.anchored || (A.atom_flags & ATOM_ABSTRACT))) + if(A.loc == src) // prevents the object from being affected if it's not currently here. + step(A,moving_dir) + + +/obj/effect/floor_decal/river_beach_edge + name = "beach" + icon = 'icons/turf/river.dmi' + icon_state = "shore_overlay" + layer = ABOVE_TURF_LAYER //So it showes above the water layer of rivers + +/obj/effect/floor_decal/river_beach_corner_edge + name = "beach corner" + icon = 'icons/turf/river.dmi' + icon_state = "shore_corner_overlay" + layer = ABOVE_TURF_LAYER //So it showes above the water layer of rivers + + diff --git a/code/game/turfs/simulated/floor_types/water.dm b/code/game/turfs/simulated/floor_types/water.dm index 7092dbebc7..bc5802aece 100644 --- a/code/game/turfs/simulated/floor_types/water.dm +++ b/code/game/turfs/simulated/floor_types/water.dm @@ -5,6 +5,7 @@ icon = 'icons/turf/outdoors.dmi' icon_state = "seashallow" // So it shows up in the map editor as water. var/water_state = "water_shallow" + var/water_file = 'icons/turf/outdoors.dmi' var/under_state = "rock" edge_icon_state = "water_shallow" slowdown = 4 @@ -28,7 +29,7 @@ ..() // To get the edges. icon_state = under_state // This isn't set at compile time in order for it to show as water in the map editor. - var/image/water_sprite = image(icon = 'icons/turf/outdoors.dmi', icon_state = water_state, layer = WATER_LAYER) + var/image/water_sprite = image(icon = water_file, icon_state = water_state, layer = WATER_LAYER) add_overlay(water_sprite) /turf/simulated/floor/water/attackby(obj/item/O as obj, mob/user as mob) diff --git a/code/game/turfs/simulated/flooring/flooring_decals.dm b/code/game/turfs/simulated/flooring/flooring_decals.dm index d188a72900..1f3ac474ff 100644 --- a/code/game/turfs/simulated/flooring/flooring_decals.dm +++ b/code/game/turfs/simulated/flooring/flooring_decals.dm @@ -51,7 +51,7 @@ var/list/floor_decals = list() var/image/I = floor_decals[cache_key] if(!I) I = image(icon = icon, icon_state = icon_state, dir = dir) - I.layer = T.layer + I.layer = (T.layer > src.layer ? T.layer : src.layer) I.color = color I.alpha = alpha floor_decals[cache_key] = I diff --git a/code/game/turfs/simulated/flooring/flooring_premade.dm b/code/game/turfs/simulated/flooring/flooring_premade.dm index dd0d45746c..b905f55afd 100644 --- a/code/game/turfs/simulated/flooring/flooring_premade.dm +++ b/code/game/turfs/simulated/flooring/flooring_premade.dm @@ -285,6 +285,8 @@ icon_state = "reinforced" initial_flooring = /singleton/flooring/reinforced +CREATE_STANDARD_TURFS(/turf/simulated/floor/reinforced) + /turf/simulated/floor/reinforced/airless initial_gas_mix = GAS_STRING_VACUUM diff --git a/code/game/turfs/simulated/wall/materials.dm b/code/game/turfs/simulated/wall/materials.dm index 7557b1c12a..856fc1f2ef 100644 --- a/code/game/turfs/simulated/wall/materials.dm +++ b/code/game/turfs/simulated/wall/materials.dm @@ -52,25 +52,33 @@ /turf/simulated/wall/proc/update_materials() if(material_reinf) construction_stage = 6 - name = "reinforced [material_outer.display_name] wall" - desc = "It seems to be a section of hull reinforced with [material_reinf.display_name] and plated with [material_outer.display_name]." - else if(material_outer) - construction_stage = null - name = "[material_outer.display_name] wall" - desc = "It seems to be a section of hull plated with [material_outer.display_name]." else construction_stage = null - name = "wall" - desc = "It seems to be a section of hull." - var/integrity_factor = (isnull(material_outer)? 1 : material_outer.relative_integrity) * 0.75 - integrity_factor += (isnull(material_girder)? 1 : material_girder.relative_integrity) * 0.25 - integrity_factor += (isnull(material_reinf)? 0 : material_reinf.relative_integrity) * 0.5 + + if(!isnull(material_reinf)) + icon = material_reinf.icon_reinf + else if(!isnull(material_outer)) + icon = material_outer.icon_base + else + icon = 'icons/turf/walls/solid_wall.dmi' + + stripe_icon = material_outer.wall_stripe_icon + material_color = material_outer.icon_colour + + + var/integrity_factor = (material_outer ? material_outer.relative_integrity : 1) * 0.75 + integrity_factor += (material_girder ? material_girder.relative_integrity : 1) * 0.25 + integrity_factor += (material_reinf ? material_reinf.relative_integrity : 0) * 0.5 + set_multiplied_integrity(integrity_factor, FALSE) - var/datum/armor/grabbed = SSmaterials.wall_materials_armor(list((material_girder) = MATERIAL_SIGNIFICANCE_WALL_GIRDER, (material_reinf) = MATERIAL_SIGNIFICANCE_WALL_REINF, (material_outer) = MATERIAL_SIGNIFICANCE_WALL)) - set_armor(grabbed) + set_armor(SSmaterials.wall_materials_armor(list( + (material_girder) = MATERIAL_SIGNIFICANCE_WALL_GIRDER, + (material_reinf) = MATERIAL_SIGNIFICANCE_WALL_REINF, + (material_outer) = MATERIAL_SIGNIFICANCE_WALL) + )) rad_insulation = 1 / ((material_girder?.density * 0.1 + material_outer?.density * 1.2 + material_reinf?.density * 0.5) / 8 * 1.7) diff --git a/code/game/turfs/simulated/wall/wall.dm b/code/game/turfs/simulated/wall/wall.dm index b3f0d5f36a..4c0d366944 100644 --- a/code/game/turfs/simulated/wall/wall.dm +++ b/code/game/turfs/simulated/wall/wall.dm @@ -48,39 +48,40 @@ var/active var/can_open = FALSE + /// The base material of the wall. var/datum/material/material_outer = /datum/material/steel + /// The reinforcement material of the wall. var/datum/material/material_reinf + /// The material of the girders that are produced when the wall is dismantled. var/datum/material/material_girder = /datum/material/steel var/last_state var/construction_stage + + /// The material color of the wall. + VAR_PROTECTED/material_color /// Paint color of which the wall has been painted with. - var/paint_color + VAR_PROTECTED/paint_color /// Paint color of which the stripe has been painted with. Will not overlay a stripe if no paint is applied - var/stripe_color - var/stripe_icon - var/cache_key - var/shiny_wall + VAR_PROTECTED/stripe_color + + /// This is set by materials, do not touch! + VAR_PRIVATE/stripe_icon + /// This is set by update_overlays(), do not touch! + VAR_PRIVATE/cache_key + + var/shiny_wall //? Not even used rn? var/shiny_stripe /turf/simulated/wall/Initialize(mapload) - . = ..() // Remove the color that was set for mapping clarity. + //? This is before the ..() as it does stuff if there is a color. color = null - // init materials - init_materials() - if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS && fixed_underlay) //Set underlays for the diagonal walls. - var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, plane = TURF_PLANE) - if(fixed_underlay["space"]) - underlay_appearance.icon = 'icons/turf/space.dmi' - underlay_appearance.icon_state = "space" - underlay_appearance.plane = SPACE_PLANE - else - underlay_appearance.icon = fixed_underlay["icon"] - underlay_appearance.icon_state = fixed_underlay["icon_state"] - fixed_underlay = string_assoc_list(fixed_underlay) - underlays += underlay_appearance + . = ..() + + // Init materials + init_materials() /turf/simulated/wall/Destroy() clear_plants() diff --git a/code/game/turfs/simulated/wall/wall_icon.dm b/code/game/turfs/simulated/wall/wall_icon.dm index 04dc15608a..760e99eec4 100644 --- a/code/game/turfs/simulated/wall/wall_icon.dm +++ b/code/game/turfs/simulated/wall/wall_icon.dm @@ -15,12 +15,13 @@ GLOBAL_LIST_INIT(neighbor_typecache, typecacheof(list( /obj/structure/window/reinforced/polarized/full, /obj/structure/wall_frame, /obj/machinery/smartfridge, - ))) +))) GLOBAL_LIST_EMPTY(wall_overlays_cache) /turf/simulated/wall/proc/generate_wall_damage_overlays() - var/alpha_inc = 256 / damage_overlays.len + //? Global because all walls share the same damage overlays, and the len is constant. + var/global/alpha_inc = 256 / damage_overlays.len for(var/i = 1; i <= damage_overlays.len; i++) var/image/img = image(icon = 'icons/turf/walls/damage_masks.dmi', icon_state = "overlay_damage") @@ -28,19 +29,36 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) img.alpha = (i * alpha_inc) - 1 damage_overlays[i] = img -/turf/simulated/wall/proc/get_wall_icon() - if(!isnull(material_reinf)) - return material_reinf.icon_reinf - if(!isnull(material_outer)) - return material_outer.icon_base - return 'icons/turf/walls/solid_wall.dmi' +/// Paints the wall with a new color. +/turf/simulated/wall/proc/paint_wall(new_paint) + paint_color = new_paint + update_appearance() -/turf/simulated/wall/proc/apply_reinf_overlay() - . = istype(material_reinf) +/turf/simulated/wall/proc/paint_stripe(new_paint) + stripe_color = new_paint + update_appearance() -/turf/simulated/wall/update_icon_state() - . = ..() +/turf/simulated/wall/update_name(updates) + if(material_reinf) + name = "reinforced [material_outer.display_name] wall" + else if(material_outer) + name = "[material_outer.display_name] wall" + else + name = "wall" + + return ..() + +/turf/simulated/wall/update_desc(updates) + if(material_reinf) + desc = "It seems to be a section of hull reinforced with [material_reinf.display_name] and plated with [material_outer.display_name]." + else if(material_outer) + desc = "It seems to be a section of hull plated with [material_outer.display_name]." + else + desc = "It seems to be a section of hull." + + return ..() +/turf/simulated/wall/update_icon_state() // handle fakewalls // TODO: MAKE FAKEWALLS NOT TURFS WTF if(!density) @@ -49,20 +67,18 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) else if(icon_state == "fwall_open") icon_state = cached_wall_state + return ..() + /turf/simulated/wall/update_overlays() - icon = get_wall_icon() - color = isnull(material_outer)? null : material_outer.icon_colour - if(isnull(material_outer)) - overlays.len = 0 - return - stripe_icon = material_outer.wall_stripe_icon - var/plating_color = paint_color || material_outer.icon_colour || COLOR_WALL_GUNMETAL //fallback in case things are really fucked. - stripe_color = stripe_color || paint_color || material_outer.icon_colour + var/wall_paint = paint_color || material_color + var/stripe_paint = stripe_color || paint_color || material_color var/neighbor_stripe = NONE for (var/cardinal = NORTH; cardinal <= WEST; cardinal *= 2) //No list copy please good sir var/turf/step_turf = get_step(src, cardinal) - if(!can_area_smooth(step_turf)) + var/can_area_smooth + CAN_AREAS_SMOOTH(src, step_turf, can_area_smooth) + if(isnull(can_area_smooth)) continue for(var/atom/movable/movable_thing as anything in step_turf) if(GLOB.neighbor_typecache[movable_thing.type]) @@ -70,16 +86,16 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) break var/old_cache_key = cache_key - cache_key = "[icon]:[smoothing_junction]:[plating_color]:[stripe_icon]:[stripe_color]:[neighbor_stripe]:[shiny_wall]:[shiny_stripe]:[construction_stage]" + cache_key = "[icon]:[smoothing_junction]:[wall_paint]:[stripe_icon]:[stripe_paint]:[neighbor_stripe]:[shiny_wall]:[shiny_stripe]:[construction_stage]" if(!(old_cache_key == cache_key)) + color = wall_paint + var/potential_overlays = GLOB.wall_overlays_cache[cache_key] if(potential_overlays) overlays = potential_overlays - color = plating_color else - color = plating_color - //Updating the unmanaged wall overlays (unmanaged for optimisations) + //? Updating the unmanaged wall overlays (unmanaged for optimisations) overlays.len = 0 var/list/new_overlays = list() @@ -90,7 +106,7 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) var/image/smoothed_stripe = image(stripe_icon, icon_state) smoothed_stripe.appearance_flags = RESET_COLOR - smoothed_stripe.color = stripe_color + smoothed_stripe.color = stripe_paint new_overlays += smoothed_stripe if(shiny_stripe) @@ -101,8 +117,9 @@ GLOBAL_LIST_EMPTY(wall_overlays_cache) if(neighbor_stripe) var/image/neighb_stripe_overlay = image('icons/turf/walls/neighbor_stripe.dmi', "stripe-[neighbor_stripe]") neighb_stripe_overlay.appearance_flags = RESET_COLOR - neighb_stripe_overlay.color = stripe_color + neighb_stripe_overlay.color = stripe_paint new_overlays += neighb_stripe_overlay + if(shiny_wall) var/image/shine = image('icons/turf/walls/neighbor_stripe.dmi', "shine-[neighbor_stripe]") shine.appearance_flags = RESET_COLOR diff --git a/code/game/turfs/simulated/wall_types/wall_types.dm b/code/game/turfs/simulated/wall_types/wall_types.dm index 988e454d9e..dce5db87a5 100644 --- a/code/game/turfs/simulated/wall_types/wall_types.dm +++ b/code/game/turfs/simulated/wall_types/wall_types.dm @@ -435,93 +435,110 @@ I.color = stripe_color add_overlay(I) -/turf/simulated/wall/r_wall/prepainted +/turf/simulated/wall/prepainted + name = "Pre-Painted Wall" color = COLOR_WALL_GUNMETAL paint_color = COLOR_WALL_GUNMETAL - icon_state = "reinforced_solid" -/turf/simulated/wall/r_wall/prepainted/command - stripe_color = COLOR_COMMAND_BLUE +/turf/simulated/wall/prepainted/command color = COLOR_COMMAND_BLUE + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_COMMAND_BLUE -/turf/simulated/wall/r_wall/prepainted/security - stripe_color = COLOR_SECURITY_RED +/turf/simulated/wall/prepainted/command/alt + color = COLOR_GOLD + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_GOLD + +/turf/simulated/wall/prepainted/security color = COLOR_SECURITY_RED + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SECURITY_RED -/turf/simulated/wall/r_wall/prepainted/medical +/turf/simulated/wall/prepainted/medical + color = COLOR_BABY_BLUE paint_color = COLOR_GRAY80 stripe_color = COLOR_BABY_BLUE - color = COLOR_BABY_BLUE -/turf/simulated/wall/r_wall/prepainted/engineering - stripe_color = COLOR_SUN +/turf/simulated/wall/prepainted/engineering color = COLOR_SUN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SUN -/turf/simulated/wall/r_wall/prepainted/engineering/atmos - stripe_color = COLOR_ATMOSPHERICS_CYAN +/turf/simulated/wall/prepainted/engineering/atmos color = COLOR_ATMOSPHERICS_CYAN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_ATMOSPHERICS_CYAN -/turf/simulated/wall/r_wall/prepainted/civilian - stripe_color = COLOR_PALE_BTL_GREEN +/turf/simulated/wall/prepainted/civilian color = COLOR_PALE_BTL_GREEN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_PALE_BTL_GREEN -/turf/simulated/wall/r_wall/prepainted/exploration - stripe_color = COLOR_EXPLO_VIOLET +/turf/simulated/wall/prepainted/exploration color = COLOR_EXPLO_VIOLET + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_EXPLO_VIOLET -/turf/simulated/wall/r_wall/prepainted/science +/turf/simulated/wall/prepainted/science + color = COLOR_PURPLE_GRAY paint_color = COLOR_GRAY80 stripe_color = COLOR_PURPLE_GRAY - color = COLOR_PURPLE_GRAY -/turf/simulated/wall/r_wall/prepainted/cargo - stripe_color = COLOR_CARGO_BROWN +/turf/simulated/wall/prepainted/cargo color = COLOR_CARGO_BROWN - -/turf/simulated/wall/prepainted paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_CARGO_BROWN + + +/turf/simulated/wall/r_wall/prepainted + name = "PRe-Painted Reinforced Wall" + icon_state = "reinforced_solid" color = COLOR_WALL_GUNMETAL - icon_state = "solid" + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_WALL_GUNMETAL -/turf/simulated/wall/prepainted/command - stripe_color = COLOR_COMMAND_BLUE +/turf/simulated/wall/r_wall/prepainted/command color = COLOR_COMMAND_BLUE + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_COMMAND_BLUE -/turf/simulated/wall/prepainted/command/alt - paint_color = COLOR_GRAY15 - stripe_color = COLOR_GOLD - color = COLOR_GOLD - -/turf/simulated/wall/prepainted/security - stripe_color = COLOR_SECURITY_RED +/turf/simulated/wall/r_wall/prepainted/security color = COLOR_SECURITY_RED + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SECURITY_RED -/turf/simulated/wall/prepainted/medical +/turf/simulated/wall/r_wall/prepainted/medical + color = COLOR_BABY_BLUE paint_color = COLOR_GRAY80 stripe_color = COLOR_BABY_BLUE - color = COLOR_BABY_BLUE -/turf/simulated/wall/prepainted/engineering - stripe_color = COLOR_SUN +/turf/simulated/wall/r_wall/prepainted/engineering color = COLOR_SUN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_SUN -/turf/simulated/wall/prepainted/engineering/atmos - stripe_color = COLOR_ATMOSPHERICS_CYAN +/turf/simulated/wall/r_wall/prepainted/engineering/atmos color = COLOR_ATMOSPHERICS_CYAN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_ATMOSPHERICS_CYAN -/turf/simulated/wall/prepainted/civilian - stripe_color = COLOR_PALE_BTL_GREEN +/turf/simulated/wall/r_wall/prepainted/civilian color = COLOR_PALE_BTL_GREEN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_PALE_BTL_GREEN -/turf/simulated/wall/prepainted/exploration - stripe_color = COLOR_EXPLO_VIOLET +/turf/simulated/wall/r_wall/prepainted/exploration color = COLOR_EXPLO_VIOLET + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_EXPLO_VIOLET -/turf/simulated/wall/prepainted/science +/turf/simulated/wall/r_wall/prepainted/science + color = COLOR_PURPLE_GRAY paint_color = COLOR_GRAY80 stripe_color = COLOR_PURPLE_GRAY - color = COLOR_PURPLE_GRAY -/turf/simulated/wall/prepainted/cargo - stripe_color = COLOR_CARGO_BROWN +/turf/simulated/wall/r_wall/prepainted/cargo color = COLOR_CARGO_BROWN + paint_color = COLOR_WALL_GUNMETAL + stripe_color = COLOR_CARGO_BROWN diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 80f34fef98..13cc350358 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -588,7 +588,7 @@ return color = other.color -//? Depth +//* Depth *// /** * gets overall depth level for stuff standing on us @@ -600,20 +600,39 @@ continue . = max(., O.depth_level) -//? Multiz +//* Multiz *// /turf/proc/update_multiz() return -//? Sector API +//* Orientation *// + +/** + * Are we a valid anchor or orientation source for a wall-mounted object? + * + * If so, return the anchor object. + */ +/turf/proc/get_wallmount_anchor() + RETURN_TYPE(/atom) + // are we valid + if(GLOB.wallframe_typecache[type]) + return src + // are our contents valid + for(var/obj/O in contents) + if(GLOB.wallframe_typecache[O.type]) + return O + +//* Sector API *// /** * called by planet / weather to update temperature during weather changes + * + * todo: this is bad lol this either needs more specifications/documentation or a redesign */ /turf/proc/sector_set_temperature(temperature) return -//? Radiation +//* Radiation *// /turf/proc/update_rad_insulation() rad_insulation_contents = 1 diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm index d19d6ac5d8..a0359f7f56 100644 --- a/code/game/verbs/advanced_who.dm +++ b/code/game/verbs/advanced_who.dm @@ -1,3 +1,5 @@ +// todo: combine with advanced who wtf is this shit +// todo: /client/proc/who_query(client/asker, admin_rights, ...) be used for building the string? /client/verb/who_advanced() set name = "Advanced Who" @@ -10,6 +12,10 @@ if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights)) for(var/client/C in GLOB.clients) var/entry = "\t[C.key]" + if(!C.initialized) + entry += " - Uninitialized" + Lines += entry + continue if(C.holder && C.holder.fakekey) entry += " (as [C.holder.fakekey])" entry += " - Playing as [C.mob.real_name]" @@ -54,6 +60,10 @@ else for(var/client/C in GLOB.clients) var/entry = "\t" + if(!C.initialized) + entry += "[C.ckey] - Uninitialized" + Lines += entry + continue if(C.holder && C.holder.fakekey) entry += "[C.holder.fakekey]" else diff --git a/code/game/verbs/character_directory.dm b/code/game/verbs/character_directory.dm index bb241e4ac7..8313016a25 100644 --- a/code/game/verbs/character_directory.dm +++ b/code/game/verbs/character_directory.dm @@ -17,7 +17,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) // This is a global singleton. Keep in mind that all operations should occur on usr, not src. /datum/character_directory -/datum/character_directory/ui_state(mob/user, datum/tgui_module/module) +/datum/character_directory/ui_state() return GLOB.always_state /datum/character_directory/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -26,7 +26,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) ui = new(user, src, "CharacterDirectory", "Character Directory") ui.open() -/datum/character_directory/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/character_directory/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["personalVisibility"] = user?.client?.prefs?.show_in_directory @@ -35,13 +35,16 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) return data -/datum/character_directory/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/character_directory/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/directory_mobs = list() for(var/client/C in GLOB.clients) + if(!C.initialized) + continue + // Allow opt-out. - if(!C?.prefs?.show_in_directory) + if(!C.prefs.show_in_directory) continue // These are the three vars we're trying to find diff --git a/code/game/verbs/character_profile_verbs.dm b/code/game/verbs/character_profile_verbs.dm deleted file mode 100644 index b22b84b95a..0000000000 --- a/code/game/verbs/character_profile_verbs.dm +++ /dev/null @@ -1,16 +0,0 @@ -/client/verb/regenerate_cached_character_appearance() - set name = "Regenerate Cached Profile Appearance" - set category = "OOC" - set desc = "Regenerates the cached appearance of your character in their profile." - - // This is primarily to stop malicious users from trying to lag the server by spamming this verb - if(world.time < usr.next_move) - to_chat(usr, "Don't spam appearance refreshes.") - return - usr.setClickCooldown(10) - - if (usr.name in GLOB.cached_previews) - GLOB.cached_previews[usr.name] = get_flat_icon(usr) - to_chat(usr, SPAN_NOTICE("Your cached appearance has been regenerated.")) - else - to_chat(usr, SPAN_BOLDWARNING("Your current mob was not found in the appearance cache.")) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index ae584e9556..3a9f73e3bf 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -1,3 +1,6 @@ +// todo: combine with advanced who wtf is this shit +// todo: /client/proc/who_query(client/asker, admin_rights, ...) be used for building the string? + /client/verb/who() set name = "Who" set category = "OOC" @@ -9,6 +12,10 @@ if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights)) for(var/client/C in GLOB.clients) var/entry = "\t[C.key]" + if(!C.initialized) + entry += "[C.ckey] - Uninitialized" + Lines += entry + continue if(C.holder && C.holder.fakekey) entry += " (as [C.holder.fakekey])" if(!C.initialized) @@ -76,6 +83,9 @@ var/num_admins_online = 0 if(holder) for(var/client/C in GLOB.admins) + if(!C.initialized) + continue + if(C.holder.fakekey && !((R_ADMIN|R_MOD) & holder.rights)) continue @@ -101,6 +111,8 @@ else for(var/client/C in GLOB.admins) + if(!C.initialized) + continue if(C.holder.fakekey) continue // hidden msg += "\t[C] is a [C.holder.rank]" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ec56a4e3b7..be7e52115d 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1120,6 +1120,8 @@ var/list/admin_verbs_event_manager = list( var/list/client/eligible = GLOB.clients.Copy() for(var/i in eligible) var/client/C = i + if(!C.initialized) + eligible -= C if(!isliving(C.mob)) eligible -= C for(var/role in GLOB.event_role_list) diff --git a/code/modules/admin/verbs/smite.dm b/code/modules/admin/verbs/smite.dm index fed5a65092..5fefe9752d 100644 --- a/code/modules/admin/verbs/smite.dm +++ b/code/modules/admin/verbs/smite.dm @@ -90,10 +90,12 @@ target.electrocute_act(75,def_zone = BP_HEAD) target.visible_message("[target] is struck by lightning!") if(SMITE_AUTOSAVE) - fake_autosave(target, src) + var/time_to_stun = tgui_input_number(src, "How long would you like the saving to take? (in seconds)", "Autosave Time", 10, min_value = 1) + fake_autosave(target, time_to_stun, src) if(SMITE_AUTOSAVE_WIDE) - fake_autosave(target, src, TRUE) + var/time_to_stun = tgui_input_number(src, "How long would you like the saving to take? (in seconds)", "Autosave Time", 10, min_value = 1) + fake_autosave(target, time_to_stun, src, TRUE) if(SMITE_DARKSPACE_ABDUCT) darkspace_abduction(target, src) @@ -140,17 +142,17 @@ target.afflict_paralyze(20 * 20) target.stuttering = 20 -/proc/fake_autosave(var/mob/living/target, var/client/user, var/wide) +/proc/fake_autosave(var/mob/living/target, var/duration, var/client/user, var/wide) if(!istype(target) || !target.client) to_chat(user, "Skipping [target] because they are not a /mob/living or have no client.") return if(wide) for(var/mob/living/L in orange(user.view, user.mob)) - fake_autosave(L, user) + fake_autosave(L, duration, user) return - target.applyMoveCooldown(10 SECONDS) + target.applyMoveCooldown(duration SECONDS) to_chat(target, "Autosaving your progress, please wait...") target << 'sound/effects/ding.ogg' @@ -178,7 +180,7 @@ loader.screen_loc = "NORTH-1, EAST-1" target.client.screen += loader - spawn(10 SECONDS) + spawn(duration SECONDS) if(target) to_chat(target, "Autosave complete!") if(target.client) diff --git a/code/modules/admin/view_variables/color_matrix_editor.dm b/code/modules/admin/view_variables/color_matrix_editor.dm index 5e142d6f7e..f8db046627 100644 --- a/code/modules/admin/view_variables/color_matrix_editor.dm +++ b/code/modules/admin/view_variables/color_matrix_editor.dm @@ -75,16 +75,16 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/color_matrix_proxy_view) QDEL_NULL(proxy_view) return ..() -/datum/color_matrix_editor/ui_state(mob/user, datum/tgui_module/module) +/datum/color_matrix_editor/ui_state() return GLOB.admin_state -/datum/color_matrix_editor/ui_static_data(mob/user) +/datum/color_matrix_editor/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() data["mapRef"] = proxy_view.assigned_map return data -/datum/color_matrix_editor/ui_data(mob/user) +/datum/color_matrix_editor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["currentColor"] = current_color @@ -108,7 +108,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/color_matrix_proxy_view) on_confirm() SStgui.close_uis(src) -/datum/color_matrix_editor/ui_close(mob/user, datum/tgui_module/module) +/datum/color_matrix_editor/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE diff --git a/code/modules/admin/view_variables/filteriffic.dm b/code/modules/admin/view_variables/filteriffic.dm index adf7e795e7..747a7b1a9a 100644 --- a/code/modules/admin/view_variables/filteriffic.dm +++ b/code/modules/admin/view_variables/filteriffic.dm @@ -4,7 +4,7 @@ /datum/filter_editor/New(atom/target) src.target = target -/datum/filter_editor/ui_state(mob/user, datum/tgui_module/module) +/datum/filter_editor/ui_state() return GLOB.admin_state /datum/filter_editor/ui_interact(mob/user, datum/tgui/ui) @@ -13,18 +13,18 @@ ui = new(user, src, "Filteriffic") ui.open() -/datum/filter_editor/ui_static_data(mob/user) +/datum/filter_editor/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() data["filter_info"] = GLOB.master_filter_info return data -/datum/filter_editor/ui_data() +/datum/filter_editor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["target_name"] = target.name data["target_filter_data"] = target.filter_data return data -/datum/filter_editor/ui_act(action, list/params) +/datum/filter_editor/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index 05044b1f7c..e837a16845 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -13,125 +13,6 @@ if(href_list["Vars"]) debug_variables(locate(href_list["Vars"])) -/* TG STUFF PENDING FULL PORT! -//Stuff below aren't in dropdowns/etc. - - if(check_rights(R_VAREDIT)) - - //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). - - if(href_list["rename"]) - if(!check_rights(NONE)) - return - - var/mob/M = locate(href_list["rename"]) in GLOB.mob_list - if(!istype(M)) - to_chat(usr, "This can only be used on instances of type /mob") - return - - var/new_name = stripped_input(usr,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN) - if( !new_name || !M ) - return - - message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].") - M.fully_replace_character_name(M.real_name,new_name) - vv_update_display(M, "name", new_name) - vv_update_display(M, "real_name", M.real_name || "No real name") - - else if(href_list["rotatedatum"]) - if(!check_rights(NONE)) - return - - var/atom/A = locate(href_list["rotatedatum"]) - if(!istype(A)) - to_chat(usr, "This can only be done to instances of type /atom") - return - - switch(href_list["rotatedir"]) - if("right") - A.setDir(turn(A.dir, -45)) - if("left") - A.setDir(turn(A.dir, 45)) - vv_update_display(A, "dir", dir2text(A.dir)) - - - else if(href_list["makehuman"]) - if(!check_rights(R_SPAWN)) - return - - var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list - if(!istype(Mo)) - to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey") - return - - if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") - return - if(!Mo) - to_chat(usr, "Mob doesn't exist anymore") - return - holder.Topic(href, list("humanone"=href_list["makehuman"])) - - else if(href_list["adjustDamage"] && href_list["mobToDamage"]) - if(!check_rights(NONE)) - return - - var/mob/living/L = locate(href_list["mobToDamage"]) in GLOB.mob_list - if(!istype(L)) - return - - var/Text = href_list["adjustDamage"] - - var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num|null - - if (isnull(amount)) - return - - if(!L) - to_chat(usr, "Mob doesn't exist anymore") - return - - var/newamt - switch(Text) - if("brute") - L.adjustBruteLoss(amount) - newamt = L.getBruteLoss() - if("fire") - L.adjustFireLoss(amount) - newamt = L.getFireLoss() - if("toxin") - L.adjustToxLoss(amount) - newamt = L.getToxLoss() - if("oxygen") - L.adjustOxyLoss(amount) - newamt = L.getOxyLoss() - if("brain") - L.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount) - newamt = L.getOrganLoss(ORGAN_SLOT_BRAIN) - if("clone") - L.adjustCloneLoss(amount) - newamt = L.getCloneLoss() - if("stamina") - L.adjustStaminaLoss(amount) - newamt = L.getStaminaLoss() - else - to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]") - return - - if(amount != 0) - var/log_msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [key_name(L)]" - message_admins("[key_name(usr)] dealt [amount] amount of [Text] damage to [ADMIN_LOOKUPFLW(L)]") - log_admin(log_msg) - admin_ticket_log(L, "[log_msg]") - vv_update_display(L, Text, "[newamt]") - - - //Finally, refresh if something modified the list. - if(href_list["datumrefresh"]) - var/datum/DAT = locate(href_list["datumrefresh"]) - if(istype(DAT, /datum) || istype(DAT, /client)) - debug_variables(DAT) -*/ - //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). else if(href_list["rename"]) if(!check_rights(R_VAREDIT)) return @@ -616,8 +497,8 @@ return switch(Text) - if("brute") L.adjustBruteLoss(amount) - if("fire") L.adjustFireLoss(amount) + if("brute") amount > 0? L.take_overall_damage(brute = amount) : L.heal_overall_damage(brute = -amount) + if("fire") amount > 0? L.take_overall_damage(burn = amount) : L.heal_overall_damage(burn = -amount) if("toxin") L.adjustToxLoss(amount) if("oxygen")L.adjustOxyLoss(amount) if("brain") L.adjustBrainLoss(amount) diff --git a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm b/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm index 4aa8cc4845..61468dcf96 100644 --- a/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm +++ b/code/modules/ai/aI_holder_subtypes/slime_xenobio_ai.dm @@ -136,7 +136,7 @@ return rabid = TRUE my_slime.update_mood() - my_slime.visible_message(SPAN_DANGER("\The [src] enrages!")) + my_slime.visible_message(SPAN_DANGER("\The [my_slime] enrages!")) // Called to relax from being rabid (when blue slime core was used). /datum/ai_holder/simple_mob/xenobio_slime/proc/relax() diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 36664ba32c..84b8bba7b2 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -107,7 +107,7 @@ ui_interact(user) return TRUE -/obj/item/device/assembly/ui_state(mob/user, datum/tgui_module/module) +/obj/item/device/assembly/ui_state() return GLOB.deep_inventory_state /obj/item/device/assembly/ui_interact(mob/user, datum/tgui/ui) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index eed0dc9d62..dea3be27a7 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -168,7 +168,7 @@ ui = new(user, src, "AssemblyInfrared", name) ui.open() -/obj/item/assembly/infra/ui_data(mob/user) +/obj/item/assembly/infra/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index f469da1d1f..42e174d9c5 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -35,10 +35,9 @@ if(!H.gloves) affecting = H.get_organ(type) H.afflict_stun(20 * 3) - if(affecting) - if(affecting.take_damage(1, 0)) - H.UpdateDamageIcon() - H.update_health() + affecting?.inflict_bodypart_damage( + brute = 1, + ) else if(ismouse(target)) var/mob/living/simple_mob/animal/passive/mouse/M = target visible_message("SPLAT!") diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 4f4d01326d..73bee40519 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -110,7 +110,7 @@ ui = new(user, src, "AssemblyProx", name) ui.open() -/obj/item/assembly/prox_sensor/ui_data(mob/user) +/obj/item/assembly/prox_sensor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["time"] = time * 10 diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 3b0491d168..c27af1c62f 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -42,7 +42,7 @@ ui = new(user, src, "Signaler", name) ui.open() -/obj/item/assembly/signaler/ui_data(mob/user) +/obj/item/assembly/signaler/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["frequency"] = frequency data["code"] = code @@ -50,7 +50,7 @@ data["maxFrequency"] = RADIO_HIGH_FREQ return data -/obj/item/assembly/signaler/ui_act(action, params) +/obj/item/assembly/signaler/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 2a75005860..45df510a22 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -75,7 +75,7 @@ ui = new(user, src, "AssemblyTimer", name) ui.open() -/obj/item/assembly/timer/ui_data(mob/user) +/obj/item/assembly/timer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/time_left = time data["seconds"] = round(time_left % 60) diff --git a/code/modules/asset_cache/asset_cache_client.dm b/code/modules/asset_cache/asset_cache_client.dm index 3cff8cb41f..a30fcaf5df 100644 --- a/code/modules/asset_cache/asset_cache_client.dm +++ b/code/modules/asset_cache/asset_cache_client.dm @@ -1,4 +1,8 @@ +/client/proc/warn_if_no_asset_cache_browser() + if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. + to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") + /// Process asset cache client topic calls for `"asset_cache_confirm_arrival=[INT]"` /client/proc/asset_cache_confirm_arrival(job_id) var/asset_cache_job = round(text2num(job_id)) diff --git a/code/modules/atmospherics/machinery/air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm.dm index 7b9412ca40..96a13304af 100644 --- a/code/modules/atmospherics/machinery/air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm.dm @@ -11,10 +11,11 @@ GLOBAL_LIST_EMPTY(air_alarms) /area var/obj/machinery/air_alarm/master_air_alarm +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm, 26) /obj/machinery/air_alarm name = "alarm" desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area." - icon = 'icons/obj/monitors.dmi' + icon = 'icons/modules/atmospherics/air_alarm.dmi' icon_state = "alarm0" plane = TURF_PLANE layer = ABOVE_TURF_LAYER @@ -523,7 +524,7 @@ GLOBAL_LIST_EMPTY(air_alarms) ui_interact(user) wires.Interact(user) -/obj/machinery/air_alarm/ui_status(mob/user) +/obj/machinery/air_alarm/ui_status(mob/user, datum/ui_state/state) if(isAI(user) && aidisabled) to_chat(user, "AI control has been disabled.") else if(!shorted) @@ -538,7 +539,7 @@ GLOBAL_LIST_EMPTY(air_alarms) ui.set_state(state) ui.open() -/obj/machinery/air_alarm/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/air_alarm/ui_data(mob/user, datum/tgui/ui) . = ..() var/datum/gas_mixture/environment = loc.return_air() .["environment"] = environment.tgui_analyzer_scan(GAS_GROUP_REAGENT | GAS_GROUP_UNKNOWN) @@ -572,7 +573,7 @@ GLOBAL_LIST_EMPTY(air_alarms) . += data //! end -/obj/machinery/air_alarm/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/air_alarm/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["gasContext"] = global.gas_data.tgui_gas_context() .["gasTLV"] = tlv_ids @@ -588,7 +589,7 @@ GLOBAL_LIST_EMPTY(air_alarms) data["temperatureTLV"] = tlv_temperature push_ui_data(data = data) -/obj/machinery/air_alarm/ui_act(action, params, datum/tgui/ui) +/obj/machinery/air_alarm/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -767,6 +768,7 @@ GLOBAL_LIST_EMPTY(air_alarms) #undef TEST_TLV_VALUES #undef DECLARE_TLV_VALUES +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/alarms_hidden, 26) /obj/machinery/air_alarm/alarms_hidden alarms_hidden = TRUE @@ -780,6 +782,7 @@ GLOBAL_LIST_EMPTY(air_alarms) pixel_x = (dir & 3) ? 0 : (dir == 4 ? -21 : 21) pixel_y = (dir & 3) ? (dir == 1 ? -18 : 20) : 0 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/freezer, 26) /obj/machinery/air_alarm/freezer target_temperature = T0C - 13.15 // Chilly freezer room @@ -788,13 +791,16 @@ GLOBAL_LIST_EMPTY(air_alarms) tlv_temperature = list(T0C - 40, T0C - 20, T0C + 40, T0C + 60) return ..() +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/monitor, 26) /obj/machinery/air_alarm/monitor report_danger_level = 0 breach_detection = 0 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/nobreach, 26) /obj/machinery/air_alarm/nobreach breach_detection = 0 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/server, 26) /obj/machinery/air_alarm/server/Initialize(mapload) . = ..() req_access = list(ACCESS_SCIENCE_RD, ACCESS_ENGINEERING_ATMOS, ACCESS_ENGINEERING_ENGINE) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm b/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm index 912826c250..799768392e 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/algae_generator_vr.dm @@ -171,7 +171,7 @@ ui = new(user, src, "AlgaeFarm", name) ui.open() -/obj/machinery/atmospherics/component/binary/algae_farm/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/algae_farm/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["panelOpen"] = panel_open @@ -207,7 +207,7 @@ return data -/obj/machinery/atmospherics/component/binary/algae_farm/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/algae_farm/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm index 9f7248f61d..c82a1c20ac 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm @@ -196,7 +196,7 @@ ui = new(user, src, "heat_pump", name) ui.open() -/obj/machinery/atmospherics/component/binary/heat_pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/heat_pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["target_temp"] = target_temp data["current_temp"] = air2.temperature @@ -209,10 +209,10 @@ return data -/obj/machinery/atmospherics/component/binary/heat_pump/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/atmospherics/component/binary/heat_pump/ui_state() return GLOB.physical_state -/obj/machinery/atmospherics/component/binary/heat_pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/heat_pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm index 0dc4032904..0ac892f84e 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/massive_gas_pump.dm @@ -132,7 +132,7 @@ ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -156,7 +156,7 @@ return ui_interact(user) -/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/massive_gas_pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm index b689c6986e..78d3670892 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm @@ -165,7 +165,7 @@ ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -192,7 +192,7 @@ return ui_interact(user) -/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/massive_heat_pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 5582317cce..a93a66e7a0 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -186,7 +186,7 @@ ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/passive_gate/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/passive_gate/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -202,7 +202,7 @@ return data -/obj/machinery/atmospherics/component/binary/passive_gate/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/passive_gate/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index f9742e64da..5420eaf6c4 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -183,7 +183,7 @@ Thus, the two variables affect pump operation are set in New(): ui.open() //This is the data which will be sent to the ui -/obj/machinery/atmospherics/component/binary/pump/ui_data(mob/user) +/obj/machinery/atmospherics/component/binary/pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data = list( @@ -240,7 +240,7 @@ Thus, the two variables affect pump operation are set in New(): return ui_interact(user) -/obj/machinery/atmospherics/component/binary/pump/ui_act(action, params) +/obj/machinery/atmospherics/component/binary/pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/component.dm b/code/modules/atmospherics/machinery/components/component.dm index 1b095b237c..5948abc1c6 100644 --- a/code/modules/atmospherics/machinery/components/component.dm +++ b/code/modules/atmospherics/machinery/components/component.dm @@ -70,15 +70,15 @@ // todo: use a special state to handle multitool hijacking -// /obj/machinery/atmospherics/component/ui_state(mob/user, datum/tgui_module/module) +// /obj/machinery/atmospherics/component/ui_state() // return GLOB.default_state -/obj/machinery/atmospherics/component/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["powerRating"] = power_maximum .["controlFlags"] = atmos_component_ui_flags -/obj/machinery/atmospherics/component/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/ui_data(mob/user, datum/tgui/ui) . = ..() if(!tgui_interface) return diff --git a/code/modules/atmospherics/machinery/components/omni_devices/filter.dm b/code/modules/atmospherics/machinery/components/omni_devices/filter.dm index 09ec71b720..a9e9720d72 100644 --- a/code/modules/atmospherics/machinery/components/omni_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/omni_devices/filter.dm @@ -96,7 +96,7 @@ ui.open() -/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_data(mob/user) +/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["power"] = use_power @@ -150,7 +150,7 @@ else return null -/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_act(action, params) +/obj/machinery/atmospherics/component/quaternary/atmos_filter/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm b/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm index ee481208f0..b91f390752 100644 --- a/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/omni_devices/mixer.dm @@ -130,7 +130,7 @@ ui = new(user, src, "OmniMixer", name) ui.open() -/obj/machinery/atmospherics/component/quaternary/mixer/ui_data(mob/user) +/obj/machinery/atmospherics/component/quaternary/mixer/ui_data(mob/user, datum/tgui/ui) var/list/data = new() data["power"] = use_power @@ -163,7 +163,7 @@ return data -/obj/machinery/atmospherics/component/quaternary/mixer/ui_act(action, params) +/obj/machinery/atmospherics/component/quaternary/mixer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index cd89e66710..9b4494fb2e 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -71,17 +71,17 @@ /obj/machinery/atmospherics/component/trinary/filter/proc/set_rate(liters) flow_setting = clamp(liters, 0, air1.volume) -/obj/machinery/atmospherics/component/trinary/filter/ui_data(mob/user) +/obj/machinery/atmospherics/component/trinary/filter/ui_data(mob/user, datum/tgui/ui) . = ..() .["filtering"] = filtering .["maxRate"] = air1.volume .["rate"] = flow_setting -/obj/machinery/atmospherics/component/trinary/filter/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/trinary/filter/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["atmosContext"] = global.gas_data.tgui_gas_context() -/obj/machinery/atmospherics/component/trinary/filter/ui_act(action, params) +/obj/machinery/atmospherics/component/trinary/filter/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index c0f8e340a3..3d096b6137 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -83,7 +83,7 @@ ui = new(user, src, "AtmosMixer", name) ui.open() -/obj/machinery/atmospherics/component/trinary/mixer/ui_data(mob/user) +/obj/machinery/atmospherics/component/trinary/mixer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["on"] = use_power data["set_pressure"] = round(set_flow_rate) @@ -100,7 +100,7 @@ return ui_interact(user) -/obj/machinery/atmospherics/component/trinary/mixer/ui_act(action, params) +/obj/machinery/atmospherics/component/trinary/mixer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm index fd7bafa66c..9075c54bb3 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/molar_filter.dm @@ -69,7 +69,7 @@ /obj/machinery/atmospherics/component/trinary/molar_filter/proc/set_rate(liters) flow_setting = clamp(liters, 0, air1.volume) -/obj/machinery/atmospherics/component/trinary/molar_filter/ui_data(mob/user) +/obj/machinery/atmospherics/component/trinary/molar_filter/ui_data(mob/user, datum/tgui/ui) . = ..() .["lower"] = mass_lower .["upper"] = mass_upper @@ -77,7 +77,7 @@ .["maxRate"] = air1.volume .["rate"] = flow_setting -/obj/machinery/atmospherics/component/trinary/molar_filter/ui_act(action, params) +/obj/machinery/atmospherics/component/trinary/molar_filter/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/components/unary/cold_sink.dm b/code/modules/atmospherics/machinery/components/unary/cold_sink.dm index 96f1741872..e0df0c43d5 100644 --- a/code/modules/atmospherics/machinery/components/unary/cold_sink.dm +++ b/code/modules/atmospherics/machinery/components/unary/cold_sink.dm @@ -68,7 +68,7 @@ ui = new(user, src, "GasTemperatureSystem", name) ui.open() -/obj/machinery/atmospherics/component/unary/freezer/ui_data(mob/user) +/obj/machinery/atmospherics/component/unary/freezer/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/data[0] data["on"] = use_power ? 1 : 0 @@ -88,7 +88,7 @@ return data -/obj/machinery/atmospherics/component/unary/freezer/ui_act(action, params) +/obj/machinery/atmospherics/component/unary/freezer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/unary/heat_source.dm b/code/modules/atmospherics/machinery/components/unary/heat_source.dm index 4e37184dbd..1e3a14a325 100644 --- a/code/modules/atmospherics/machinery/components/unary/heat_source.dm +++ b/code/modules/atmospherics/machinery/components/unary/heat_source.dm @@ -82,7 +82,7 @@ ui = new(user, src, "GasTemperatureSystem", name) ui.open() -/obj/machinery/atmospherics/component/unary/heater/ui_data(mob/user) +/obj/machinery/atmospherics/component/unary/heater/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["on"] = use_power ? 1 : 0 @@ -100,7 +100,7 @@ return data -/obj/machinery/atmospherics/component/unary/heater/ui_act(action, params) +/obj/machinery/atmospherics/component/unary/heater/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm index 4314a1d5a4..22662a5f22 100644 --- a/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary/outlet_injector.dm @@ -102,14 +102,14 @@ ui = new(user, src, "AtmosPump", name) ui.open() -/obj/machinery/atmospherics/component/unary/outlet_injector/ui_data() +/obj/machinery/atmospherics/component/unary/outlet_injector/ui_data(mob/user, datum/tgui/ui) var/data = list() data["on"] = injecting data["rate"] = round(volume_rate) data["max_rate"] = round(air_contents.volume) return data -/obj/machinery/atmospherics/component/unary/outlet_injector/ui_act(action, params) +/obj/machinery/atmospherics/component/unary/outlet_injector/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/modules/atmospherics/machinery/components/unary/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary/vent_pump.dm index 086b243e4b..29295778aa 100644 --- a/code/modules/atmospherics/machinery/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary/vent_pump.dm @@ -161,7 +161,7 @@ var/pressure_delta = get_pressure_delta(environment) //src.visible_message("DEBUG >>> [src]: pressure_delta = [pressure_delta]") - if((environment.temperature || air_contents.temperature) && pressure_delta > 0.5) + if((environment.temperature || air_contents.temperature) && pressure_delta > 0.05) if(pump_direction) //internal -> external var/transfer_moles = calculate_transfer_moles(air_contents, environment, pressure_delta) power_draw = pump_gas(src, air_contents, environment, transfer_moles, power_rating) @@ -312,7 +312,7 @@ ui = new(user, src, "AtmosVentPump") ui.open() -/obj/machinery/atmospherics/component/unary/vent_pump/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/unary/vent_pump/ui_data(mob/user, datum/tgui/ui) . = ..() .["state"] = ui_vent_data() .["name"] = name @@ -482,7 +482,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on on = TRUE - icon_state = "map_vent_out" + icon_state = "map_vent_out_retro" /obj/machinery/atmospherics/component/unary/vent_pump/retro/on/welded welded = 1 diff --git a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm index 2a5bce6b6b..ba665cace6 100644 --- a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm @@ -318,11 +318,11 @@ scrub_groups ^= target return TRUE -/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_data(mob/user, datum/tgui/ui) . = ..() .["state"] = ui_scrubber_data() -/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atmospherics/component/unary/vent_scrubber/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["gasContext"] = global.gas_data.tgui_gas_context() .["name"] = name @@ -396,15 +396,11 @@ //! legacy below - if(signal.data["status"] != null) - spawn(2) - broadcast_status() - return //do not update_icon - -// log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]") spawn(2) broadcast_status() - update_icon() + + if(signal.data["status"] == null) + update_icon() //* Subtypes @@ -420,7 +416,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on on = TRUE - icon_state = "map_scrubber_on" + icon_state = "map_scrubber_on_retro" /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on/welded welded = 1 diff --git a/code/modules/atmospherics/machinery/mainspipe.dm b/code/modules/atmospherics/machinery/mainspipe.dm index 385c631e5d..dfccd70ae3 100644 --- a/code/modules/atmospherics/machinery/mainspipe.dm +++ b/code/modules/atmospherics/machinery/mainspipe.dm @@ -368,19 +368,26 @@ /obj/machinery/atmospherics/mains_pipe/split/return_network(A) return split_node.return_network(A) - +/* /obj/machinery/atmospherics/mains_pipe/split/supply icon_type = "supply" /obj/machinery/atmospherics/mains_pipe/split/Initialize(mapload) . = ..() split_node = supply - -/obj/machinery/atmospherics/mains_pipe/split/hidden +*/ +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply level = 1 icon_state = "split-supply-f" +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers + level = 1 + icon_state = "split-scrubbers-f" +/obj/machinery/atmospherics/mains_pipe/split/hidden/aux + level = 1 + icon_state = "split-aux-f" -/obj/machinery/atmospherics/mains_pipe/split/visible + +/obj/machinery/atmospherics/mains_pipe/split/visible/suppy level = 2 icon_state = "split-supply" @@ -391,9 +398,6 @@ . = ..() split_node = scrubbers -/obj/machinery/atmospherics/mains_pipe/split/hidden - level = 1 - icon_state = "split-scrubbers-f" /obj/machinery/atmospherics/mains_pipe/split/visible level = 2 @@ -406,10 +410,6 @@ . = ..() split_node = aux -/obj/machinery/atmospherics/mains_pipe/split/hidden - level = 1 - icon_state = "split-aux-f" - /obj/machinery/atmospherics/mains_pipe/split/visible level = 2 icon_state = "split-aux" diff --git a/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm b/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm index e4ea08ae3d..b7f1e566ce 100644 --- a/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm +++ b/code/modules/atmospherics/machinery/portable/area_atmos_computer.dm @@ -34,7 +34,7 @@ ui = new(user, src, "AreaScrubberControl", name) ui.open() -/obj/machinery/computer/area_atmos/ui_data(mob/user) +/obj/machinery/computer/area_atmos/ui_data(mob/user, datum/tgui/ui) var/list/working = list() for(var/id in connectedscrubbers) var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber = connectedscrubbers[id] @@ -53,7 +53,7 @@ return list("scrubbers" = working) -/obj/machinery/computer/area_atmos/ui_act(action, params) +/obj/machinery/computer/area_atmos/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index d1b24dcbde..2aa49452e0 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -299,7 +299,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attack_hand(mob/user, list/params) return src.ui_interact(user) -/obj/machinery/portable_atmospherics/canister/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/portable_atmospherics/canister/ui_state() return GLOB.physical_state /obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, datum/tgui/ui) @@ -308,7 +308,7 @@ update_flag ui = new(user, src, "Canister", name) ui.open() -/obj/machinery/portable_atmospherics/canister/ui_static_data(mob/user) +/obj/machinery/portable_atmospherics/canister/ui_static_data(mob/user, datum/tgui/ui) return list( "defaultReleasePressure" = round(CAN_DEFAULT_RELEASE_PRESSURE), "minReleasePressure" = round(can_min_release_pressure), @@ -318,7 +318,7 @@ update_flag "holdingTankFragPressure" = round(TANK_FRAGMENT_PRESSURE) ) -/obj/machinery/portable_atmospherics/canister/ui_data() +/obj/machinery/portable_atmospherics/canister/ui_data(mob/user, datum/tgui/ui) . = list( "portConnected" = !!connected_port, "tankPressure" = round(air_contents.return_pressure()), @@ -347,7 +347,7 @@ update_flag ) ) -/obj/machinery/portable_atmospherics/canister/ui_act(action, params) +/obj/machinery/portable_atmospherics/canister/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 056f5d25cd..07e76b1e7e 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -86,13 +86,13 @@ ui = new(user, src, tgui_interface) ui.open() -/obj/machinery/portable_atmospherics/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["controlFlags"] = atmos_portable_ui_flags .["useCharge"] = FALSE .["flowMax"] = flow_maximum -/obj/machinery/portable_atmospherics/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/ui_data(mob/user, datum/tgui/ui) . = ..() .["flow"] = flow_current .["flowSetting"] = flow_setting diff --git a/code/modules/atmospherics/machinery/portable/powered.dm b/code/modules/atmospherics/machinery/portable/powered.dm index 9fcc1a0473..f84ae88b01 100644 --- a/code/modules/atmospherics/machinery/portable/powered.dm +++ b/code/modules/atmospherics/machinery/portable/powered.dm @@ -30,14 +30,14 @@ return 1 return 0 -/obj/machinery/portable_atmospherics/powered/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/powered/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["useCharge"] = TRUE .["maxCharge"] = isnull(cell)? 0 : cell.maxcharge .["powerRating"] = power_maximum .["useCell"] = use_cell -/obj/machinery/portable_atmospherics/powered/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/powered/ui_data(mob/user, datum/tgui/ui) . = ..() .["charge"] = isnull(cell)? 0 : cell.charge if(atmos_portable_ui_flags & (ATMOS_PORTABLE_UI_SEE_POWER | ATMOS_PORTABLE_UI_SET_POWER)) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index deb7c648c9..e3fea77858 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -113,10 +113,10 @@ ui.open() -/obj/machinery/portable_atmospherics/powered/pump/ui_state(mob/user, datum/tgui_module/module) +/obj/machinery/portable_atmospherics/powered/pump/ui_state() return GLOB.physical_state -/obj/machinery/portable_atmospherics/powered/pump/ui_data(mob/user) +/obj/machinery/portable_atmospherics/powered/pump/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["on"] = on ? TRUE : FALSE @@ -142,7 +142,7 @@ return data -/obj/machinery/portable_atmospherics/powered/pump/ui_act(action, params) +/obj/machinery/portable_atmospherics/powered/pump/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index c94ccf5d2e..9db12e6bd6 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -55,17 +55,17 @@ //! LEGACY ABOVE -/obj/machinery/portable_atmospherics/powered/scrubber/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/portable_atmospherics/powered/scrubber/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["atmosContext"] = global.gas_data.tgui_gas_context() .["scrubbingIds"] = scrubbing_ids .["scrubbingGroups"] = scrubbing_groups -/obj/machinery/portable_atmospherics/powered/scrubber/ui_data(mob/user) +/obj/machinery/portable_atmospherics/powered/scrubber/ui_data(mob/user, datum/tgui/ui) . = ..() .["moleRate"] = transfer_current -/obj/machinery/portable_atmospherics/powered/scrubber/ui_act(action, params) +/obj/machinery/portable_atmospherics/powered/scrubber/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -96,7 +96,7 @@ /obj/machinery/portable_atmospherics/powered/scrubber/process(delta_time) ..() - if(on && cell?.charge) + if(on && (cell?.charge || !use_cell)) var/datum/gas_mixture/scrubbing = isnull(holding)? loc.return_air() : holding.air_contents var/old_mols = scrubbing.total_moles // todo: compensate for delta_time, right now this is not stable and will go faster/slower based on SSair tick rate. diff --git a/code/modules/cargo/supplypacks/hydroponics.dm b/code/modules/cargo/supplypacks/hydroponics.dm index 7c3ceea420..61b7d0fd24 100644 --- a/code/modules/cargo/supplypacks/hydroponics.dm +++ b/code/modules/cargo/supplypacks/hydroponics.dm @@ -238,12 +238,9 @@ container_name = "Glacicorn crate" access = ACCESS_GENERAL_BOTANY -/datum/supply_pack/hydro/cow +/datum/supply_pack/hydro/furnacegrub name = "Furnace Grub crate" cost = 40 container_type = /obj/structure/largecrate/animal/furnacegrub container_name = "Furnace Grub crate" access = ACCESS_GENERAL_BOTANY - - - diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index bbc85354d3..30684835ef 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -74,7 +74,7 @@ // Tgui Topic middleware - if(tgui_Topic(href_list)) + if(tgui_topic(href_list)) if(CONFIG_GET(flag/emergency_tgui_logging)) log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]") return @@ -149,11 +149,18 @@ return 1 - /////////// //CONNECT// /////////// +/** + * Linter check, do not call. + */ +/proc/lint__check_client_new_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/client/C + C.New() + /client/New(TopicData) //* pre-connect-ish // set appadmin for profiling or it might not work (?) (this is old code we just assume it's here for a reason) @@ -165,9 +172,12 @@ return null // kick out guests if(!config_legacy.guests_allowed && is_guest() && !is_localhost()) - alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK") - del(src) - return + security_kick( + message = "This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.", + tell_user = TRUE, + immediate = TRUE, + ) + return null // pre-connect greeting to_chat(src, "If the title screen is black, resources are still downloading. Please be patient until the title screen appears.") // register in globals @@ -195,11 +205,11 @@ //* Setup user interface // todo: move top level menu here, for now it has to be under prefs. // Instantiate statpanel - statpanel_boot() + addtimer(CALLBACK(src, PROC_REF(statpanel_boot)), 0) // Instantiate tgui panel tgui_panel = new(src, "browseroutput") // Instantiate cutscene system - init_cutscene_system() + addtimer(CALLBACK(src, PROC_REF(init_cutscene_system)), 0) //* Setup admin tooling GLOB.ahelp_tickets.ClientLogin(src) @@ -262,10 +272,7 @@ // start caching it immediately INVOKE_ASYNC(SSipintel, TYPE_PROC_REF(/datum/controller/subsystem/ipintel, vpn_connection_check), address, ckey) // run onboarding gauntlet - if(!onboarding()) - if(!queued_security_kick) - security_kick("Unknown error during client init. Contact staff on Discord.", TRUE) - return FALSE + INVOKE_ASYNC(src, PROC_REF(onboarding)) //* Initialize Input if(SSinput.initialized) @@ -276,7 +283,7 @@ // initialize statbrowser // (we don't, the JS does it for us. by signalling statpanel_ready().) // Initialize tgui panel - tgui_panel.initialize() + INVOKE_ASYNC(tgui_panel, TYPE_PROC_REF(/datum/tgui_panel, initialize)) // initialize cutscene browser // (we don't, the JS does it for us.) @@ -325,12 +332,13 @@ to_chat(src, "You have unread updates in the changelog.") winset(src, "infowindow.changelog", "background-color=#eaeaea;font-style=bold") if(config_legacy.aggressive_changelog) - changelog() + changelog_async() - if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. - to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") + // ensure asset cache is there + INVOKE_ASYNC(src, PROC_REF(warn_if_no_asset_cache_browser)) - hook_vr("client_new",list(src)) + // todo: fuck you voreprefs + prefs_vr = new /datum/vore_preferences(src) if(config_legacy.paranoia_logging) if(isnum(player.player_age) && player.player_age == -1) @@ -353,6 +361,14 @@ //DISCONNECT// ////////////// +/** + * Linter check, do not call. + */ +/proc/lint__check_client_del_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/client/C + C.Del() + /client/Del() if(!gc_destroyed) Destroy() //Clean up signals and timers. diff --git a/code/modules/client/client_data.dm b/code/modules/client/data/client_data.dm similarity index 95% rename from code/modules/client/client_data.dm rename to code/modules/client/data/client_data.dm index 056317a2c6..8e1387b858 100644 --- a/code/modules/client/client_data.dm +++ b/code/modules/client/data/client_data.dm @@ -13,9 +13,6 @@ GLOBAL_LIST_EMPTY(client_data) * client data datums, to hold * round-based data that we don't want wiped * by a disconnect. - * - * this can absolutely contain player specific data, especially if we don't - * want to reload it every connect. */ /datum/client_data /// owner ckey @@ -24,9 +21,9 @@ GLOBAL_LIST_EMPTY(client_data) var/key /// absolutely, positively annihilated var/ligma = FALSE - /// byond account join date + /// byond account join date; null = not loaded var/account_join - /// byond account age + /// byond account age; null = not loaded var/account_age /// is guest var/is_guest @@ -50,7 +47,7 @@ GLOBAL_LIST_EMPTY(client_data) is_guest = IsGuestKey(key) - load_account_age() + INVOKE_ASYNC(src, PROC_REF(load_account_age)) var/list/the_cheese_touch = CONFIG_GET(keyed_list/shadowban) var/client/C = GLOB.directory[src.ckey] @@ -68,6 +65,44 @@ GLOBAL_LIST_EMPTY(client_data) log_shadowban("[ckey] autobanned based on [why].") message_admins(SPAN_DANGER("Automatically shadowbanning [ckey] based on configuration (matched on [why]). Varedit client.persistent.ligma to change this.")) +/datum/client_data/proc/block_on_account_age_loaded(timeout = INFINITY) + var/timed_out = world.time + timeout + UNTIL(!isnull(account_age) || world.time > timed_out) + return account_age + +/datum/client_data/proc/load_account_age() + if(is_guest) + account_age = 0 + return + var/list/http = world.Export("http://byond.com/members/[ckey]?format=text") + if(!http) + log_world("Failed to connect to byond age check for [ckey]") + return + var/F = file2text(http["CONTENT"]) + . = null + if(F) + // year-month-day + var/regex/R = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"") + if(R.Find(F)) + var/str = R.group[1] + account_join = str + if(!SSdbcore.Connect()) + account_age = null + return + var/datum/db_query/query = SSdbcore.RunQuery( + "SELECT DATEDIFF(Now(), :date)", + list( + "date" = str, + ) + ) + if(query.NextRow()) + . = text2num(query.item[1]) + else + CRASH("Age check regex failed for [src.ckey]") + account_age = . + +//* External - Playtime *// + /datum/client_data/proc/load_playtime() set waitfor = FALSE if(playtime_loaded) @@ -112,39 +147,3 @@ GLOBAL_LIST_EMPTY(client_data) var/timed_out = world.time + timeout load_playtime() UNTIL(playtime_loaded || world.time > timed_out) - -/datum/client_data/proc/block_on_account_age_loaded(timeout = INFINITY) - var/timed_out = world.time + timeout - UNTIL(!isnull(account_age) || world.time > timed_out) - return account_age - -/datum/client_data/proc/load_account_age() - if(is_guest) - account_age = 0 - return - var/list/http = world.Export("http://byond.com/members/[ckey]?format=text") - if(!http) - log_world("Failed to connect to byond age check for [ckey]") - return - var/F = file2text(http["CONTENT"]) - . = null - if(F) - // year-month-day - var/regex/R = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"") - if(R.Find(F)) - var/str = R.group[1] - account_join = str - if(!SSdbcore.Connect()) - account_age = null - return - var/datum/db_query/query = SSdbcore.RunQuery( - "SELECT DATEDIFF(Now(), :date)", - list( - "date" = str, - ) - ) - if(query.NextRow()) - . = text2num(query.item[1]) - else - CRASH("Age check regex failed for [src.ckey]") - account_age = . diff --git a/code/modules/client/player_data.dm b/code/modules/client/data/player_data.dm similarity index 98% rename from code/modules/client/player_data.dm rename to code/modules/client/data/player_data.dm index 51f18a385f..b66b1f7ab3 100644 --- a/code/modules/client/player_data.dm +++ b/code/modules/client/data/player_data.dm @@ -1,3 +1,5 @@ +// todo: this has to be globally cached for new admin panel + /** * holds db-related data * loaded every connect diff --git a/code/modules/client/onboarding/_onboarding.dm b/code/modules/client/onboarding/_onboarding.dm index 5fa68709b1..fac960325d 100644 --- a/code/modules/client/onboarding/_onboarding.dm +++ b/code/modules/client/onboarding/_onboarding.dm @@ -4,10 +4,6 @@ * client should already be logged to DB at this point. */ /client/proc/onboarding() - if(!security_checks()) - return FALSE - if(!panic_bunker()) - return FALSE - if(!age_verification()) - return FALSE - return TRUE + security_checks() + panic_bunker() + age_verification() diff --git a/code/modules/client/onboarding/age_verification.dm b/code/modules/client/onboarding/age_verification.dm index 9f85b5f041..22ed9ebc50 100644 --- a/code/modules/client/onboarding/age_verification.dm +++ b/code/modules/client/onboarding/age_verification.dm @@ -1,4 +1,8 @@ /client/proc/age_verification() + set waitfor = FALSE + age_verification_impl() + +/client/proc/age_verification_impl() if(!SSdbcore.Connect()) return TRUE if(!player.block_on_available(10 SECONDS)) @@ -40,7 +44,7 @@ GLOBAL_DATUM_INIT(age_verify_menu, /datum/age_verify_menu, new) ui = new(user, src, "AgeVerifyMenu") ui.open() -/datum/age_verify_menu/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/age_verify_menu/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE /datum/age_verify_menu/ui_act(action, list/params, datum/tgui/ui) diff --git a/code/modules/client/onboarding/security_checks.dm b/code/modules/client/onboarding/security_checks.dm index fbf15c4e16..dd2eaf5060 100644 --- a/code/modules/client/onboarding/security_checks.dm +++ b/code/modules/client/onboarding/security_checks.dm @@ -5,6 +5,10 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( )) /client/proc/security_checks() + set waitfor = FALSE + security_checks_impl() + +/client/proc/security_checks_impl() if(byond_version < 513) security_kick("BYOND 512 and prior clients are too outdated.", tell_user = TRUE) return FALSE diff --git a/code/modules/client/security.dm b/code/modules/client/security.dm index b5506b80ed..d29a1ee689 100644 --- a/code/modules/client/security.dm +++ b/code/modules/client/security.dm @@ -31,7 +31,7 @@ * queues a security kick * ensures the client's around for atleast delay or after current proc chain is over */ -/client/proc/queue_security_kick(delay) +/client/proc/queue_security_kick(delay = 0) var/left = isnull(queued_security_kick)? null : timeleft(queued_security_kick) if(isnull(left) || left < delay) deltimer(queued_security_kick) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 578b34a6c5..ee6a11fd80 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -127,6 +127,9 @@ ooc_style = "admin" for(var/client/target in GLOB.clients) + if(!target.initialized) + continue + if(target.is_preference_enabled(/datum/client_preference/show_ooc)) if(target.is_key_ignored(key)) // If we're ignored by this person, then do nothing. continue diff --git a/code/modules/clothing/gloves/arm_guards.dm b/code/modules/clothing/gloves/arm_guards.dm index 157bb6f752..837c252dc9 100644 --- a/code/modules/clothing/gloves/arm_guards.dm +++ b/code/modules/clothing/gloves/arm_guards.dm @@ -68,7 +68,7 @@ siemens_coefficient = 0.6 armor_type = /datum/armor/station/tactical min_cold_protection_temperature = T0C - 20 - cold_protection = ARMS + cold_protection_cover = ARMS /obj/item/clothing/gloves/arm_guard/combat/imperial name = "imperial gauntlets" diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 72ec4d46fe..99219b21ef 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -28,9 +28,9 @@ icon_state = "black" permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/orange @@ -84,9 +84,9 @@ icon_state = "evening_gloves" addblends = "evening_gloves_a" - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/fingerless diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 018ff2273c..f8acad27a1 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -18,9 +18,9 @@ item_state = "black" permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/swat @@ -30,9 +30,9 @@ item_state = "swat" siemens_coefficient = 0.50 permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves @@ -42,9 +42,9 @@ item_state = "swat" siemens_coefficient = 0 permeability_coefficient = 0.05 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE armor_type = /datum/armor/gloves/combat @@ -122,9 +122,9 @@ drop_sound = 'sound/items/drop/metalboots.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/knuckledusters @@ -218,7 +218,7 @@ desc = "A series of armwraps. Makes you pretty keen to start punching people." icon_state = "armwraps" body_cover_flags = ARMS - cold_protection = ARMS + cold_protection_cover = ARMS strip_delay = 300 //you can't just yank them off obj_flags = UNIQUE_RENAME /// did you ever get around to wearing these or no @@ -447,7 +447,7 @@ item_state = "mauler_gauntlets" transfer_prints = FALSE body_cover_flags = ARMS|HANDS - cold_protection = ARMS|HANDS + cold_protection_cover = ARMS|HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT armor = list("melee" = 30, "bullet" = 30, "laser" = 10, "energy" = 10, "bomb" = 55, "bio" = 15, "rad" = 15, "fire" = 80, "acid" = 50) @@ -490,7 +490,7 @@ icon_state = "tackle" item_state = "tackle" transfer_prints = TRUE - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT resistance_flags = NONE //custom_premium_price = PRICE_EXPENSIVE @@ -549,9 +549,9 @@ tackle_range = 5 skill_mod = 3 - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT - heat_protection = HANDS + heat_protection_cover = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE strip_mod = 1.2 // because apparently black gloves had this @@ -634,8 +634,8 @@ desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms." icon_state = "bracers" body_cover_flags = ARMS - cold_protection = HANDS - heat_protection = HANDS + cold_protection_cover = HANDS + heat_protection_cover = HANDS armor_type = /datum/armor/general/bone /obj/item/clothing/gloves/hasie @@ -648,7 +648,7 @@ name = "Utility Fur Gloves" desc = "Warm fur gloves to match the Utility Fur coat." icon_state = "furug" - cold_protection = HANDS + cold_protection_cover = HANDS min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/gloves/darkcleric diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 9ce78e2ca5..021d4f2d12 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -20,7 +20,7 @@ /obj/item/clothing/head/hardhat/red icon_state = "hardhat0_red" name = "firefighter helmet" - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0.2* ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE @@ -29,7 +29,7 @@ /obj/item/clothing/head/hardhat/white icon_state = "hardhat0_white" name = "sleek hard hat" - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0.2* ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c8211e073a..f7f73b1fbf 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -7,9 +7,9 @@ restricted_accessory_slots = ACCESSORY_SLOT_HELM_C|ACCESSORY_SLOT_HELM_R armor_type = /datum/armor/station/medium inv_hide_flags = HIDEEARS|BLOCKHEADHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 w_class = ITEMSIZE_NORMAL @@ -122,7 +122,7 @@ light_overlay = "helmet_light_dual_green" action_button_name = "Toggle Head-light" min_cold_protection_temperature = T0C - 20 - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/helmet/swat name = "\improper SWAT helmet" @@ -130,7 +130,7 @@ icon_state = "swat" armor_type = /datum/armor/centcom/deathsquad inv_hide_flags = HIDEEARS|HIDEEYES|BLOCKHEADHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.5 encumbrance = ITEM_ENCUMBRANCE_ARMOR_HEAVY_HELMET @@ -153,7 +153,7 @@ desc = "'Let the battle commence!'" icon_state = "thunderdome" armor_type = /datum/armor/thunderdome - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 1 @@ -205,7 +205,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "head_m", SLOT_ID_LEFT_HAND = "head_m") armor_type = /datum/armor/head/augment_helmet inv_hide_flags = HIDEEARS|HIDEEYES|BLOCKHEADHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.5 valid_accessory_slots = null diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index 0b1850fbc9..cd195bb036 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -3,7 +3,7 @@ desc = "A generic hood." icon_state = "generic_hood" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD inv_hide_flags = HIDEEARS | BLOCKHAIR // Winter coats @@ -125,6 +125,14 @@ /obj/item/clothing/head/hood/winter/durathread icon_state = "winterhood_durathread" +/obj/item/clothing/head/hood/aureate + name = "aureate hood" + desc = "A detached, ornamental hood with gold embellishments. Seems to be made out of insulated fiber." + icon = 'icons/clothing/head/aureate.dmi' + icon_state = "aureate_hood" + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + //Hazardous Softsuit Hoods /obj/item/clothing/head/hood/explorer name = "explorer hood" @@ -190,7 +198,7 @@ icon_state = "golhood" desc = "A protective & concealing hood." armor_type = /datum/armor/lavaland/goliath - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE /obj/item/clothing/head/hood/drake @@ -198,7 +206,7 @@ icon_state = "dragon" desc = "The skull of a dragon." armor_type = /datum/armor/lavaland/drake - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE //Vainglorious diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index b8b4669f30..d973fc7270 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -410,7 +410,7 @@ icon_state = "beanie" body_cover_flags = 0 min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/beanie_loose name = "loose beanie" @@ -419,7 +419,7 @@ addblends = "beanie_hang_a" body_cover_flags = 0 min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/beretg name = "beret" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index f82190d993..5fca82543f 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -164,7 +164,7 @@ icon_state = "ushankadown" inv_hide_flags = HIDEEARS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = HEAD + cold_protection_cover = HEAD /obj/item/clothing/head/ushanka/attack_self(mob/user) . = ..() diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index 86a737d2f3..70bdf2fee9 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -8,9 +8,9 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT armor_type = /datum/armor/exploration/space/pilot inv_hide_flags = HIDEEARS - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HEAD + heat_protection_cover = HEAD max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE w_class = ITEMSIZE_NORMAL diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 71bca28fbd..7397943fa2 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -219,8 +219,8 @@ else src.icon_state = initial(icon_state) to_chat(user, "You untie the bandana and spread it out.") - slot_flags = "[initial(slot_flags)]" - body_cover_flags = "[initial(body_cover_flags)]" + slot_flags = initial(slot_flags) + body_cover_flags = initial(body_cover_flags) update_worn_icon() //so our mob-overlays update /* diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index a86df9ffd1..0b04c5fbd1 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -78,6 +78,7 @@ istype(I, /obj/item/material/kitchen/utensil) || \ istype(I, /obj/item/storage/box/survival_knife) ||\ istype(I, /obj/item/material/knife/stiletto) ||\ + istype(I, /obj/item/gps/dataknife) ||\ istype(I, /obj/item/material/knife/tacknife))) if(holding) to_chat(user, "\The [src] is already holding \a [holding].") diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index a25b97cdad..f177f61182 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -81,9 +81,9 @@ name = "winter boots" desc = "Boots lined with 'synthetic' animal fur." icon_state = "winterboots" - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE snow_speed = -1 step_volume_mod = 0.8 @@ -182,9 +182,9 @@ clothing_flags = NOSLIP siemens_coefficient = 0.6 - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE //Stolen from CM, refurbished to be less terrible. diff --git a/code/modules/clothing/shoes/leg_guards.dm b/code/modules/clothing/shoes/leg_guards.dm index 6bdb4650ac..473ac89393 100644 --- a/code/modules/clothing/shoes/leg_guards.dm +++ b/code/modules/clothing/shoes/leg_guards.dm @@ -73,4 +73,4 @@ encumbrance = ITEM_ENCUMBRANCE_ARMOR_LIGHT_BOOTS armor_type = /datum/armor/station/tactical min_cold_protection_temperature = T0C - 20 - cold_protection = LEGS + cold_protection_cover = LEGS diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 3f401ab706..58de9f113d 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -90,9 +90,9 @@ siemens_coefficient = 0.7 origin_tech = list(TECH_ARCANE = 2) - cold_protection = FEET + cold_protection_cover = FEET min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET + heat_protection_cover = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = null diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 077be311f0..65c08e20b1 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -17,7 +17,7 @@ desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." armor_type = /datum/armor/skrell/space/light allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd) - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN) @@ -36,7 +36,7 @@ allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank) armor_type = /datum/armor/vox/space/armored siemens_coefficient = 0.2 - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list(SPECIES_VOX) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index ea06266ea8..5a93bc2fcb 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -29,7 +29,7 @@ weight = ITEM_WEIGHT_VOIDSUIT armor_type = /datum/armor/station/tactical inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 10 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 6149df5479..bdea4038fa 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -12,7 +12,7 @@ armor_type = /datum/armor/general/space inv_hide_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_cover_flags = HEAD|FACE|EYES - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 2 * ONE_ATMOSPHERE @@ -77,7 +77,7 @@ allowed = list(/obj/item/flashlight,/obj/item/tank/emergency/oxygen,/obj/item/suit_cooling_unit) armor_type = /datum/armor/general/space inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 2 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 63edea0cc3..a6bdc812a5 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -4,7 +4,7 @@ desc = "A high-tech dark red space suit helmet. Used for AI satellite maintenance." icon_state = "void" item_state_slots = list(SLOT_ID_RIGHT_HAND = "syndicate", SLOT_ID_LEFT_HAND = "syndicate") - heat_protection = HEAD + heat_protection_cover = HEAD armor_type = /datum/armor/general/space/armored max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE @@ -44,7 +44,7 @@ weight = ITEM_WEIGHT_VOIDSUIT armor_type = /datum/armor/general/space/armored allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit) - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 10 * ONE_ATMOSPHERE diff --git a/code/modules/clothing/spacesuits/void/zaddat.dm b/code/modules/clothing/spacesuits/void/zaddat.dm index 3502ce939f..9199ef9f09 100644 --- a/code/modules/clothing/spacesuits/void/zaddat.dm +++ b/code/modules/clothing/spacesuits/void/zaddat.dm @@ -3,7 +3,7 @@ desc = "A Hegemony-designed utilitarian environment suit helmet, still common among the Spacer Zaddat." icon_state = "zaddat_hegemony" item_state_slots = list(SLOT_ID_RIGHT_HAND = "syndicate", SLOT_ID_LEFT_HAND = "syndicate") - heat_protection = HEAD + heat_protection_cover = HEAD body_cover_flags = HEAD|FACE|EYES armor_type = /datum/armor/zaddat siemens_coefficient = 1 diff --git a/code/modules/clothing/suits/aliens/tajara.dm b/code/modules/clothing/suits/aliens/tajara.dm index cf87201c82..15d4bd58ae 100644 --- a/code/modules/clothing/suits/aliens/tajara.dm +++ b/code/modules/clothing/suits/aliens/tajara.dm @@ -198,7 +198,7 @@ icon_state = "winter_cloak" body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = TN60C - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS hoodtype = /obj/item/clothing/head/hood/tajaran/cloak/winter /obj/item/clothing/suit/storage/hooded/tajaran/cloak/royalist @@ -260,7 +260,7 @@ item_state = "winter_cloakhood" body_cover_flags = HEAD inv_hide_flags = HIDEEARS|BLOCKHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = TN60C /obj/item/clothing/head/hood/tajaran/cloak/royalist diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index 3018e20162..faed8a65b9 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -321,7 +321,7 @@ species_restricted = list(SPECIES_TESHARI) body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER|HIDETIE - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor_type = /datum/armor/teshari/hood_cloak action_button_name = "Toggle Cloak Hood" @@ -338,7 +338,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "tesh_hood_bo", SLOT_ID_LEFT_HAND = "tesh_hood_bo") inv_hide_flags = BLOCKHAIR body_cover_flags = HEAD - cold_protection = HEAD|FACE + cold_protection_cover = HEAD|FACE min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c40451f4af..7011facee5 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -7,9 +7,9 @@ |ACCESSORY_SLOT_MEDAL\ |ACCESSORY_SLOT_INSIGNIA) - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = UPPER_TORSO|LOWER_TORSO + heat_protection_cover = UPPER_TORSO|LOWER_TORSO max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.7 @@ -148,7 +148,7 @@ w_class = ITEMSIZE_HUGE armor_type = /datum/armor/centcom/deathsquad inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 20* ONE_ATMOSPHERE @@ -311,9 +311,9 @@ body_cover_flags = UPPER_TORSO|LOWER_TORSO clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = UPPER_TORSO|LOWER_TORSO + heat_protection_cover = UPPER_TORSO|LOWER_TORSO max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.6 @@ -433,7 +433,7 @@ desc = "An armored vest made from advanced flexible ceramic plates. It's surprisingly mobile, if a little unfashionable." icon_state = "flexitac" item_state = "flexitac" - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = T0C - 20 encumbrance = ITEM_ENCUMBRANCE_ARMOR_MEDIUM weight = ITEM_WEIGHT_ARMOR_MEDIUM @@ -515,7 +515,7 @@ desc = "this doesn't exist" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //big coats keep you big warm + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //big coats keep you big warm min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE icon = 'icons/clothing/suit/coats/dept_overcoats.dmi' armor_type = /datum/armor/security/light_formalwear @@ -561,7 +561,7 @@ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet) inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index 6a6b7eaf30..c80a3131bc 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -80,7 +80,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "carp_casual", SLOT_ID_LEFT_HAND = "carp_casual") //Does not exist -S2- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too action_button_name = "Toggle Carp Hood" hoodtype = /obj/item/clothing/head/hood/carp_hood @@ -131,7 +131,7 @@ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS atom_flags = PHORONGUARD inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor_type = /datum/armor/civilian/coat hoodtype = /obj/item/clothing/head/hood/winter @@ -433,7 +433,7 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/hood/explorer siemens_coefficient = 0.9 armor_type = /datum/armor/exploration/soft @@ -459,7 +459,7 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/hood/miner siemens_coefficient = 0.9 armor_type = /datum/armor/cargo/mining/soft @@ -517,7 +517,7 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/mining_scanner/advanced, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/material/twohanded/spear) armor_type = /datum/armor/lavaland/drake hoodtype = /obj/item/clothing/head/hood/drake - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE @@ -561,7 +561,7 @@ icon_state = "mercy_hoodie" inv_hide_flags = HIDEHOLSTER body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE hoodtype = /obj/item/clothing/head/hood/mercy diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index d95cbd4e0b..06d0633329 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -337,6 +337,14 @@ desc = "Traditional Japanese menswear." icon_state = "kamishimo" +/obj/item/clothing/suit/storage/aureate + name = "aureate kimono" + desc = "An embellished spin on an ancient, traditional garb. It comes with various insignias." + icon = 'icons/clothing/suit/coats/aureate_kimono.dmi' + icon_state = "aureate_kimono" + body_cover_flags = UPPER_TORSO|ARM_RIGHT|LOWER_TORSO + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + /obj/item/clothing/suit/storage/furcoat name = "furcoat" desc = "The finest hopefully inorganic furs attached to fake leather. The provider has assured it is not of a sapient species origin." @@ -522,7 +530,7 @@ icon_state = "leathercoat" item_state_slots = list(SLOT_ID_RIGHT_HAND = "wcoat", SLOT_ID_LEFT_HAND = "wcoat") body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER /obj/item/clothing/suit/browncoat @@ -718,7 +726,7 @@ icon_state = "pufferjacket" item_state_slots = list(SLOT_ID_RIGHT_HAND = "chainmail", SLOT_ID_LEFT_HAND = "chainmail") body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE inv_hide_flags = HIDEHOLSTER @@ -728,7 +736,7 @@ icon_state = "puffervest" item_state_slots = list(SLOT_ID_RIGHT_HAND = "chainmail", SLOT_ID_LEFT_HAND = "chainmail") body_cover_flags = UPPER_TORSO|LOWER_TORSO - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/suit/storage/miljacket name = "military jacket" @@ -794,7 +802,7 @@ allowed = list (/obj/item/gun/ballistic/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) body_cover_flags = UPPER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|ARMS min_cold_protection_temperature = T0C - 20 siemens_coefficient = 0.7 @@ -805,7 +813,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "brown_jacket", SLOT_ID_LEFT_HAND = "brown_jacket") body_cover_flags = UPPER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|ARMS min_cold_protection_temperature = T0C - 20 siemens_coefficient = 0.7 @@ -906,7 +914,7 @@ icon_state = "grey_hoodie" item_state_slots = list(SLOT_ID_RIGHT_HAND = "suit_grey", SLOT_ID_LEFT_HAND = "suit_grey") min_cold_protection_temperature = T0C - 20 - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER /obj/item/clothing/suit/storage/toggle/hoodie/black @@ -1195,7 +1203,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "labcoat", SLOT_ID_LEFT_HAND = "labcoat") body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE allowed = list (/obj/item/gun/ballistic/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) @@ -1534,7 +1542,7 @@ desc = "A form fitting utilitarion coat with straps around the shoulders and holding a sash around the waist. The collar is lined with fur to help stay warm." icon_state = "fur_utility" body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit) @@ -1572,7 +1580,7 @@ icon_state = "runner_jacket" inv_hide_flags = HIDEHOLSTER body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, @@ -1584,13 +1592,13 @@ open = 0 icon_state = "[icon_state]_closed" inv_hide_flags = HIDETIE|HIDEHOLSTER - cold_protection = HEAD|UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = HEAD|UPPER_TORSO|LOWER_TORSO|ARMS|LEGS to_chat(usr, "You close the coat and activate the coils.") else if(open == 0) open = 1 icon_state = initial(icon_state) inv_hide_flags = HIDEHOLSTER - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS to_chat(usr, "You open the coat and deactivate the coils.") else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed to_chat(usr, "You attempt to zip-up the zipper on your [src], before promptly realising how silly you are.") diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index a5caccc690..a82fa3bb3e 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -22,9 +22,9 @@ weight = ITEM_WEIGHT_ARMOR_FIRE_SUIT inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER clothing_flags = 0 - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_pressure_protection = 0.2 * ONE_ATMOSPHERE max_pressure_protection = 20 * ONE_ATMOSPHERE @@ -57,7 +57,7 @@ weight = ITEM_WEIGHT_ARMOR_BOMB_SUIT armor_type = /datum/armor/station/bomb inv_hide_flags = HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER - heat_protection = UPPER_TORSO|LOWER_TORSO + heat_protection_cover = UPPER_TORSO|LOWER_TORSO max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0 diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index c0c12bc5cd..14e6d99e73 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -345,7 +345,7 @@ /obj/item/clothing/accessory/armor/tag/ntbs name = "\improper BLUESHIELD tag" - desc = "An armor tag with the words BLUESHIELD printed in red lettering." + desc = "An armor tag with the words BLUESHIELD printed in blue lettering." icon_state = "ntbstag" /obj/item/clothing/accessory/armor/tag/ntc diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index f6ff0525a5..b281b8092e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -87,7 +87,7 @@ gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected. + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected. min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE /obj/item/clothing/under/acj @@ -99,7 +99,7 @@ permeability_coefficient = 0.01 body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/invulnerable - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0 @@ -395,6 +395,13 @@ desc = "You must be a bit risque teasing all of them in a maid uniform!" icon_state = "sexymaid" +/obj/item/clothing/under/dress/maid/neko + name = "neko maid uniform" + desc = "A tailored maid uniform that takes many cues from Old Earth Bavarian commonwear. It seems airy and breathable." + icon = 'icons/clothing/uniform/misc/neko.dmi' + icon_state = "neko" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + /obj/item/clothing/under/dress/dress_fire name = "flame dress" desc = "A small black dress with blue flames print on it." diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 23106071b3..58699c5671 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -59,7 +59,7 @@ ui.open() -/obj/machinery/dnaforensics/ui_data(mob/user) +/obj/machinery/dnaforensics/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["scan_progress"] = round(scanner_progress) @@ -70,7 +70,7 @@ return data -/obj/machinery/dnaforensics/ui_act(action, list/params) +/obj/machinery/dnaforensics/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/donatorreskins/donatorclothing.dm b/code/modules/donatorreskins/donatorclothing.dm index 4bb521dbdb..8b67b16336 100644 --- a/code/modules/donatorreskins/donatorclothing.dm +++ b/code/modules/donatorreskins/donatorclothing.dm @@ -173,7 +173,7 @@ item_state = "noah_cloak" body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS min_cold_protection_temperature = TN60C - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS hoodtype = /obj/item/clothing/head/hood/donatornoahcloak icon = 'icons/mob/clothing/donatorclothing.dmi' icon_override = 'icons/mob/clothing/donatorclothing.dmi' @@ -185,7 +185,7 @@ item_state = "noah_cloakhood" body_cover_flags = HEAD inv_hide_flags = HIDEEARS|BLOCKHAIR - cold_protection = HEAD + cold_protection_cover = HEAD min_cold_protection_temperature = TN60C icon = 'icons/mob/clothing/donatorclothing.dmi' icon_override = 'icons/mob/clothing/donatorclothing.dmi' diff --git a/code/modules/economy/machines/ATM.dm b/code/modules/economy/machines/ATM.dm index 4da4bb650b..e2967158e2 100644 --- a/code/modules/economy/machines/ATM.dm +++ b/code/modules/economy/machines/ATM.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(atm_sounds, list('sound/items/polaroid1.ogg', 'sound/items/pola ui = new(user, src, "ATM", "[machine_id]") ui.open() -/obj/machinery/atm/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/atm/ui_data(mob/user, datum/tgui/ui) . = ..() var/data[0] diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm index ef5d6a2b04..3e3c87126f 100644 --- a/code/modules/events/atmos_leak.dm +++ b/code/modules/events/atmos_leak.dm @@ -64,6 +64,6 @@ // Fow now just add a bunch of it to the air var/datum/gas_mixture/air_contents = new air_contents.temperature = T20C + ((severity - 1) * rand(-50, 50)) - air_contents.gas[gas_type] = 10 * MOLES_CELLSTANDARD + air_contents.gas[gas_type] = 10 * CELL_MOLES target_turf.assume_air(air_contents) playsound(target_turf, 'sound/effects/smoke.ogg', 50, 1) diff --git a/code/modules/events/canister_leak.dm b/code/modules/events/canister_leak.dm index 8c3af30961..c944d332c0 100644 --- a/code/modules/events/canister_leak.dm +++ b/code/modules/events/canister_leak.dm @@ -7,7 +7,7 @@ // List of all non-destroyed canisters on station levels var/list/all_canisters = list() for(var/obj/machinery/portable_atmospherics/canister/C in GLOB.machines) - if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= MOLES_CELLSTANDARD) + if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= CELL_MOLES) all_canisters += C for(var/i in 1 to 10) diff --git a/code/modules/examine/descriptions/engineering.dm b/code/modules/examine/descriptions/engineering.dm index 6890db6b15..66c5dd9bfb 100644 --- a/code/modules/examine/descriptions/engineering.dm +++ b/code/modules/examine/descriptions/engineering.dm @@ -58,7 +58,7 @@ else results += "[desc_panel_image("welder", user)]to weld, preventing it from opening." - if(p_open) + if(panel_open) results += "[desc_panel_image("screwdriver", user)]to close the wire panel." results += "[desc_panel_image("wirecutters", user)]to cut an internal wire while hacking." results += "[desc_panel_image("multitool", user)]to pulse an internal wire while hacking." diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm index 6d05d3de5f..e31e680b57 100644 --- a/code/modules/fishing/aquarium/aquarium.dm +++ b/code/modules/fishing/aquarium/aquarium.dm @@ -219,7 +219,7 @@ else if(dead_fish > 0) to_chat(user, SPAN_WARNING("The fish are all dead!")) -/obj/structure/aquarium/ui_data(mob/user) +/obj/structure/aquarium/ui_data(mob/user, datum/tgui/ui) . = ..() .["fluid_type"] = fluid_type .["temperature"] = fluid_temp @@ -229,7 +229,7 @@ content_data += list(list("name"=fish.name,"ref"=ref(fish))) .["contents"] = content_data -/obj/structure/aquarium/ui_static_data(mob/user) +/obj/structure/aquarium/ui_static_data(mob/user, datum/tgui/ui) . = ..() //I guess these should depend on the fluid so lava critters can get high or stuff below water freezing point but let's keep it simple for now. .["minTemperature"] = min_fluid_temp diff --git a/code/modules/fishing/equipment/catalog.dm b/code/modules/fishing/equipment/catalog.dm index d67c7130a9..d8ce1d083f 100644 --- a/code/modules/fishing/equipment/catalog.dm +++ b/code/modules/fishing/equipment/catalog.dm @@ -14,7 +14,7 @@ ui = new(user, src, "FishCatalog", name) ui.open() -/obj/item/book/fish_catalog/ui_static_data(mob/user) +/obj/item/book/fish_catalog/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/static/fish_info if(!fish_info) diff --git a/code/modules/fishing/equipment/rod.dm b/code/modules/fishing/equipment/rod.dm index 4af1ad6397..017c8a110f 100644 --- a/code/modules/fishing/equipment/rod.dm +++ b/code/modules/fishing/equipment/rod.dm @@ -310,7 +310,7 @@ return TRUE return ..() -/obj/item/fishing_rod/ui_data(mob/user) +/obj/item/fishing_rod/ui_data(mob/user, datum/tgui/ui) . = ..() var/list/data = list() @@ -343,7 +343,7 @@ return FALSE return TRUE -/obj/item/fishing_rod/ui_act(action, list/params) +/obj/item/fishing_rod/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return . diff --git a/code/modules/fishing/minigame/fishing_calculator.dm b/code/modules/fishing/minigame/fishing_calculator.dm index 18614bcd52..fd7f148e05 100644 --- a/code/modules/fishing/minigame/fishing_calculator.dm +++ b/code/modules/fishing/minigame/fishing_calculator.dm @@ -21,23 +21,23 @@ ui = new(user, src, "FishingCalculator") ui.open() -/datum/fishing_calculator/ui_state(mob/user) +/datum/fishing_calculator/ui_state() return GLOB.always_state -/datum/fishing_calculator/ui_close(mob/user) +/datum/fishing_calculator/on_ui_close(mob/user, datum/tgui/ui, embedded) qdel(src) -/datum/fishing_calculator/ui_static_data(mob/user) +/datum/fishing_calculator/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["rod_types"] = typesof(/obj/item/fishing_rod) .["hook_types"] = typesof(/obj/item/fishing_hook) .["line_types"] = typesof(/obj/item/fishing_line) .["spot_types"] = subtypesof(/datum/fish_source) -/datum/fishing_calculator/ui_data(mob/user) +/datum/fishing_calculator/ui_data(mob/user, datum/tgui/ui) return list("info" = current_table) -/datum/fishing_calculator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/fishing_calculator/ui_act(action, list/params, datum/tgui/ui) . = ..() var/mob/user = usr switch(action) diff --git a/code/modules/fishing/minigame/fishing_minigame.dm b/code/modules/fishing/minigame/fishing_minigame.dm index 93253ded59..78a914fd52 100644 --- a/code/modules/fishing/minigame/fishing_minigame.dm +++ b/code/modules/fishing/minigame/fishing_minigame.dm @@ -155,16 +155,16 @@ ui.set_mouse_hook(TRUE) ui.open() -/datum/fishing_challenge/ui_host(mob/user) +/datum/fishing_challenge/ui_host() return lure //Could be the target really // Manually closing the ui is treated as lose -/datum/fishing_challenge/ui_close(mob/user) +/datum/fishing_challenge/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(!completed) complete(FALSE) -/datum/fishing_challenge/ui_static_data(mob/user) +/datum/fishing_challenge/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["difficulty"] = max(1,min(difficulty,100)) .["fish_ai"] = fish_ai @@ -180,7 +180,7 @@ ui_status_user_is_abled(user, lure), ) -/datum/fishing_challenge/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/fishing_challenge/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/food/drinkingglass/extras.dm b/code/modules/food/drinkingglass/extras.dm index 726728eea8..1d4c64f002 100644 --- a/code/modules/food/drinkingglass/extras.dm +++ b/code/modules/food/drinkingglass/extras.dm @@ -53,7 +53,7 @@ var/glass_desc var/glass_color w_class = ITEMSIZE_TINY - icon = DRINK_ICON_FILE + icon = 'icons/pdrink.dmi' /obj/item/glass_extra/stick name = "stick" @@ -68,5 +68,3 @@ glass_addition = "straw" glass_desc = "There is a straw in the glass." icon_state = "straw" - -#undef DRINK_ICON_FILE diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/drinkingglass/glass1.dm similarity index 100% rename from code/modules/food/food/drinks/drinkingglass.dm rename to code/modules/food/drinkingglass/glass1.dm diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/glass2.dm similarity index 100% rename from code/modules/food/drinkingglass/drinkingglass.dm rename to code/modules/food/drinkingglass/glass2.dm diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index 461dd0e8f7..99528e79b0 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -1021,3 +1021,7 @@ Drinks Data /datum/reagent/ethanol/martinez glass_icon_state = "martinez" glass_center_of_mass = list("x"=16, "y"=8) + +/datum/reagent/ethanol/mimosa + glass_icon_state = "mimosa" + glass_center_of_mass = list("x"=16, "y"=8) diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/drinks/bottle.dm similarity index 52% rename from code/modules/food/food/drinks/bottle.dm rename to code/modules/food/drinks/bottle.dm index 7352308ead..cacc715625 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/drinks/bottle.dm @@ -193,278 +193,6 @@ edge = 0 var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") -/obj/item/reagent_containers/food/drinks/bottle/gin - name = "Griffeater Gin" - desc = "A bottle of high quality gin, produced in Alpha Centauri." - icon_state = "ginbottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize(mapload) - . = ..() - reagents.add_reagent("gin", 100) - -/obj/item/reagent_containers/food/drinks/bottle/whiskey - name = "Uncle Git's Special Reserve" - desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter." - icon_state = "whiskeybottle" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize(mapload) - . = ..() - reagents.add_reagent("whiskey", 100) - -/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey - name = "Special Blend Whiskey" - desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." - icon_state = "whiskeybottle2" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize(mapload) - . = ..() - reagents.add_reagent("specialwhiskey", 100) - -/obj/item/reagent_containers/food/drinks/bottle/vodka - name = "Tunguska Triple Distilled" - desc = "Aah, vodka. Prime choice of drink and fuel by Russians worldwide." - icon_state = "vodkabottle" - center_of_mass = list("x"=17, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize(mapload) - . = ..() - reagents.add_reagent("vodka", 100) - -/obj/item/reagent_containers/food/drinks/bottle/tequila - name = "Caccavo Guaranteed Quality Tequila" - desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" - icon_state = "tequilabottle" - center_of_mass = list("x"=16, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/tequila/Initialize(mapload) - . = ..() - reagents.add_reagent("tequila", 100) - -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing - name = "Bottle of Nothing" - desc = "A bottle filled with nothing" - icon_state = "bottleofnothing" - center_of_mass = list("x"=17, "y"=5) - -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize(mapload) - . = ..() - reagents.add_reagent("nothing", 100) - -/obj/item/reagent_containers/food/drinks/bottle/patron - name = "Wrapp Artiste Patron" - desc = "Silver laced tequila, served in space night clubs across the galaxy." - icon_state = "patronbottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize(mapload) - . = ..() - reagents.add_reagent("patron", 100) - -/obj/item/reagent_containers/food/drinks/bottle/rum - name = "Captain Pete's Cuban Spiced Rum" - desc = "This isn't just rum, oh no. It's practically Cuba in a bottle." - icon_state = "rumbottle" - center_of_mass = list("x"=16, "y"=8) - -/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize(mapload) - . = ..() - reagents.add_reagent("rum", 100) - -/obj/item/reagent_containers/food/drinks/bottle/whiterum - name = "Captain Pete's Cuban White Rum" - desc = "A milky, white alternative to Cuban Spiced! Tastes like coconut." - icon_state = "whiterumbottle" - center_of_mass = list("x"=16, "y"=8) - -/obj/item/reagent_containers/food/drinks/bottle/whiterum/Initialize(mapload) - . = ..() - reagents.add_reagent("whiterum", 100) - -/obj/item/reagent_containers/food/drinks/bottle/holywater - name = "Flask of Holy Water" - desc = "A flask of the chaplain's holy water." - icon_state = "holyflask" - center_of_mass = list("x"=17, "y"=10) - -/obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize(mapload) - . = ..() - reagents.add_reagent("holywater", 100) - -/obj/item/reagent_containers/food/drinks/bottle/vermouth - name = "Goldeneye Vermouth" - desc = "Sweet, sweet dryness~" - icon_state = "vermouthbottle" - center_of_mass = list("x"=17, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize(mapload) - . = ..() - reagents.add_reagent("vermouth", 100) - -/obj/item/reagent_containers/food/drinks/bottle/kahlua - name = "Robert Robust's Coffee Liqueur" - desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936." - icon_state = "kahluabottle" - center_of_mass = list("x"=17, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize(mapload) - . = ..() - reagents.add_reagent("kahlua", 100) - -/obj/item/reagent_containers/food/drinks/bottle/goldschlager - name = "College Girl Goldschlager" - desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." - icon_state = "goldschlagerbottle" - center_of_mass = list("x"=15, "y"=3) - -/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize(mapload) - . = ..() - reagents.add_reagent("goldschlager", 100) - -/obj/item/reagent_containers/food/drinks/bottle/cognac - name = "Chateau De Baton Premium Cognac" - desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing." - icon_state = "cognacbottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize(mapload) - . = ..() - reagents.add_reagent("cognac", 100) - -/obj/item/reagent_containers/food/drinks/bottle/wine - name = "Crab Cove Merlot" - desc = "Cheap red cooking wine pretending to be drinkable." - icon_state = "winebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize(mapload) - . = ..() - reagents.add_reagent("wine", 100) - -/obj/item/reagent_containers/food/drinks/bottle/whitewine - name = "Crab Cove Sauvignon Blanc" - desc = "White wine that's oddly better than the company's red variant." - icon_state = "whitewinebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize(mapload) - . = ..() - reagents.add_reagent("whitewine", 100) - -/obj/item/reagent_containers/food/drinks/bottle/bitters - name = "Rattison's Bitters" - desc = "The best thing to bitters you're going to get in this sector." - icon_state = "bittersbottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/bitters/Initialize(mapload) - . = ..() - reagents.add_reagent("bitters", 100) - - -/obj/item/reagent_containers/food/drinks/bottle/absinthe - name = "Jailbreaker Verte" - desc = "One sip of this and you just know you're gonna have a good time." - icon_state = "absinthebottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload) - . = ..() - reagents.add_reagent("absinthe", 100) - -/obj/item/reagent_containers/food/drinks/bottle/melonliquor - name = "Emeraldine Melon Liquor" - desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light." - icon_state = "alco-green" //Placeholder. - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize(mapload) - . = ..() - reagents.add_reagent("melonliquor", 100) - -/obj/item/reagent_containers/food/drinks/bottle/bluecuracao - name = "Miss Blue Curacao" - desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic." - icon_state = "alco-blue" //Placeholder. - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize(mapload) - . = ..() - reagents.add_reagent("bluecuracao", 100) - -/obj/item/reagent_containers/food/drinks/bottle/victory_gin - name = "Victory Gin" - desc = "An oily Tajara liquor similar to gin. Bottled at one of the countless distilleries on Adhomai." - icon_state = "victorygin" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/victory_gin/Initialize(mapload) - . = ..() - reagents.add_reagent("victory_gin", 100) - -/obj/item/reagent_containers/food/drinks/bottle/messa_mead - name = "Messa's Mead" - desc = "A sweet liquor from Adhomai. Orginally considered a drink of the Tajaran nobility improved technology has made this honey and root based liqour available all across Adhomai and the even the stars beyond." - icon_state = "messamead" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/messa_mead/Initialize(mapload) - . = ..() - reagents.add_reagent("messa_mead", 100) - - -/obj/item/reagent_containers/food/drinks/bottle/grenadine - name = "Briar Rose Grenadine Syrup" - desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." - icon_state = "grenadinebottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize(mapload) - . = ..() - reagents.add_reagent("grenadine", 100) - -/obj/item/reagent_containers/food/drinks/bottle/cola - name = "\improper Space Cola" - desc = "Cola. in space" - icon_state = "colabottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/cola/Initialize(mapload) - . = ..() - reagents.add_reagent("cola", 100) - -/obj/item/reagent_containers/food/drinks/bottle/space_up - name = "\improper Space-Up" - desc = "Tastes like a hull breach in your mouth." - icon_state = "space-up_bottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize(mapload) - . = ..() - reagents.add_reagent("space_up", 100) - -/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind - name = "\improper Space Mountain Wind" - desc = "Blows right through you like a space wind." - icon_state = "space_mountain_wind_bottle" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize(mapload) - . = ..() - reagents.add_reagent("spacemountainwind", 100) - -/obj/item/reagent_containers/food/drinks/bottle/pwine - name = "Warlock's Velvet" - desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" - icon_state = "pwinebottle" - center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize(mapload) - . = ..() - reagents.add_reagent("pwine", 100) - /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew name = "Redeemer's Brew" desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart." @@ -475,104 +203,6 @@ . = ..() reagents.add_reagent("unathiliquor", 100) -//////////////////////////JUICES AND STUFF /////////////////////// - -/obj/item/reagent_containers/food/drinks/bottle/orangejuice - name = "Orange Juice" - desc = "Full of vitamins and deliciousness!" - icon_state = "orangejuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=7) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize(mapload) - . = ..() - reagents.add_reagent("orangejuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/applejuice - name = "Apple Juice" - desc = "Squeezed, pressed and ground to perfection!" - icon_state = "applejuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=7) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize(mapload) - . = ..() - reagents.add_reagent("applejuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/milk - name = "Large Milk Carton" - desc = "It's milk. This carton's large enough to serve your biggest milk drinkers." - icon_state = "milk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/milk/Initialize(mapload) - . = ..() - reagents.add_reagent("milk", 100) - -/obj/item/reagent_containers/food/drinks/bottle/cream - name = "Milk Cream" - desc = "It's cream. Made from milk. What else did you think you'd find in there?" - icon_state = "cream" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/cream/Initialize(mapload) - . = ..() - reagents.add_reagent("cream", 100) - -/obj/item/reagent_containers/food/drinks/bottle/tomatojuice - name = "Tomato Juice" - desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." - icon_state = "tomatojuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize(mapload) - . = ..() - reagents.add_reagent("tomatojuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/limejuice - name = "Lime Juice" - desc = "Sweet-sour goodness." - icon_state = "limejuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize(mapload) - . = ..() - reagents.add_reagent("limejuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/lemonjuice - name = "Lemon Juice" - desc = "Sweet-sour goodness. Minus the sweet." - icon_state = "lemonjuice" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize(mapload) - . = ..() - reagents.add_reagent("lemonjuice", 100) - -/obj/item/reagent_containers/food/drinks/bottle/coconutmilk - name = "Coconut Milk" - desc = "A carton of NutClarity brand coconut milk." - icon_state = "milkbox" - item_state = "carton" - center_of_mass = list("x"=16, "y"=8) - isGlass = 0 - -/obj/item/reagent_containers/food/drinks/bottle/coconutmilk/Initialize(mapload) - . = ..() - reagents.add_reagent("coconutmilk", 100) - //Small bottles /obj/item/reagent_containers/food/drinks/bottle/small volume = 50 diff --git a/code/modules/food/drinks/bottle/alcohol.dm b/code/modules/food/drinks/bottle/alcohol.dm new file mode 100644 index 0000000000..3063a90eae --- /dev/null +++ b/code/modules/food/drinks/bottle/alcohol.dm @@ -0,0 +1,149 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/absinthe + name = "Jailbreaker Verte" + desc = "One sip of this and you just know you're gonna have a good time." + icon_state = "absinthebottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/absinthe + +/obj/item/reagent_containers/food/drinks/bottle/bitters + name = "Rattison's Bitters" + desc = "The best thing to bitters you're going to get in this sector." + icon_state = "bittersbottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/bitters + +/obj/item/reagent_containers/food/drinks/bottle/bluecuracao + name = "Miss Blue Curacao" + desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic." + icon_state = "alco-blue" //Placeholder. + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/bluecuracao + +/obj/item/reagent_containers/food/drinks/bottle/cognac + name = "Chateau De Baton Premium Cognac" + desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing." + icon_state = "cognacbottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/cognac + +/obj/item/reagent_containers/food/drinks/bottle/gin + name = "Griffeater Gin" + desc = "A bottle of high quality gin, produced in Alpha Centauri." + icon_state = "ginbottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/gin + +/obj/item/reagent_containers/food/drinks/bottle/goldschlager + name = "College Girl Goldschlager" + desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." + icon_state = "goldschlagerbottle" + center_of_mass = list("x"=15, "y"=3) + start_reagent = /datum/reagent/ethanol/goldschlager + +/obj/item/reagent_containers/food/drinks/bottle/kahlua + name = "Robert Robust's Coffee Liqueur" + desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936." + icon_state = "kahluabottle" + center_of_mass = list("x"=17, "y"=3) + start_reagent = /datum/reagent/ethanol/coffee/kahlua + +/obj/item/reagent_containers/food/drinks/bottle/melonliquor + name = "Emeraldine Melon Liquor" + desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light." + icon_state = "alco-green" //Placeholder. + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/melonliquor + +/obj/item/reagent_containers/food/drinks/bottle/messa_mead + name = "Messa's Mead" + desc = "A sweet liquor from Adhomai. Orginally considered a drink of the Tajaran nobility improved technology has made this honey and root based liqour available all across Adhomai and the even the stars beyond." + icon_state = "messamead" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/messa_mead + +/obj/item/reagent_containers/food/drinks/bottle/patron + name = "Wrapp Artiste Patron" + desc = "Silver laced tequila, served in space night clubs across the galaxy." + icon_state = "patronbottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/ethanol/patron + +/obj/item/reagent_containers/food/drinks/bottle/pwine + name = "Warlock's Velvet" + desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" + icon_state = "pwinebottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/pwine + +/obj/item/reagent_containers/food/drinks/bottle/rum + name = "Captain Pete's Cuban Spiced Rum" + desc = "This isn't just rum, oh no. It's practically Cuba in a bottle." + icon_state = "rumbottle" + center_of_mass = list("x"=16, "y"=8) + start_reagent = /datum/reagent/ethanol/rum + +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey + name = "Special Blend Whiskey" + desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." + icon_state = "whiskeybottle2" + center_of_mass = list("x"=16, "y"=3) + start_reagent = /datum/reagent/ethanol/specialwhiskey + +/obj/item/reagent_containers/food/drinks/bottle/tequila + name = "Caccavo Guaranteed Quality Tequila" + desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" + icon_state = "tequilabottle" + center_of_mass = list("x"=16, "y"=3) + start_reagent = /datum/reagent/ethanol/tequila + +/obj/item/reagent_containers/food/drinks/bottle/vermouth + name = "Goldeneye Vermouth" + desc = "Sweet, sweet dryness~" + icon_state = "vermouthbottle" + center_of_mass = list("x"=17, "y"=3) + start_reagent = /datum/reagent/ethanol/vermouth + +/obj/item/reagent_containers/food/drinks/bottle/victory_gin + name = "Victory Gin" + desc = "An oily Tajara liquor similar to gin. Bottled at one of the countless distilleries on Adhomai." + icon_state = "victorygin" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/victory_gin + +/obj/item/reagent_containers/food/drinks/bottle/vodka + name = "Tunguska Triple Distilled" + desc = "Aah, vodka. Prime choice of drink and fuel by Russians worldwide." + icon_state = "vodkabottle" + center_of_mass = list("x"=17, "y"=3) + start_reagent = /datum/reagent/ethanol/vodka + +/obj/item/reagent_containers/food/drinks/bottle/whiskey + name = "Uncle Git's Special Reserve" + desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter." + icon_state = "whiskeybottle" + center_of_mass = list("x"=16, "y"=3) + start_reagent = /datum/reagent/ethanol/whiskey + +/obj/item/reagent_containers/food/drinks/bottle/whiterum + name = "Captain Pete's Cuban White Rum" + desc = "A milky, white alternative to Cuban Spiced! Tastes like coconut." + icon_state = "whiterumbottle" + center_of_mass = list("x"=16, "y"=8) + start_reagent = /datum/reagent/ethanol/whiterum + +/obj/item/reagent_containers/food/drinks/bottle/whitewine + name = "Crab Cove Sauvignon Blanc" + desc = "White wine that's oddly better than the company's red variant." + icon_state = "whitewinebottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/whitewine + +/obj/item/reagent_containers/food/drinks/bottle/wine + name = "Crab Cove Merlot" + desc = "Cheap red cooking wine pretending to be drinkable." + icon_state = "winebottle" + center_of_mass = list("x"=16, "y"=4) + start_reagent = /datum/reagent/ethanol/wine diff --git a/code/modules/food/drinks/bottle/dairy.dm b/code/modules/food/drinks/bottle/dairy.dm new file mode 100644 index 0000000000..301c9fb283 --- /dev/null +++ b/code/modules/food/drinks/bottle/dairy.dm @@ -0,0 +1,20 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/cream + name = "Milk Cream" + desc = "It's cream. Made from milk. What else did you think you'd find in there?" + icon_state = "cream" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/milk/cream + +/obj/item/reagent_containers/food/drinks/bottle/milk + name = "Large Milk Carton" + desc = "It's milk. This carton's large enough to serve your biggest milk drinkers." + icon_state = "milk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + isGlass = 0 + start_reagent = /datum/reagent/drink/milk diff --git a/code/modules/food/drinks/bottle/juice.dm b/code/modules/food/drinks/bottle/juice.dm new file mode 100644 index 0000000000..b11d8926ad --- /dev/null +++ b/code/modules/food/drinks/bottle/juice.dm @@ -0,0 +1,56 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/applejuice + name = "Apple Juice" + desc = "Squeezed, pressed and ground to perfection!" + icon_state = "applejuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=7) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/apple + +/obj/item/reagent_containers/food/drinks/bottle/coconutmilk + name = "Coconut Milk" + desc = "A carton of NutClarity brand coconut milk." + icon_state = "milkbox" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/milk/coconutmilk + +/obj/item/reagent_containers/food/drinks/bottle/lemonjuice + name = "Lemon Juice" + desc = "Sweet-sour goodness. Minus the sweet." + icon_state = "lemonjuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/lemon + +/obj/item/reagent_containers/food/drinks/bottle/limejuice + name = "Lime Juice" + desc = "Sweet-sour goodness." + icon_state = "limejuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/lime + +/obj/item/reagent_containers/food/drinks/bottle/orangejuice + name = "Orange Juice" + desc = "Full of vitamins and deliciousness!" + icon_state = "orangejuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=7) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/orange + +/obj/item/reagent_containers/food/drinks/bottle/tomatojuice + name = "Tomato Juice" + desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." + icon_state = "tomatojuice" + item_state = "carton" + center_of_mass = list("x"=16, "y"=8) + isGlass = 0 + start_reagent = /datum/reagent/drink/juice/tomato diff --git a/code/modules/food/drinks/bottle/misc.dm b/code/modules/food/drinks/bottle/misc.dm new file mode 100644 index 0000000000..3c4d06fc47 --- /dev/null +++ b/code/modules/food/drinks/bottle/misc.dm @@ -0,0 +1,23 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing + name = "Bottle of Nothing" + desc = "A bottle filled with nothing" + icon_state = "bottleofnothing" + center_of_mass = list("x"=17, "y"=5) + start_reagent = /datum/reagent/drink/nothing + +/obj/item/reagent_containers/food/drinks/bottle/grenadine + name = "Briar Rose Grenadine Syrup" + desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." + icon_state = "grenadinebottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/grenadine + +/obj/item/reagent_containers/food/drinks/bottle/holywater + name = "Flask of Holy Water" + desc = "A flask of the chaplain's holy water." + icon_state = "holyflask" + center_of_mass = list("x"=17, "y"=10) + start_reagent = /datum/reagent/water/holywater diff --git a/code/modules/food/drinks/bottle/soda.dm b/code/modules/food/drinks/bottle/soda.dm new file mode 100644 index 0000000000..b727501ff9 --- /dev/null +++ b/code/modules/food/drinks/bottle/soda.dm @@ -0,0 +1,23 @@ +//* KEEP THIS FILE SORTED OR I WILL SPRINKLE PEPPER ON YOUR EYEBALLS *// +//* SORT BY PATH, NOT BY NAME. *// + +/obj/item/reagent_containers/food/drinks/bottle/cola + name = "\improper Space Cola" + desc = "Cola. in space" + icon_state = "colabottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/soda + +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind + name = "\improper Space Mountain Wind" + desc = "Blows right through you like a space wind." + icon_state = "space_mountain_wind_bottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/soda/spacemountainwind + +/obj/item/reagent_containers/food/drinks/bottle/space_up + name = "\improper Space-Up" + desc = "Tastes like a hull breach in your mouth." + icon_state = "space-up_bottle" + center_of_mass = list("x"=16, "y"=6) + start_reagent = /datum/reagent/drink/soda/space_up diff --git a/code/modules/food/food/cans.dm b/code/modules/food/drinks/can.dm similarity index 100% rename from code/modules/food/food/cans.dm rename to code/modules/food/drinks/can.dm diff --git a/code/modules/food/drinks/carton.dm b/code/modules/food/drinks/carton.dm new file mode 100644 index 0000000000..14644aff85 --- /dev/null +++ b/code/modules/food/drinks/carton.dm @@ -0,0 +1,88 @@ +//* Dairy + +/obj/item/reagent_containers/food/drinks/milk + name = "milk carton" + desc = "It's milk. White and nutritious goodness!" + icon_state = "milk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 50 + start_reagent = /datum/reagent/drink/milk + +/obj/item/reagent_containers/food/drinks/soymilk + name = "soymilk carton" + desc = "It's soy milk. White and nutritious goodness!" + icon_state = "soymilk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 50 + start_reagent = /datum/reagent/drink/milk/soymilk + +/obj/item/reagent_containers/food/drinks/smallmilk + name = "small milk carton" + desc = "It's milk. White and nutritious goodness!" + icon_state = "mini-milk" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 30 + start_reagent = /datum/reagent/drink/milk + +/obj/item/reagent_containers/food/drinks/smallchocmilk + name = "small chocolate milk carton" + desc = "It's milk! This one is in delicious chocolate flavour." + icon_state = "mini-milk_choco" + item_state = "carton" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + volume = 30 + start_reagent = /datum/reagent/drink/milk/chocolate + +//* Vetalan + +/obj/item/reagent_containers/food/drinks/bludboxmax + name = "Bludbox MAX carton" + desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, free-range O-Negatives. For all your dietry needs!" + volume = 30 + icon_state = "bludboxmax" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/blood + +/obj/item/reagent_containers/food/drinks/bludboxmaxlight + name = "Bludbox MAX Light carton" + desc = "A bloodsucking vegan's hipster alternative to drinking the red stuff. Bludbox light is just the same as drinking straight from the source! Comes in O- flavour." + volume = 30 + icon_state = "bludboxmaxlight" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/blood/synthblood + +/obj/item/reagent_containers/food/drinks/bludbox + name = "Bludbox carton" + desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends." + volume = 30 + icon_state = "bludbox" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/drink/blud + +/obj/item/reagent_containers/food/drinks/bludboxlight + name = "Bludbox Light carton" + desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends. This one has less sweeteners, gross!" + volume = 30 + icon_state = "bludboxlight" + center_of_mass = list("x"=16, "y"=9) + drop_sound = 'sound/items/drop/cardboardbox.ogg' + pickup_sound = 'sound/items/pickup/cardboardbox.ogg' + start_reagent = /datum/reagent/drink/blud/bludlight + diff --git a/code/modules/food/food/drinks/cup.dm b/code/modules/food/drinks/cup.dm similarity index 100% rename from code/modules/food/food/drinks/cup.dm rename to code/modules/food/drinks/cup.dm diff --git a/code/modules/food/drinks/flask.dm b/code/modules/food/drinks/flask.dm new file mode 100644 index 0000000000..4bb6ecd2e5 --- /dev/null +++ b/code/modules/food/drinks/flask.dm @@ -0,0 +1,33 @@ +/obj/item/reagent_containers/food/drinks/flask + name = "\improper Facility Director's flask" + desc = "A metal flask belonging to the Facility Director" + icon_state = "flask" + volume = 60 + center_of_mass = list("x"=17, "y"=7) + +/obj/item/reagent_containers/food/drinks/flask/shiny + name = "shiny flask" + desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it." + icon_state = "shinyflask" + +/obj/item/reagent_containers/food/drinks/flask/lithium + name = "lithium flask" + desc = "A flask with a Lithium Atom symbol on it." + icon_state = "lithiumflask" + +/obj/item/reagent_containers/food/drinks/flask/detflask + name = "\improper Detective's flask" + desc = "A metal flask with a leather band and golden badge belonging to the detective." + icon_state = "detflask" + center_of_mass = list("x"=17, "y"=8) + +/obj/item/reagent_containers/food/drinks/flask/barflask + name = "flask" + desc = "For those who can't be bothered to hang out at the bar to drink." + icon_state = "barflask" + +/obj/item/reagent_containers/food/drinks/flask/vacuumflask + name = "vacuum flask" + desc = "Keeping your drinks at the perfect temperature since 1892." + icon_state = "vacuumflask" + center_of_mass = list("x"=15, "y"=4) diff --git a/code/modules/food/food/drinks/jar.dm b/code/modules/food/drinks/jar.dm similarity index 100% rename from code/modules/food/food/drinks/jar.dm rename to code/modules/food/drinks/jar.dm diff --git a/code/modules/food/drinks/misc.dm b/code/modules/food/drinks/misc.dm new file mode 100644 index 0000000000..fecb7daea8 --- /dev/null +++ b/code/modules/food/drinks/misc.dm @@ -0,0 +1,15 @@ +/obj/item/reagent_containers/food/drinks/glue + name = "Glue" + desc = "A small bottle full of glue. The orange tip calls to you, and the fluid inside is non-toxic... Should you?" + icon_state = "glue" + drop_sound = 'sound/items/drop/cardboardbox.ogg' + volume = 30 + center_of_mass = list("x"=15, "y"=13) + start_reagent = /datum/reagent/drink/glue + +/obj/item/reagent_containers/food/drinks/glue/on_reagent_change() + ..() + if(reagents.total_volume) + icon_state = "glue" + else + icon_state = "glue_e" diff --git a/code/modules/food/drinks/shaker.dm b/code/modules/food/drinks/shaker.dm new file mode 100644 index 0000000000..32e6fc8e81 --- /dev/null +++ b/code/modules/food/drinks/shaker.dm @@ -0,0 +1,7 @@ +/obj/item/reagent_containers/food/drinks/shaker + name = "shaker" + desc = "A metal shaker to mix drinks in." + icon_state = "shaker" + amount_per_transfer_from_this = 10 + volume = 120 + center_of_mass = list("x"=17, "y"=10) diff --git a/code/modules/food/drinks/tea.dm b/code/modules/food/drinks/tea.dm new file mode 100644 index 0000000000..94fba3b97b --- /dev/null +++ b/code/modules/food/drinks/tea.dm @@ -0,0 +1,15 @@ +/obj/item/reagent_containers/food/drinks/teapot + name = "teapot" + desc = "An elegant teapot. It simply oozes class." + icon_state = "teapot" + item_state = "teapot" + amount_per_transfer_from_this = 10 + volume = 120 + center_of_mass = list("x"=17, "y"=7) + +/obj/item/reagent_containers/food/drinks/britcup + name = "cup" + desc = "A cup with the British flag emblazoned on it." + icon_state = "britcup" + volume = 30 + center_of_mass = list("x"=15, "y"=13) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index f875ea8ed5..5dfb340ff1 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -5,6 +5,7 @@ /// Food. //////////////////////////////////////////////////////////////////////////////// /obj/item/reagent_containers/food + armor_type = /datum/armor/none possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. var/filling_color = "#FFFFFF" //Used by sandwiches. @@ -13,11 +14,31 @@ var/list/center_of_mass = list() // Used for table placement -/obj/item/reagent_containers/food/Initialize(mapload) + /// inherent reagents to add when we're created from cooking + /// this is also added if we were created from adminspawn or something + /// this is a list of key-value's, where value is volume, and key is a typepath or id of a reagent + /// prefer typepaths for compile-time checking. + // todo: write more on this / why we shouldn't this instead of food effects/etc. + var/list/inherent_reagents + /// reagents we kind of just start with + /// this is used for condiment bottles, milk cartons, etc + // todo: why tf is a milk carton /food? + var/list/prefill_reagents + + // todo: above is legacy + + //* Eating + /// eating bite sound + var/bite_sound = 'sound/items/eatfood.ogg' + +/obj/item/reagent_containers/food/Initialize(mapload, cooked) . = ..() if (center_of_mass.len && !pixel_x && !pixel_y) src.pixel_x = rand(-6.0, 6) //Randomizes postion src.pixel_y = rand(-6.0, 6) + // prefill depending on if we were cooked or an actual spawn. + for(var/key in cooked? inherent_reagents : inherent_reagents | prefill_reagents) + reagents.add_reagent(key, inherent_reagents[key]) /obj/item/reagent_containers/food/afterattack(atom/target, mob/user, clickchain_flags, list/params) if(center_of_mass.len && (clickchain_flags & CLICKCHAIN_HAS_PROXIMITY) && istype(target, /obj/structure/table)) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 6861c338cd..8ffc912b1a 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -116,66 +116,10 @@ volume = 150 atom_flags = OPENCONTAINER -/obj/item/reagent_containers/food/drinks/golden_cup/on_reagent_change() - ..() - -///////////////////////////////////////////////Drinks //Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly // rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50. // Formatting is the same as food. -/obj/item/reagent_containers/food/drinks/milk - name = "milk carton" - desc = "It's milk. White and nutritious goodness!" - icon_state = "milk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - - -/obj/item/reagent_containers/food/drinks/milk/Initialize(mapload) - . = ..() - reagents.add_reagent("milk", 50) - -/obj/item/reagent_containers/food/drinks/soymilk - name = "soymilk carton" - desc = "It's soy milk. White and nutritious goodness!" - icon_state = "soymilk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/soymilk/Initialize(mapload) - . = ..() - reagents.add_reagent("soymilk", 50) - -/obj/item/reagent_containers/food/drinks/smallmilk - name = "small milk carton" - desc = "It's milk. White and nutritious goodness!" - volume = 30 - icon_state = "mini-milk" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/smallmilk/Initialize(mapload) - . = ..() - reagents.add_reagent("milk", 30) - -/obj/item/reagent_containers/food/drinks/smallchocmilk - name = "small chocolate milk carton" - desc = "It's milk! This one is in delicious chocolate flavour." - volume = 30 - icon_state = "mini-milk_choco" - item_state = "carton" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/smallchocmilk/Initialize(mapload) - . = ..() - reagents.add_reagent("chocolate_milk", 30) /obj/item/reagent_containers/food/drinks/coffee name = "\improper Robust Coffee" @@ -231,58 +175,6 @@ . = ..() reagents.add_reagent("dry_ramen", 30) -/obj/item/reagent_containers/food/drinks/bludboxmax - name = "Bludbox MAX carton" - desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, free-range O-Negatives. For all your dietry needs!" - volume = 30 - icon_state = "bludboxmax" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludboxmax/Initialize(mapload) - . = ..() - reagents.add_reagent("blood", 30) - -/obj/item/reagent_containers/food/drinks/bludboxmaxlight - name = "Bludbox MAX Light carton" - desc = "A bloodsucking vegan's hipster alternative to drinking the red stuff. Bludbox light is just the same as drinking straight from the source! Comes in O- flavour." - volume = 30 - icon_state = "bludboxmaxlight" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludboxmaxlight/Initialize(mapload) - . = ..() - reagents.add_reagent("synthblood", 30) - -/obj/item/reagent_containers/food/drinks/bludbox - name = "Bludbox carton" - desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends." - volume = 30 - icon_state = "bludbox" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludbox/Initialize(mapload) - . = ..() - reagents.add_reagent("blud", 30) - -/obj/item/reagent_containers/food/drinks/bludboxlight - name = "Bludbox Light carton" - desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietry requirements for your undead friends. This one has less sweeteners, gross!" - volume = 30 - icon_state = "bludboxlight" - center_of_mass = list("x"=16, "y"=9) - drop_sound = 'sound/items/drop/cardboardbox.ogg' - pickup_sound = 'sound/items/pickup/cardboardbox.ogg' - -/obj/item/reagent_containers/food/drinks/bludboxlight/Initialize(mapload) - . = ..() - reagents.add_reagent("bludlight", 30) - /obj/item/reagent_containers/food/drinks/sillycup name = "paper cup" desc = "A paper water cup." @@ -309,101 +201,3 @@ W.update_icon() else return ..() - -//////////////////////////drinkingglass and shaker// -//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink -// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass -// icon states. - -/obj/item/reagent_containers/food/drinks/shaker - name = "shaker" - desc = "A metal shaker to mix drinks in." - icon_state = "shaker" - amount_per_transfer_from_this = 10 - volume = 120 - center_of_mass = list("x"=17, "y"=10) - -/obj/item/reagent_containers/food/drinks/shaker/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/teapot - name = "teapot" - desc = "An elegant teapot. It simply oozes class." - icon_state = "teapot" - item_state = "teapot" - amount_per_transfer_from_this = 10 - volume = 120 - center_of_mass = list("x"=17, "y"=7) - -/obj/item/reagent_containers/food/drinks/teapot/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/flask - name = "\improper Facility Director's flask" - desc = "A metal flask belonging to the Facility Director" - icon_state = "flask" - volume = 60 - center_of_mass = list("x"=17, "y"=7) - -/obj/item/reagent_containers/food/drinks/flask/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/flask/shiny - name = "shiny flask" - desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it." - icon_state = "shinyflask" - -/obj/item/reagent_containers/food/drinks/flask/lithium - name = "lithium flask" - desc = "A flask with a Lithium Atom symbol on it." - icon_state = "lithiumflask" - -/obj/item/reagent_containers/food/drinks/flask/detflask - name = "\improper Detective's flask" - desc = "A metal flask with a leather band and golden badge belonging to the detective." - icon_state = "detflask" - volume = 60 - center_of_mass = list("x"=17, "y"=8) - -/obj/item/reagent_containers/food/drinks/flask/barflask - name = "flask" - desc = "For those who can't be bothered to hang out at the bar to drink." - icon_state = "barflask" - volume = 60 - center_of_mass = list("x"=17, "y"=7) - -/obj/item/reagent_containers/food/drinks/flask/vacuumflask - name = "vacuum flask" - desc = "Keeping your drinks at the perfect temperature since 1892." - icon_state = "vacuumflask" - volume = 60 - center_of_mass = list("x"=15, "y"=4) - -/obj/item/reagent_containers/food/drinks/britcup - name = "cup" - desc = "A cup with the British flag emblazoned on it." - icon_state = "britcup" - volume = 30 - center_of_mass = list("x"=15, "y"=13) - -/obj/item/reagent_containers/food/drinks/britcup/on_reagent_change() - ..() - -/obj/item/reagent_containers/food/drinks/glue - name = "Glue" - desc = "A small bottle full of glue. The orange tip calls to you, and the fluid inside is non-toxic... Should you?" - icon_state = "glue" - drop_sound = 'sound/items/drop/cardboardbox.ogg' - volume = 30 - center_of_mass = list("x"=15, "y"=13) - -/obj/item/reagent_containers/food/drinks/glue/Initialize(mapload) - . = ..() - reagents.add_reagent("safeglue", 30) - -/obj/item/reagent_containers/food/drinks/glue/on_reagent_change() - ..() - if(reagents.total_volume) - icon_state = "glue" - else - icon_state = "glue_e" diff --git a/code/modules/food/food/ice_cream.dm b/code/modules/food/food/ice_cream.dm new file mode 100644 index 0000000000..75caca94bf --- /dev/null +++ b/code/modules/food/food/ice_cream.dm @@ -0,0 +1,229 @@ +/obj/item/reagent_containers/food/snacks/ice_cream + name = "waffle cone" + desc = "An empty waffle cone, presumably used to hold ice cream. How depressing." + icon = 'icons/modules/food/items/ice_cream.dmi' + icon_state = "wafflecone" + color = "#ffcc66" + appearance_flags = KEEP_TOGETHER + w_class = WEIGHT_CLASS_TINY + throw_force = 0 + damage_force = 0 + bitesize = 3 + + // :troll: + atom_flags = NOREACT + + /// already bit into? no double dipping! + var/can_keep_scooping = FALSE + /// overall sugar-ation; continuously compounded to be the % of scoops with sugar + var/snowflake_deliciousness = 0 + /// max scoops + var/scoop_max = 8 + /// current scoop position + /// once we're biting out of it, this goes down with every bite and is used to track overlays. + var/scoop_current = 0 + + /// prefill with scoops of these reagents + /// list(path, path, path, ...) + /// do not do path = amount; the association part of the list + /// is reserved for future use + var/list/start_with_scoop_of + /// standard scoop size + var/start_with_scoop_size = 3 + +/obj/item/reagent_containers/food/snacks/ice_cream/Initialize(mapload) + . = ..() + var/created_any = FALSE + for(var/key in start_with_scoop_of) + created_any = add_scoop(key, start_with_scoop_size, update_icon = FALSE) || created_any + if(created_any) + update_appearance() + +//! LEGACY CODE START + +/obj/item/reagent_containers/food/snacks/ice_cream/attempt_feed(mob/living/M, mob/living/user) + if(can_keep_scooping) + // being bitten into for the first time, compute values as needed + can_keep_scooping = FALSE + // 1 bite per scoop, plus 1 for the base scoop, plus 1 for the cone + bitesize = reagents.total_volume / (scoop_current + 1 + 1) + . = ..() + // add_bite_mark() + +//! END + +/** + * If reagent source is a holder, we will consume reagent_amount from it; otherwise, we magically make more. + */ +/obj/item/reagent_containers/food/snacks/ice_cream/proc/add_scoop(reagent_source, reagent_amount, sugarized = TRUE, update_icon = TRUE) + var/color + if(istype(reagent_source, /datum/reagent)) + var/datum/reagent/from_reagent = reagent_source + color = from_reagent.color + reagents.add_reagent(from_reagent.id, reagent_amount) + else if(ispath(reagent_source, /datum/reagent) || istext(reagent_source)) + var/datum/reagent/from_reagent = SSchemistry.fetch_reagent(reagent_source) + color = from_reagent.color + reagents.add_reagent(from_reagent.id, reagent_amount) + else if(istype(reagent_source, /datum/reagents)) + var/datum/reagents/from_holder = reagent_source + color = from_holder.get_color() + from_holder.transfer_to_holder(reagents, amount = reagent_amount) + + var/list/pos = overlay_position(++scoop_current) + if(isnull(pos)) + return TRUE + var/image/dollop = image(icon, icon_state = "dollop", pixel_x = pos[1], pixel_y = pos[2]) + dollop.color = color + dollop.appearance_flags = KEEP_APART | RESET_COLOR + add_overlay(dollop) + + // todo: this is awful + if(sugarized) + reagents.add_reagent(/datum/reagent/sugar, 2) + snowflake_deliciousness = ((snowflake_deliciousness * (scoop_current - 1)) + sugarized? 1 : 0) / scoop_current + + if(name == initial(name)) + name = "ice cream" + desc = "Delicious ice cream. This one has [scoop_current] scoops." + + return TRUE + +// todo: byond's renderer can go die in a goddamn fire; BLEND_SUBTRACT doesn't work for alpha masks obviously +// so we don't have a fast way of rendering dynamic bite marks without having to hard-sprite shit, +// which kinda ruins the point of dynamic ice cream, don't you think? +/* +/obj/item/reagent_containers/food/snacks/ice_cream/proc/add_bite_mark() + var/pos = scoop_current-- + var/list/offsets = overlay_position(pos) + if(isnull(offsets)) + return + var/image/bite_overlay = image(icon = icon, icon_state = "bite_mask") + bite_overlay.blend_mode = BLEND_SUBTRACT + bite_overlay.pixel_x = offsets[1] + bite_overlay.pixel_y = offsets[2] + add_overlay(bite_overlay) +*/ + +/obj/item/reagent_containers/food/snacks/ice_cream/throw_land(atom/A, datum/thrownthing/TT) + smash() + return COMPONENT_THROW_HIT_TERMINATE + +/obj/item/reagent_containers/food/snacks/ice_cream/proc/smash() + visible_message(SPAN_WARNING("[src] falls, getting smushed in the process.")) + new /obj/effect/debris/cleanable/ice_cream(drop_location(), src) + qdel(src) + +/obj/item/reagent_containers/food/snacks/ice_cream/proc/overlay_position(i) + switch(i) + if(0) + // this is bite mark for 'we're out' + return list(0, -4) + if(1) + return list(0, 0) + if(2) + return list(-3, 3) + if(3) + return list(3, 3) + if(4) + return list(0, 5) + if(5) + return list(-5, 5) + if(6) + return list(5, 5) + if(7) + return list(-3, 8) + if(8) + return list(3, 8) + +#define ICE_CREAM_PATHS(REAGENT_PATH, PATH_APPEND) \ +/obj/item/reagent_containers/food/snacks/ice_cream/##PATH_APPEND { \ + start_with_scoop_of = list(REAGENT_PATH); \ +} \ +/obj/item/reagent_containers/food/snacks/ice_cream/##PATH_APPEND/double { \ + start_with_scoop_of = list(REAGENT_PATH, REAGENT_PATH); \ +} \ +/obj/item/reagent_containers/food/snacks/ice_cream/##PATH_APPEND/triple { \ + start_with_scoop_of = list(REAGENT_PATH, REAGENT_PATH, REAGENT_PATH); \ +} + +ICE_CREAM_PATHS(/datum/reagent/nutriment/vanilla, vanilla) +ICE_CREAM_PATHS(/datum/reagent/drink/milk/chocolate, chocolate) +ICE_CREAM_PATHS(/datum/reagent/drink/juice/lemon, lemon) +ICE_CREAM_PATHS(/datum/reagent/drink/juice/orange, orange) +ICE_CREAM_PATHS(/datum/reagent/drink/juice/apple, apple) + +/obj/effect/debris/cleanable/ice_cream + name = "smashed ice cream" + desc = "How depressing." + icon = 'icons/modules/food/items/ice_cream.dmi' + icon_state = "melt1" + appearance_flags = KEEP_TOGETHER + atom_flags = NOREACT + + var/waffle_stage = 0 + var/melt_stage = 0 + + /// list of colors + var/list/dollops_left_colors + /// final color + var/final_color + +/obj/effect/debris/cleanable/ice_cream/Initialize(mapload, obj/item/reagent_containers/food/snacks/ice_cream/from_cone) + . = ..() + dollops_left_colors = list() + for(var/appearance/A as anything in from_cone?.overlays) + if(A.icon_state != "dollop") + continue + dollops_left_colors += A.color + create_reagents(1000) + // we're not reacting btw :) + from_cone.reagents.transfer_to_holder(reagents) + // get final color + final_color = reagents.get_color() + // trigger reactions in a bit + addtimer(CALLBACK(src, PROC_REF(start_reaction)), rand(0.5, 1.5 SECONDS)) + // trigger melt cycle + melt_more() + +/obj/effect/debris/cleanable/ice_cream/proc/start_reaction() + atom_flags &= ~NOREACT + reagents?.handle_reactions() + +/obj/effect/debris/cleanable/ice_cream/proc/melt_more() + cut_overlays() + + melt_stage = min(3, melt_stage + 1) + icon_state = "melt[melt_stage]" + + var/image/middle = image(icon, icon_state = "melt[melt_stage]") + middle.layer = FLOAT_LAYER - 2 + middle.color = final_color + middle.appearance_flags = KEEP_APART | RESET_COLOR + add_overlay(middle) + + if(length(dollops_left_colors)) + color = BlendRGB(color || "#ffffff", dollops_left_colors[1], 0.5) + dollops_left_colors.Cut(1, 2) + for(var/color in dollops_left_colors) + var/image/dollop = image(icon = icon, icon_state = "dollop") + dollop.color = color + dollop.pixel_x = rand(-8, 8) + dollop.pixel_y = rand(-8, 8) - 4 + dollop.appearance_flags = KEEP_APART | RESET_COLOR + dollop.layer = FLOAT_LAYER - 1 + var/image/puddle = image(dollop) + puddle.icon_state = "melt[melt_stage]" + puddle.layer = FLOAT_LAYER - 2 + puddle.pixel_y = 4 + add_overlay(puddle) + + if(length(dollops_left_colors) || melt_stage < 3 || waffle_stage < 3) + addtimer(CALLBACK(src, PROC_REF(melt_more)), rand(2, 5 MINUTES)) + + waffle_stage = min(3, waffle_stage + 1) + var/image/waffle = image(icon = icon, icon_state = "waffledrop[waffle_stage]") + waffle.color = "#ffcc66" + waffle.appearance_flags = KEEP_APART | RESET_COLOR + waffle.layer = FLOAT_LAYER + add_overlay(waffle) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 86d3ce188d..9437da8f8c 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/food.dmi' icon_state = null atom_flags = OPENCONTAINER + var/bitesize = 1 var/bitecount = 0 var/trash = null @@ -56,10 +57,7 @@ open(user) /obj/item/reagent_containers/food/snacks/proc/open(mob/user) - if(custom_open_sound) - playsound(loc,custom_open_sound, rand(10,50), 1) - else - playsound(loc,'sound/items/foodcanopen.ogg', rand(10,50), 1) + playsound(loc,custom_open_sound || 'sound/items/foodcanopen.ogg', rand(10,50), 1) if(opened_icon) icon_state = "[initial(icon_state)]-open" @@ -152,7 +150,8 @@ user.visible_message("[user] feeds [M] [src].") if(reagents) //Handle ingestion of the reagent. - playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + if(bite_sound) + playsound(M.loc,bite_sound, rand(10,50), 1) if(reagents.total_volume) if(reagents.total_volume > bitesize) reagents.trans_to_mob(M, bitesize, CHEM_INGEST) @@ -217,6 +216,9 @@ var/hide_item = !has_edge(W) || !can_slice_here if (hide_item) + var/confirm=input(user, "Are you certain you want to insert \the [W] into [src]?","Hide item") as null|anything in list("Yes","No") + if(!confirm || confirm == "No") + return if (W.w_class >= w_class || is_robot_module(W)) return if(!user.attempt_insert_item_for_installation(W, src)) @@ -412,7 +414,7 @@ desc = "Freeze Dried peas covered in a very spicy substance!" icon_state = "wasabi_peas" nutriment_amt = 4 - nutriment_desc = list("capsaicin" = 2, "protein" = 2) + nutriment_desc = list("wasabi" = 2, "protein" = 2) /obj/item/reagent_containers/food/snacks/bagged/wpeas/Initialize(mapload) . = ..() @@ -1885,7 +1887,10 @@ var/mob/living/carbon/human/H = M H.visible_message("A screeching creature bursts out of [M]'s chest!") var/obj/item/organ/external/organ = H.get_organ(BP_TORSO) - organ.take_damage(50, 0, 0, "Animal escaping the ribcage") + organ?.inflict_bodypart_damage( + brute = 50, + weapon_descriptor = "bursting", + ) Expand() /obj/item/reagent_containers/food/snacks/monkeycube/on_reagent_change() diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm deleted file mode 100644 index fd2f63fe8d..0000000000 --- a/code/modules/food/kitchen/icecream.dm +++ /dev/null @@ -1,198 +0,0 @@ -#define ICECREAM_VANILLA 1 -#define ICECREAM_CHOCOLATE 2 -#define ICECREAM_STRAWBERRY 3 -#define ICECREAM_BLUE 4 -#define CONE_WAFFLE 5 -#define CONE_CHOC 6 - -// Ported wholesale from Apollo Station. - -/obj/machinery/icecream_vat - name = "icecream vat" - desc = "Ding-aling ding dong. Get your NanoTrasen-approved ice cream!" - icon = 'icons/obj/kitchen.dmi' - icon_state = "icecream_vat" - density = 1 - anchored = 0 - use_power = 0 - atom_flags = OPENCONTAINER | NOREACT - // todo: temporary, as this is unbuildable - integrity_flags = INTEGRITY_INDESTRUCTIBLE - - var/list/product_types = list() - var/dispense_flavour = ICECREAM_VANILLA - var/flavour_name = "vanilla" - -/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type) - switch(type) - if(ICECREAM_CHOCOLATE) - return list("milk", "ice", "coco") - if(ICECREAM_STRAWBERRY) - return list("milk", "ice", "berryjuice") - if(ICECREAM_BLUE) - return list("milk", "ice", "singulo") - if(CONE_WAFFLE) - return list("flour", "sugar") - if(CONE_CHOC) - return list("flour", "sugar", "coco") - else - return list("milk", "ice") - -/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type) - switch(flavour_type) - if(ICECREAM_CHOCOLATE) - return "chocolate" - if(ICECREAM_STRAWBERRY) - return "strawberry" - if(ICECREAM_BLUE) - return "blue" - if(CONE_WAFFLE) - return "waffle" - if(CONE_CHOC) - return "chocolate" - else - return "vanilla" - -/obj/machinery/icecream_vat/Initialize(mapload) - . = ..() - create_reagents(100) - while(product_types.len < 6) - product_types.Add(5) - reagents.add_reagent("milk", 5) - reagents.add_reagent("flour", 5) - reagents.add_reagent("sugar", 5) - reagents.add_reagent("ice", 5) - -/obj/machinery/icecream_vat/attack_hand(mob/user, list/params) - user.set_machine(src) - interact(user) - -/obj/machinery/icecream_vat/interact(mob/user as mob) - var/dat - dat += "ICECREAM
" - dat += "Dispensing: [flavour_name] icecream

" - dat += "Vanilla icecream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
" - dat += "Strawberry icecream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
" - dat += "Chocolate icecream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
" - dat += "Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
" - dat += "
CONES
" - dat += "Waffle cones: Dispense Make x5 [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)
" - dat += "Chocolate cones: Dispense Make x5 [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)
" - dat += "
" - dat += "VAT CONTENT
" - for(var/datum/reagent/R in reagents.reagent_list) - dat += "[R.name]: [R.volume]" - dat += "Purge
" - dat += "Refresh Close" - - var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src) - popup.set_content(dat) - popup.open() - -/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/reagent_containers/food/snacks/icecream)) - var/obj/item/reagent_containers/food/snacks/icecream/I = O - if(!I.ice_creamed) - if(product_types[dispense_flavour] > 0) - src.visible_message("[icon2html(thing = src, target = world)] [user] scoops delicious [flavour_name] icecream into [I].") - product_types[dispense_flavour] -= 1 - I.add_ice_cream(flavour_name) - // if(beaker) - // beaker.reagents.trans_to(I, 10) - if(I.reagents.total_volume < 10) - I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) - else - to_chat(user, "There is not enough icecream left!") - else - to_chat(user, "[O] already has icecream in it.") - return 1 - else if(O.is_open_container()) - return - else - ..() - -/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type, var/amount) - for(var/R in get_ingredient_list(make_type)) - if(reagents.has_reagent(R, amount)) - continue - amount = 0 - break - if(amount) - for(var/R in get_ingredient_list(make_type)) - reagents.remove_reagent(R, amount) - product_types[make_type] += amount - var/flavour = get_flavour_name(make_type) - if(make_type > 4) - src.visible_message("[user] cooks up some [flavour] cones.") - else - src.visible_message("[user] whips up some [flavour] icecream.") - else - to_chat(user, "You don't have the ingredients to make this.") - -/obj/machinery/icecream_vat/Topic(href, href_list) - - if(..()) - return - - if(href_list["select"]) - dispense_flavour = text2num(href_list["select"]) - flavour_name = get_flavour_name(dispense_flavour) - src.visible_message("[usr] sets [src] to dispense [flavour_name] flavoured icecream.") - - if(href_list["cone"]) - var/dispense_cone = text2num(href_list["cone"]) - var/cone_name = get_flavour_name(dispense_cone) - if(product_types[dispense_cone] >= 1) - product_types[dispense_cone] -= 1 - var/obj/item/reagent_containers/food/snacks/icecream/I = new(src.loc) - I.cone_type = cone_name - I.icon_state = "icecream_cone_[cone_name]" - I.desc = "Delicious [cone_name] cone, but no ice cream." - src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") - else - to_chat(usr, "There are no [cone_name] cones left!") - - if(href_list["make"]) - var/amount = (text2num(href_list["amount"])) - var/C = text2num(href_list["make"]) - make(usr, C, amount) - - if(href_list["disposeI"]) - reagents.del_reagent(href_list["disposeI"]) - - updateDialog() - - if(href_list["refresh"]) - updateDialog() - - if(href_list["close"]) - usr.unset_machine() - usr << browse(null,"window=icecreamvat") - return - -/obj/item/reagent_containers/food/snacks/icecream - name = "ice cream cone" - desc = "Delicious waffle cone, but no ice cream." - icon_state = "icecream_cone_waffle" //default for admin-spawned cones, href_list["cone"] should overwrite this all the time - bitesize = 3 - - var/ice_creamed = 0 - var/cone_type - -/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload) - . = ..() - create_reagents(20) - reagents.add_reagent("nutriment", 5) - -/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name) - name = "[flavour_name] icecream" - add_overlay("icecream_[flavour_name]") - desc = "Delicious [cone_type] cone with a dollop of [flavour_name] ice cream." - ice_creamed = 1 - -#undef ICECREAM_VANILLA -#undef ICECREAM_STRAWBERRY -#undef ICECREAM_CHOCOLATE -#undef ICECREAM_BLUE -#undef CONE_WAFFLE -#undef CONE_CHOC diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/machinery/appliance/_appliance.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_appliance.dm rename to code/modules/food/machinery/appliance/_appliance.dm diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/machinery/appliance/_cooker.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_cooker.dm rename to code/modules/food/machinery/appliance/_cooker.dm diff --git a/code/modules/food/kitchen/cooking_machines/_cooker_output.dm b/code/modules/food/machinery/appliance/_cooker_output.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_cooker_output.dm rename to code/modules/food/machinery/appliance/_cooker_output.dm diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/machinery/appliance/_mixer.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/_mixer.dm rename to code/modules/food/machinery/appliance/_mixer.dm diff --git a/code/modules/food/kitchen/cooking_machines/candy.dm b/code/modules/food/machinery/appliance/candy.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/candy.dm rename to code/modules/food/machinery/appliance/candy.dm diff --git a/code/modules/food/kitchen/cooking_machines/cereal.dm b/code/modules/food/machinery/appliance/cereal.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/cereal.dm rename to code/modules/food/machinery/appliance/cereal.dm diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/machinery/appliance/container.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/container.dm rename to code/modules/food/machinery/appliance/container.dm diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/machinery/appliance/fryer.dm similarity index 98% rename from code/modules/food/kitchen/cooking_machines/fryer.dm rename to code/modules/food/machinery/appliance/fryer.dm index 1abe2a7160..7b44b59654 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/machinery/appliance/fryer.dm @@ -181,12 +181,17 @@ for(var/obj/item/organ/external/child in E.children) if(nopain && nopain < 2 && !(child.robotic >= ORGAN_ROBOT)) nopain = 0 - child.take_damage(0, damage) + child.inflict_bodypart_damage( + burn = damage, + ) damage -= (damage*0.5)//IF someone's arm is plunged in, the hand should take most of it E.take_damage(0, damage) else - victim.apply_damage(damage, BURN, user.zone_sel.selecting) + victim.take_targeted_damage( + burn = damage, + body_zone = user.zone_sel.selecting, + ) if(!nopain) diff --git a/code/modules/food/kitchen/cooking_machines/grill.dm b/code/modules/food/machinery/appliance/grill.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/grill.dm rename to code/modules/food/machinery/appliance/grill.dm diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/machinery/appliance/oven.dm similarity index 100% rename from code/modules/food/kitchen/cooking_machines/oven.dm rename to code/modules/food/machinery/appliance/oven.dm diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/machinery/gibber.dm similarity index 100% rename from code/modules/food/kitchen/gibber.dm rename to code/modules/food/machinery/gibber.dm diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/machinery/microwave.dm similarity index 100% rename from code/modules/food/kitchen/microwave.dm rename to code/modules/food/machinery/microwave.dm diff --git a/code/modules/food/kitchen/smartfridge.dm b/code/modules/food/machinery/smartfridge.dm similarity index 100% rename from code/modules/food/kitchen/smartfridge.dm rename to code/modules/food/machinery/smartfridge.dm diff --git a/code/modules/food/kitchen/smartfridge_vr.dm b/code/modules/food/machinery/smartfridge_vr.dm similarity index 100% rename from code/modules/food/kitchen/smartfridge_vr.dm rename to code/modules/food/machinery/smartfridge_vr.dm diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 75d3a76cbb..d1fd268709 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1,24 +1,6 @@ // see code/datums/recipe.dm - -/* No telebacon. just no... -/datum/recipe/telebacon - items = list( - /obj/item/reagent_containers/food/snacks/meat, - /obj/item/assembly/signaler - ) - result = /obj/item/reagent_containers/food/snacks/telebacon - -I said no! -/datum/recipe/syntitelebacon - items = list( - /obj/item/reagent_containers/food/snacks/meat/syntiflesh, - /obj/item/assembly/signaler - ) - result = /obj/item/reagent_containers/food/snacks/telebacon -*/ - /datum/recipe/friedegg reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( @@ -678,7 +660,7 @@ I said no! /datum/recipe/icecreamsandwich reagents = list("milk" = 5, "ice" = 5) items = list( - /obj/item/reagent_containers/food/snacks/icecream + /obj/item/reagent_containers/food/snacks/ice_cream, ) result = /obj/item/reagent_containers/food/snacks/icecreamsandwich @@ -1367,7 +1349,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/crayonburger_rbw /datum/recipe/rkibble - reagents = list("milk" = 5, "cooking_oil" = 10) + reagents = list("milk" = 5, "tallow" = 10) items = list( /obj/item/robot_parts/head, /obj/item/stack/rods @@ -1540,8 +1522,8 @@ I said no! reagents = list("milk" = 5, "ice" = 5) items = list( /obj/item/reagent_containers/food/snacks/chocolatebar, - /obj/item/reagent_containers/food/snacks/icecream, - /obj/item/reagent_containers/food/snacks/icecream + /obj/item/reagent_containers/food/snacks/ice_cream, + /obj/item/reagent_containers/food/snacks/ice_cream, ) result = /obj/item/reagent_containers/food/snacks/bananasplit diff --git a/code/modules/food/structures/icecream_cart.dm b/code/modules/food/structures/icecream_cart.dm new file mode 100644 index 0000000000..520ded7a06 --- /dev/null +++ b/code/modules/food/structures/icecream_cart.dm @@ -0,0 +1,243 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +/** + * Citadel Station's dynamic icecream module, now with added grief potential. + * + * - Cones can be made out of flour by the machine + * - Cones can be infused with reagents as they are created + * - Cones can be scoops of anything added to them, as long as it's turned into icecream-ified reagents + * - You ice-creamify reagents with ice, milk, and sugar; minimum ice, but it won't taste as good without the others. + * + * Only flour, ice, milk, and sugar are stored internally. + * Other reagents are provided from reagent containers. + * + * This fully supports separated chemicals. Take that as you will. + */ +/obj/structure/icecream_cart + name = "icecream cart" + desc = "Here on the galactic frontiers, even the ice-cream carts are advanced! Now with support for separated chemicals." + icon = 'icons/modules/food/structures/ice_cream.dmi' + icon_state = "cart" + density = TRUE + anchored = FALSE + + // todo: temporary, as this is unbuildable + integrity_flags = INTEGRITY_INDESTRUCTIBLE + + /// stored reagent containers to be used for drawing from + var/list/obj/item/reagent_containers/sources + + /// selected index of reagent container to make ice cream with + var/selected_ice_cream_source + + /// flour cost of cone + var/cone_flour_cost = 2 + /// max cones held + var/cone_storage = 10 + /// milk cost of scoop + var/scoop_milk_cost = 2 + /// ice cost of scoop - this is mandatory + var/scoop_ice_cost = 2 + /// how much reagents it can pack into a single scoop of ice cream + var/scoop_infuse_amount = 2 + /// how much sugar is needed per scoop for it to taste good + var/scoop_sugar_cost = 1 + + /// self-explanatory + var/max_sources = 10 + +/obj/structure/icecream_cart/Initialize(mapload) + create_reagents(1000) + . = ..() + +/obj/structure/icecream_cart/examine(mob/user, dist) + . = ..() + . += SPAN_NOTICE("Use a reagent container with an open lid on this to refill its core ingredients.") + . += SPAN_NOTICE("Click-drag a reagent container with an open lid on this to add it as a mixing source.") + . += SPAN_NOTICE("Click on this with an intact ice-cream cone to dispense a dollop of ice cream into it.") + +/obj/structure/icecream_cart/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "IcecreamCart") + ui.open() + +/obj/structure/icecream_cart/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) + . = ..() + .["scoopSource"] = selected_ice_cream_source + +/obj/structure/icecream_cart/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) + . = ..() + .["coneFlourCost"] = cone_flour_cost + .["scoopMilkCost"] = scoop_milk_cost + .["scoopIceCost"] = scoop_ice_cost + .["scoopInfuseCost"] = scoop_infuse_amount + var/list/collect_sources = list() + var/list/collect_base = list( + "milk" = reagents.get_reagent_amount(/datum/reagent/drink/milk), + "flour" = reagents.get_reagent_amount(/datum/reagent/nutriment/flour), + "sugar" = reagents.get_reagent_amount(/datum/reagent/sugar), + "ice" = reagents.get_reagent_amount(/datum/reagent/drink/ice), + ) + for(var/obj/item/reagent_containers/container as anything in sources) + collect_sources[++collect_sources.len] = list( + "name" = container.name, + "volume" = container.reagents.total_volume, + "maxVolume" = container.reagents.maximum_volume, + "color" = container.reagents.get_color(), + "ref" = ref(container), + ) + .["baseIngredients"] = collect_base + .["sources"] = collect_sources + +/obj/structure/icecream_cart/ui_act(action, list/params, datum/tgui/ui) + . = ..() + if(.) + return + switch(action) + if("selectProduce") + var/index = text2num(params["index"]) + selected_ice_cream_source = (sources && index >= 1 && index <= length(sources))? index : null + return TRUE + if("ejectSource") + var/index = text2num(params["index"]) + var/obj/item/reagent_containers/container = SAFEINDEXACCESS(sources, index) + if(isnull(container)) + return TRUE + usr.grab_item_from_interacted_with(container, src) + sources -= container + usr.visible_action_feedback( + target = src, + hard_range = MESSAGE_RANGE_CONFIGURATION, + visible_hard = SPAN_NOTICE("[usr] removes [container] from [src]."), + ) + update_static_data() + return TRUE + if("produceCone") + if(!reagents.has_reagent(/datum/reagent/nutriment/flour, cone_flour_cost)) + usr.action_feedback(SPAN_WARNING("[src] doesn't have enough flour left for a new cone."), src) + return TRUE + if(!give_cone(produce_cone(), usr)) + return TRUE + usr.action_feedback(SPAN_NOTICE("You create an empty waffle cone."), src) + return TRUE + +/obj/structure/icecream_cart/proc/produce_cone(force) + if(!force) + if(!reagents.has_reagent(/datum/reagent/nutriment/flour, cone_flour_cost)) + return FALSE + reagents.remove_reagent(/datum/reagent/nutriment/flour, cone_flour_cost) + // todo: doesn't require full resend + update_static_data() + var/obj/item/reagent_containers/food/snacks/ice_cream/cone = new(src) + return cone + +/obj/structure/icecream_cart/proc/give_cone(obj/item/reagent_containers/food/snacks/ice_cream/cone, mob/give_to) + if(isnull(cone)) + return FALSE + give_to.put_in_hands_or_drop(cone, drop_loc = drop_location()) + return TRUE + +/obj/structure/icecream_cart/proc/fill_cone(obj/item/reagent_containers/food/snacks/ice_cream/cone, force, mob/user) + if(!reagents.has_reagent(/datum/reagent/drink/ice, scoop_ice_cost)) + user.action_feedback(SPAN_WARNING("There is not enough ice left in [src] to make a dollop."), src) + return FALSE + if(!reagents.has_reagent(/datum/reagent/drink/milk, scoop_milk_cost)) + user.action_feedback(SPAN_WARNING("There is not enough milk left in [src] to make a dollop."), src) + return FALSE + var/has_sugar = !reagents.has_reagent(/datum/reagent/sugar, scoop_sugar_cost) + reagents.remove_reagent(/datum/reagent/drink/ice, scoop_ice_cost) + reagents.remove_reagent(/datum/reagent/drink/milk, scoop_milk_cost) + if(has_sugar) + reagents.remove_reagent(/datum/reagent/sugar, scoop_sugar_cost) + var/obj/item/reagent_containers/infuse_source = SAFEINDEXACCESS(sources, selected_ice_cream_source) + cone.add_scoop(infuse_source?.reagents || /datum/reagent/drink/milk, scoop_infuse_amount, has_sugar, TRUE) + return TRUE + +/obj/structure/icecream_cart/attackby(obj/item/I, mob/user, list/params, clickchain_flags, damage_multiplier) + if(user.a_intent == INTENT_HARM) + return ..() + // handle cones + if(istype(I, /obj/item/reagent_containers/food/snacks/ice_cream)) + var/obj/item/reagent_containers/food/snacks/ice_cream/ice_cream = I + if(!ice_cream.can_keep_scooping) + user.action_feedback(SPAN_WARNING("[ice_cream] was already bitten out of!"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(ice_cream.scoop_current >= ice_cream.scoop_max) + user.action_feedback(SPAN_WARNING("[ice_cream] is more than topped off already!"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(!fill_cone(ice_cream, user = user)) + return CLICKCHAIN_DO_NOT_PROPAGATE + user.visible_action_feedback( + target = src, + hard_range = MESSAGE_RANGE_CONSTRUCTION, + visible_hard = SPAN_NOTICE("[user] fills \the [ice_cream] with [ice_cream.scoop_current > 1? "another" : "a"] delicious dollop of ice cream from \the [src].") + ) + update_static_data() + return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING + // handle filling + if(!istype(I, /obj/item/reagent_containers)) + // not a container + return ..() + var/obj/item/reagent_containers/container = I + if(!container.reagents) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(!container.is_open_container()) + user.action_feedback(SPAN_WARNING("[container] is not an open container. Did you try removing the lid, if it has one?"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + var/units_transferred = container.reagents.transfer_to_holder( + target = reagents, + reagents = list( + /datum/reagent/nutriment/flour, + /datum/reagent/drink/ice, + /datum/reagent/drink/milk, + ), + ) + if(!units_transferred) + user.action_feedback(SPAN_WARNING("[container] has no valid reagents to transfer to [src]. Did you mean to insert the container as a reagent source instead? (Click-drag)"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + user.visible_action_feedback( + target = src, + hard_range = MESSAGE_RANGE_CONFIGURATION, + visible_hard = SPAN_NOTICE("[user] refills [src] with [container]."), + visible_self = SPAN_NOTICE("You refill [src] with [units_transferred] units of reagents from [container]."), + ) + // todo: this doesn't need a full data push + update_static_data() + return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE + +/obj/structure/icecream_cart/MouseDroppedOn(atom/dropping, mob/user, proximity, params) + . = ..() + if(. & CLICKCHAIN_DO_NOT_PROPAGATE) + return + if(!istype(dropping, /obj/item/reagent_containers)) + return + var/obj/item/reagent_containers/container = dropping + if(!container.reagents) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(!container.is_open_container()) + user.action_feedback(SPAN_WARNING("[container] is not an open container. Did you try removing the lid, if it has one?"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + if(length(sources) > max_sources) + user.action_feedback(SPAN_WARNING("[src] already has too many containers in it. Remove one first."), src) + return CLICKCHAIN_DO_NOT_PROPAGATE + user.visible_action_feedback( + src, + hard_range = MESSAGE_RANGE_CONFIGURATION, + visible_hard = SPAN_NOTICE("[user] inserts [dropping] into one of [src]'s reagent slots."), + ) + container.forceMove(src) + LAZYADD(sources, container) + update_static_data() + return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE + +/obj/structure/icecream_cart/loaded + var/prefill_amount = 60 + +/obj/structure/icecream_cart/loaded/Initialize() + . = ..() + reagents.add_reagent(/datum/reagent/drink/ice, prefill_amount) + reagents.add_reagent(/datum/reagent/drink/milk, prefill_amount) + reagents.add_reagent(/datum/reagent/sugar, prefill_amount) + reagents.add_reagent(/datum/reagent/nutriment/flour, prefill_amount) diff --git a/code/modules/gamemaster/actions/atmos_leak.dm b/code/modules/gamemaster/actions/atmos_leak.dm index 59dd4422cd..bda6f5c486 100644 --- a/code/modules/gamemaster/actions/atmos_leak.dm +++ b/code/modules/gamemaster/actions/atmos_leak.dm @@ -69,7 +69,7 @@ // Fow now just add a bunch of it to the air var/datum/gas_mixture/air_contents = new air_contents.temperature = T20C + ((severity - 1) * rand(-50, 50)) - air_contents.gas[gas_type] = 10 * MOLES_CELLSTANDARD + air_contents.gas[gas_type] = 10 * CELL_MOLES target_turf.assume_air(air_contents) playsound(target_turf, 'sound/effects/smoke.ogg', 50, 1) diff --git a/code/modules/gamemaster/actions/canister_leak.dm b/code/modules/gamemaster/actions/canister_leak.dm index b15465ce62..11aac50d32 100644 --- a/code/modules/gamemaster/actions/canister_leak.dm +++ b/code/modules/gamemaster/actions/canister_leak.dm @@ -15,7 +15,7 @@ // List of all non-destroyed canisters on station levels var/list/all_canisters = list() for(var/obj/machinery/portable_atmospherics/canister/C in GLOB.machines) - if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= MOLES_CELLSTANDARD) + if(!C.destroyed && (C.z in (LEGACY_MAP_DATUM).station_levels) && C.air_contents.total_moles >= CELL_MOLES) all_canisters += C var/obj/machinery/portable_atmospherics/canister/C = pick(all_canisters) log_debug(SPAN_DEBUGWARNING("canister_leak event: Canister [ADMIN_JMP(C)]) destroyed.")) diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index 582bfd5ff5..0564c630fc 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -51,7 +51,9 @@ if(!H.reagents.has_reagent("dexalin")) for(var/organ_name in BP_ALL) var/obj/item/organ/external/E = H.get_organ(organ_name) - E.take_damage(0, 5, 0) + E.inflict_bodypart_damage( + burn = 5, + ) /datum/genetics/side_effect/bone_snap name = "Bone Snap" @@ -67,7 +69,9 @@ if(!H.reagents.has_reagent("bicaridine")) var/organ_name = pick(BP_ALL) var/obj/item/organ/external/E = H.get_organ(organ_name) - E.take_damage(20, 0, 0) + E.inflict_bodypart_damage( + brute = 20, + ) E.fracture() /*/datum/genetics/side_effect/monkey diff --git a/code/modules/ghostroles/instantiator.dm b/code/modules/ghostroles/instantiator.dm index 1818870848..2b532457dd 100644 --- a/code/modules/ghostroles/instantiator.dm +++ b/code/modules/ghostroles/instantiator.dm @@ -178,7 +178,6 @@ //var/species_restricted = null /datum/ghostrole_instantiator/human/player_static/Create(client/C, atom/location, list/params) - var/mob/living/carbon/human/H = ..() var/list/errors = list() // todo: respect warnings; we ignore them right now so we don't block joins. if(!C.prefs.spawn_checks(PREF_COPY_TO_FOR_GHOSTROLE | PREF_COPY_TO_NO_CHECK_SPECIES, errors)) @@ -189,6 +188,7 @@ to_chat(C, SPAN_WARNING("

--- Character Species Is Not Allowed In This Role - Please resolve these to continue ---


-    [jointext(errors, "
-    ")]")) return + var/mob/living/carbon/human/H = ..() LoadSavefile(C, H) return H diff --git a/code/modules/ghostroles/menu.dm b/code/modules/ghostroles/menu.dm index 14e914526a..5d86f3cb84 100644 --- a/code/modules/ghostroles/menu.dm +++ b/code/modules/ghostroles/menu.dm @@ -2,7 +2,7 @@ GLOBAL_DATUM_INIT(ghostrole_menu, /datum/ghostrole_menu, new) /datum/ghostrole_menu -/datum/ghostrole_menu/ui_state(mob/user, datum/tgui_module/module) +/datum/ghostrole_menu/ui_state() return GLOB.observer_state /datum/ghostrole_menu/ui_interact(mob/user, datum/tgui/ui) @@ -11,7 +11,7 @@ GLOBAL_DATUM_INIT(ghostrole_menu, /datum/ghostrole_menu, new) ui = new(user, src, "SpawnersMenu") ui.open() -/datum/ghostrole_menu/ui_static_data(mob/user) +/datum/ghostrole_menu/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/list/spawners = list() .["spawners"] = spawners @@ -31,7 +31,7 @@ GLOBAL_DATUM_INIT(ghostrole_menu, /datum/ghostrole_menu, new) data["amount_left"] = slots == INFINITY? -1 : slots spawners += list(data) // wrap -/datum/ghostrole_menu/ui_act(action, params) +/datum/ghostrole_menu/ui_act(action, list/params, datum/tgui/ui) if(..()) return if(!isobserver(usr)) diff --git a/code/modules/guidebook/guidebook.dm b/code/modules/guidebook/guidebook.dm index 357b3d303f..6aa92d6e6f 100644 --- a/code/modules/guidebook/guidebook.dm +++ b/code/modules/guidebook/guidebook.dm @@ -12,14 +12,14 @@ GLOBAL_DATUM_INIT(guidebook, /datum/guidebook, new) /// open instances mapped to list of ids var/list/opened = list() -/datum/guidebook/ui_state(mob/user, datum/tgui_module/module) +/datum/guidebook/ui_state() return GLOB.always_state -/datum/guidebook/ui_close(mob/user, datum/tgui_module/module) +/datum/guidebook/on_ui_close(mob/user, datum/tgui/ui, embedded) opened -= user return ..() -/datum/guidebook/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui) +/datum/guidebook/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui, embedded) opened[new_mob] = opened[old_mob] opened -= old_mob return ..() diff --git a/code/modules/hardsuits/_rig.dm b/code/modules/hardsuits/_rig.dm index d73aa4e3c3..eabe8aee39 100644 --- a/code/modules/hardsuits/_rig.dm +++ b/code/modules/hardsuits/_rig.dm @@ -289,7 +289,11 @@ toggle_piece("chest", M, ONLY_DEPLOY) toggle_piece("boots", M, ONLY_DEPLOY) if(suit_is_deployed()) - M.adjustBruteLossByPart(70, BP_TORSO) + M.take_targeted_damage( + brute = 70, + damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE | DAMAGE_MODE_SHRED, + body_zone = BP_TORSO, + ) for(var/harm = 8; harm > 0; harm--) M.adjustBruteLoss(10) playsound(src.loc, 'sound/weapons/gunshot_generic_rifle.ogg', 40, 1) diff --git a/code/modules/hardsuits/rig_pieces.dm b/code/modules/hardsuits/rig_pieces.dm index 580ccc9138..31cea56b03 100644 --- a/code/modules/hardsuits/rig_pieces.dm +++ b/code/modules/hardsuits/rig_pieces.dm @@ -8,8 +8,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | ALLOW_SURVIVALFOOD | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB | ALLOWINTERNALS inv_hide_flags = HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR body_cover_flags = HEAD|FACE|EYES - heat_protection = HEAD|FACE|EYES - cold_protection = HEAD|FACE|EYES + heat_protection_cover = HEAD|FACE|EYES + cold_protection_cover = HEAD|FACE|EYES brightness_on = 4 max_pressure_protection = null @@ -51,8 +51,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB atom_flags = PHORONGUARD body_cover_flags = HANDS - heat_protection = HANDS - cold_protection = HANDS + heat_protection_cover = HANDS + cold_protection_cover = HANDS weight = 0 encumbrance = 0 @@ -89,8 +89,8 @@ atom_flags = PHORONGUARD clothing_flags = CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB body_cover_flags = FEET - cold_protection = FEET - heat_protection = FEET + cold_protection_cover = FEET + heat_protection_cover = FEET icon_base = null damage_force = 5 // if you're kicking someone with something meant to keep you locked on a hunk of metal... @@ -132,10 +132,10 @@ //Flags body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS atom_flags = PHORONGUARD inv_hide_flags = HIDEJUMPSUIT|HIDETAIL - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS weight = 0 encumbrance = 0 @@ -232,8 +232,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | ALLOWINTERNALS | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB atom_flags = PHORONGUARD body_cover_flags = HEAD|FACE|EYES - heat_protection = HEAD|FACE|EYES - cold_protection = HEAD|FACE|EYES + heat_protection_cover = HEAD|FACE|EYES + cold_protection_cover = HEAD|FACE|EYES /obj/item/clothing/suit/lightrig name = "suit" @@ -242,8 +242,8 @@ clothing_flags = CLOTHING_THICK_MATERIAL | CLOTHING_INJECTION_PORT | CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB atom_flags = PHORONGUARD body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /obj/item/clothing/shoes/lightrig name = "boots" @@ -251,8 +251,8 @@ clothing_flags = CLOTHING_IGNORE_BELTLINK | CLOTHING_IGNORE_DELIMB species_restricted = null body_cover_flags = FEET - cold_protection = FEET - heat_protection = FEET + cold_protection_cover = FEET + heat_protection_cover = FEET /obj/item/clothing/gloves/gauntlets/lightrig name = "gloves" @@ -260,5 +260,5 @@ atom_flags = PHORONGUARD species_restricted = null body_cover_flags = HANDS - heat_protection = HANDS - cold_protection = HANDS + heat_protection_cover = HANDS + cold_protection_cover = HANDS diff --git a/code/modules/hardsuits/rig_verbs.dm b/code/modules/hardsuits/rig_verbs.dm index 64a4d36790..d2cdb01843 100644 --- a/code/modules/hardsuits/rig_verbs.dm +++ b/code/modules/hardsuits/rig_verbs.dm @@ -137,7 +137,7 @@ to_chat(usr, "The hardsuit is not being worn.") return - if(!check_suit_access(usr)) + if(!is_activated() && !check_suit_access(usr)) return toggle_seals(wearer) diff --git a/code/modules/holidays/halloween_loadout_masquarade.dm b/code/modules/holidays/halloween_loadout_masquarade.dm index 1bd50f8cf3..535d7c1449 100644 --- a/code/modules/holidays/halloween_loadout_masquarade.dm +++ b/code/modules/holidays/halloween_loadout_masquarade.dm @@ -53,7 +53,7 @@ inhand_state = "black" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_armor display_name = "Sneaksuit Armor" @@ -67,7 +67,7 @@ inhand_state = "armor" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = UPPER_TORSO|LOWER_TORSO - cold_protection = UPPER_TORSO|LOWER_TORSO + cold_protection_cover = UPPER_TORSO|LOWER_TORSO /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_gloves display_name = "Sneaksuit Gloves" @@ -81,7 +81,7 @@ inhand_state = "black" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HANDS - cold_protection = HANDS + cold_protection_cover = HANDS /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_helmet display_name = "Sneaksuit Helmet" @@ -96,7 +96,7 @@ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_shoes display_name = "Sneaksuit Boots" @@ -110,7 +110,7 @@ inhand_state = "cult" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = FEET - cold_protection = FEET + cold_protection_cover = FEET /datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_mask display_name = "Sneaksuit Mask" @@ -125,7 +125,7 @@ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/syndicate/contractor_helmet display_name = "Contractor Helmet" @@ -140,7 +140,7 @@ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/syndicate/contractor_suit display_name = "Contractor Suit" @@ -154,7 +154,7 @@ inhand_state = "armor" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET /datum/loadout_entry/seasonal/masquarade/syndicate/esword display_name = "Energy Sword (toy)" @@ -188,7 +188,7 @@ default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/changeling/chitin_suit display_name = "Chitin Suit" @@ -200,7 +200,7 @@ icon = 'icons/antagonists/changeling/items/clothing.dmi' default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET /datum/loadout_entry/seasonal/masquarade/changeling/flesh_hood display_name = "Flesh Hood" @@ -213,7 +213,7 @@ default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/changeling/flesh_suit display_name = "Flesh Suit" @@ -225,7 +225,7 @@ icon = 'icons/antagonists/changeling/items/clothing.dmi' default_worn_icon = 'icons/antagonists/changeling/on_mob/clothing.dmi' body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET /datum/loadout_entry/seasonal/masquarade/changeling/arm_blade display_name = "Arm Blade" @@ -294,7 +294,7 @@ icon_state = "clockwork_helmet" body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD /datum/loadout_entry/seasonal/masquarade/clockcult/suit display_name = "Armor" @@ -306,7 +306,7 @@ default_worn_icon = 'icons/antagonists/clockcult/on_mob/clothing.dmi' icon_state = "clockwork_cuirass" body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /datum/loadout_entry/seasonal/masquarade/clockcult/boots display_name = "Boots" @@ -318,7 +318,7 @@ default_worn_icon = 'icons/antagonists/clockcult/on_mob/clothing.dmi' icon_state = "clockwork_treads" body_cover_flags = FEET - cold_protection = FEET + cold_protection_cover = FEET /datum/loadout_entry/seasonal/masquarade/clockcult/gloves display_name = "Gloves" @@ -330,7 +330,7 @@ default_worn_icon = 'icons/antagonists/clockcult/on_mob/clothing.dmi' icon_state = "clockwork_gauntlets" body_cover_flags = HANDS - cold_protection = HANDS + cold_protection_cover = HANDS /datum/loadout_entry/seasonal/masquarade/clockcult/slab display_name = "Slab" @@ -447,7 +447,7 @@ icon_state = "cult" hoodtype = /obj/item/clothing/head/hood/fake_cult_hardsuit body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS|FEET|HANDS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_cult_hardsuit @@ -456,7 +456,7 @@ icon_state = "culthelm" body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/cult/robes_new @@ -469,7 +469,7 @@ icon_state = "cultrobesalt" hoodtype = /obj/item/clothing/head/hood/fake_cult_robes_new body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_cult_robes_new @@ -477,7 +477,7 @@ icon = 'icons/clothing/suit/antag/cult.dmi' icon_state = "culthoodalt" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/cult/robes_old @@ -490,7 +490,7 @@ icon_state = "cultrobes" hoodtype = /obj/item/clothing/head/hood/fake_cult_robes_old body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_cult_robes_old @@ -498,7 +498,7 @@ icon = 'icons/clothing/suit/antag/cult.dmi' icon_state = "culthood" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/cult/sword @@ -522,7 +522,7 @@ icon_state = "eldritcharmor" hoodtype = /obj/item/clothing/head/hood/fake_heretic body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_heretic @@ -530,7 +530,7 @@ icon = 'icons/clothing/suit/antag/heretic.dmi' icon_state = "eldritchhood" body_cover_flags = HEAD - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /datum/loadout_entry/seasonal/masquarade/heretic/void_cloak @@ -543,7 +543,7 @@ icon_state = "voidcloak" hoodtype = /obj/item/clothing/head/hood/fake_void body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS - cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + cold_protection_cover = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /obj/item/clothing/head/hood/fake_void @@ -552,7 +552,7 @@ icon_state = "voidhood" body_cover_flags = HEAD|EYES clothing_flags = ALLOWINTERNALS - cold_protection = HEAD + cold_protection_cover = HEAD worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL /* diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 4d8fd05a68..9580722477 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -143,7 +143,7 @@ ui = new(user, src, "BotanyIsolator", name) ui.open() -/obj/machinery/botany/extractor/ui_data(mob/user) +/obj/machinery/botany/extractor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/geneMasks = SSplants.gene_masked_list @@ -271,7 +271,7 @@ ui = new(user, src, "BotanyEditor", name) ui.open() -/obj/machinery/botany/editor/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/botany/editor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["activity"] = active diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index ec86d7b215..2d8ddb5c68 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -244,7 +244,7 @@ ui = new(user, src, "SeedStorage", name) ui.open() -/obj/machinery/seed_storage/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/seed_storage/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(smart) diff --git a/code/modules/instruments/instruments/item.dm b/code/modules/instruments/instruments/item.dm index 192b4fdf77..4b5cf182a1 100644 --- a/code/modules/instruments/instruments/item.dm +++ b/code/modules/instruments/instruments/item.dm @@ -264,7 +264,7 @@ SLOT_ID_LEFT_HAND = 'icons/mob/inhands/equipment/horns_lefthand.dmi', SLOT_ID_RIGHT_HAND = 'icons/mob/inhands/equipment/horns_righthand.dmi' ) - attack_verb = list("beautifully honks") + attack_verb = list("beautifully honked") allowed_instrument_ids = list("honk", "bikehorn") w_class = WEIGHT_CLASS_TINY damage_force = 0 diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 8f01bafa90..2a9dc47f33 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -153,7 +153,7 @@ return battery // TGUI -/obj/item/electronic_assembly/ui_state(mob/user, datum/tgui_module/module) +/obj/item/electronic_assembly/ui_state() return GLOB.physical_state /obj/item/electronic_assembly/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -162,7 +162,7 @@ ui = new(user, src, "ICAssembly", name, parent_ui) ui.open() -/obj/item/electronic_assembly/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/electronic_assembly/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/total_parts = 0 diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index 85046f6c44..c3a9c4b43c 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -35,7 +35,7 @@ detail_overlay.color = detail_color add_overlay(detail_overlay) -/obj/item/integrated_electronics/detailer/ui_state(mob/user, datum/tgui_module/module) +/obj/item/integrated_electronics/detailer/ui_state() return GLOB.inventory_state /obj/item/integrated_electronics/detailer/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -44,7 +44,7 @@ ui = new(user, src, "ICDetailer", name) ui.open() -/obj/item/integrated_electronics/detailer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/integrated_electronics/detailer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["detail_color"] = detail_color data["color_list"] = color_list diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 9e5dd206b6..8786d1a701 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -125,10 +125,10 @@ a creative player the means to solve many problems. Circuits are held inside an to_chat(M, SPAN_NOTICE("The circuit '[src.name]' is now labeled '[input]'.")) displayed_name = input -/obj/item/integrated_circuit/ui_state(mob/user, datum/tgui_module/module) +/obj/item/integrated_circuit/ui_state() return GLOB.physical_state -/obj/item/integrated_circuit/ui_host(mob/user, datum/tgui_module/module) +/obj/item/integrated_circuit/ui_host() if(istype(loc, /obj/item/electronic_assembly)) return loc.ui_host() return ..() @@ -139,7 +139,7 @@ a creative player the means to solve many problems. Circuits are held inside an ui = new(user, src, "ICCircuit", name, parent_ui) ui.open() -/obj/item/integrated_circuit/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/integrated_circuit/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["name"] = name diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index 1b33e1f4d0..44a7e43c01 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -176,7 +176,7 @@ return ui_interact(user) -/obj/item/integrated_circuit_printer/ui_state(mob/user, datum/tgui_module/module) +/obj/item/integrated_circuit_printer/ui_state() return GLOB.physical_state /obj/item/integrated_circuit_printer/ui_interact(mob/user, datum/tgui/ui) @@ -189,7 +189,7 @@ ui = new(user, src, "ICPrinter", name) // 500, 600 ui.open() -/obj/item/integrated_circuit_printer/ui_static_data(mob/user) +/obj/item/integrated_circuit_printer/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/categories = list() @@ -233,7 +233,7 @@ return data -/obj/item/integrated_circuit_printer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/integrated_circuit_printer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["metal"] = cur_metal diff --git a/code/modules/jobs/job_types/station/civillian/clown.dm b/code/modules/jobs/job_types/station/civillian/clown.dm index 6bac381f11..3593791a97 100644 --- a/code/modules/jobs/job_types/station/civillian/clown.dm +++ b/code/modules/jobs/job_types/station/civillian/clown.dm @@ -4,7 +4,7 @@ flag = CLOWN departments = list(DEPARTMENT_CIVILIAN) department_flag = ENGSEC - total_positions = 1 + total_positions = 2 spawn_positions = 1 supervisors = "the spirit of laughter" selection_color = "#515151" diff --git a/code/modules/jobs/job_types/station/civillian/librarian.dm b/code/modules/jobs/job_types/station/civillian/librarian.dm index f9ece96690..4ae68d778c 100644 --- a/code/modules/jobs/job_types/station/civillian/librarian.dm +++ b/code/modules/jobs/job_types/station/civillian/librarian.dm @@ -47,11 +47,11 @@ /datum/prototype/struct/alt_title/librarian/historian title = "Historian" - title_blurb = "The Historian uses the Library as a base of operation to record any important events occuring on station." + title_blurb = "The Historian uses the Library as a base of operation to record any important events occurring on station." /datum/prototype/struct/alt_title/librarian/archivist title = "Archivist" - title_blurb = "The Archivist uses the Library as a base of operation to record any important events occuring on station." + title_blurb = "The Archivist uses the Library as a base of operation to record any important events occurring on station." /datum/prototype/struct/alt_title/librarian/professor title = "Professor" diff --git a/code/modules/jobs/job_types/station/civillian/mime.dm b/code/modules/jobs/job_types/station/civillian/mime.dm index f49c9bb4d3..256ac72659 100644 --- a/code/modules/jobs/job_types/station/civillian/mime.dm +++ b/code/modules/jobs/job_types/station/civillian/mime.dm @@ -4,7 +4,7 @@ flag = MIME departments = list(DEPARTMENT_CIVILIAN) department_flag = ENGSEC - total_positions = 1 + total_positions = 2 spawn_positions = 1 supervisors = "the spirit of performance" selection_color = "#515151" diff --git a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm index d749659f5b..b6a6dae51a 100644 --- a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm +++ b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm @@ -41,7 +41,7 @@ // Atmos Tech Alt Titles /datum/prototype/struct/alt_title/life_support title = "Life Support Technician" - title_blurb = "A Life Support Technician is an Atmospheric Technician who specializes in establishing and maintaining breatheable air in a needed area, whether that's the primary facility or a forward base." + title_blurb = "A Life Support Technician is an Atmospheric Technician who specializes in establishing and maintaining breathable air in a needed area, whether that's the primary facility or a forward base." /datum/prototype/struct/alt_title/pipe_spec title = "Pipe Network Specialist" diff --git a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm index f127253365..f87eb29a03 100644 --- a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm @@ -30,7 +30,7 @@ outfit_type = /datum/outfit/job/station/station_engineer/senior desc = "A Senior Engineer fulfills similar duties to other engineers, but usually occupies spare time with with training of other, newer Engineers \ - and giving advice in tricky engineering situtations. You are not in command of the Engineering departement, but should assist the CE in accordance with Standard Operating Procedures." + and giving advice in tricky engineering situations. You are not in command of the Engineering department, but should assist the CE in accordance with Standard Operating Procedures." alt_titles = list( "Engineering Training Specialist" = /datum/prototype/struct/alt_title/engi_trainer, diff --git a/code/modules/jobs/job_types/station/engineering/station_engineer.dm b/code/modules/jobs/job_types/station/engineering/station_engineer.dm index 0d4cf9dbda..d3aa329c58 100644 --- a/code/modules/jobs/job_types/station/engineering/station_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/station_engineer.dm @@ -52,7 +52,7 @@ /datum/prototype/struct/alt_title/electrician title = "Electrician" - title_blurb = "An Electrician's primary duty is making sure power is properly distributed thoughout the facility, utilizing solars, substations, and other \ + title_blurb = "An Electrician's primary duty is making sure power is properly distributed throughout the facility, utilizing solars, substations, and other \ methods to ensure every department has power in an emergency." /datum/prototype/struct/alt_title/apprentice_engineer diff --git a/code/modules/jobs/job_types/station/medical/head_nurse.dm b/code/modules/jobs/job_types/station/medical/head_nurse.dm index 546cba82fc..4b7185986e 100644 --- a/code/modules/jobs/job_types/station/medical/head_nurse.dm +++ b/code/modules/jobs/job_types/station/medical/head_nurse.dm @@ -25,7 +25,7 @@ ) outfit_type = /datum/outfit/job/station/medical_doctor/senior_physician desc = "A Senior Physician is an experienced medical professional who fulfills a similar role to other doctors but usually occupies spare time with with training of other, newer doctors \ - and giving advice in tricky medical situtations. You are not in command of the Medical departement, but should assist the CMO in accordance with Standard Operating Procedures." + and giving advice in tricky medical situations. You are not in command of the Medical department, but should assist the CMO in accordance with Standard Operating Procedures." minimal_player_age = 14 minimum_character_age = 25 diff --git a/code/modules/jobs/job_types/station/medical/medical_doctor.dm b/code/modules/jobs/job_types/station/medical/medical_doctor.dm index 2ea4ceb48a..b05c9d133a 100644 --- a/code/modules/jobs/job_types/station/medical/medical_doctor.dm +++ b/code/modules/jobs/job_types/station/medical/medical_doctor.dm @@ -48,7 +48,7 @@ /datum/prototype/struct/alt_title/surgeon title = "Surgeon" - title_blurb = "A Surgeon specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachement. They are expected \ + title_blurb = "A Surgeon specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachment. They are expected \ to know the ins and outs of anesthesia and surgery." title_outfit = /datum/outfit/job/station/medical_doctor/surgeon @@ -74,8 +74,8 @@ /datum/prototype/struct/alt_title/doctor/resident title = "Medical Resident" - title_blurb = "A Medical Resident is someone who has a medical dregree but is still in their resdiency, training under the supervision of more experienced doctors." - + title_blurb = "A Medical Resident is someone who has a medical degree but is still in their residency, training under the supervision of more experienced doctors." + /datum/prototype/struct/alt_title/doctor/intern title = "Medical Intern" title_blurb = "A Medical Intern is someone just learning the ropes of the medical field, learning from and answering to other medbay staff." diff --git a/code/modules/jobs/job_types/station/science/research_director.dm b/code/modules/jobs/job_types/station/science/research_director.dm index 38d4d6d443..c6209e3152 100644 --- a/code/modules/jobs/job_types/station/science/research_director.dm +++ b/code/modules/jobs/job_types/station/science/research_director.dm @@ -53,7 +53,7 @@ outfit_type = /datum/outfit/job/station/research_director desc = "The Research Director manages and maintains the Research department. They are required to ensure the safety of the entire crew, \ - at least with regards to anything occuring in the Research department, and to inform the crew of any disruptions that \ + at least with regards to anything occurring in the Research department, and to inform the crew of any disruptions that \ might originate from Research. The Research Director often has at least passing knowledge of most of the Research department, but \ are encouraged to allow their staff to perform their own duties." alt_titles = list( diff --git a/code/modules/jobs/job_types/station/science/scientist.dm b/code/modules/jobs/job_types/station/science/scientist.dm index daef006d32..1083f5e178 100644 --- a/code/modules/jobs/job_types/station/science/scientist.dm +++ b/code/modules/jobs/job_types/station/science/scientist.dm @@ -56,16 +56,16 @@ /datum/prototype/struct/alt_title/scientist/xenoarch title = "Xenoarchaeologist" title_blurb = "A Xenoarchaeologist enters digsites in search of artifacts of alien origin. These digsites are frequently in vacuum or other inhospitable \ - locations, and as such a Xenoarchaeologist should be prepared to handle hostile evironmental conditions." + locations, and as such a Xenoarchaeologist should be prepared to handle hostile environmental conditions." /datum/prototype/struct/alt_title/scientist/anomalist title = "Anomalist" - title_blurb = "An Anomalist is a Scientist whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \ + title_blurb = "An Anomalist is a Scientist whose expertise is analyzing alien artifacts. They are familiar with the most common methods of testing artifact \ function. They work closely with Xenoarchaeologists, or Miners, if either role is present." /datum/prototype/struct/alt_title/scientist/circuit title = "Circuit Designer" - title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ + title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familiar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." /datum/prototype/struct/alt_title/scientist/fieldtech diff --git a/code/modules/jobs/job_types/station/science/senior_researcher.dm b/code/modules/jobs/job_types/station/science/senior_researcher.dm index 17652bf1a8..7d174559c1 100644 --- a/code/modules/jobs/job_types/station/science/senior_researcher.dm +++ b/code/modules/jobs/job_types/station/science/senior_researcher.dm @@ -29,7 +29,7 @@ outfit_type = /datum/outfit/job/station/scientist/senior_researcher desc = "A Senior Researcher fulfills similar duties to other scientists, but usually occupies spare time with with training of other, newer scientists \ - and giving advice to ensure safety. You are not in command of the Science departement, but should assist the RD in accordance with Standard Operating Procedures." + and giving advice to ensure safety. You are not in command of the Science department, but should assist the RD in accordance with Standard Operating Procedures." alt_titles = list( "Research Training Specialist" = /datum/prototype/struct/alt_title/sci_trainer diff --git a/code/modules/loadout/loadout_head.dm b/code/modules/loadout/loadout_head.dm index 32dff60cd0..2f89a4d06c 100644 --- a/code/modules/loadout/loadout_head.dm +++ b/code/modules/loadout/loadout_head.dm @@ -341,6 +341,11 @@ name = "Audacious Wide Brimmed Hat" path = /obj/item/clothing/head/bard +/datum/loadout_entry/head/aureate_hood + name = "Aureate Hood" + path = /obj/item/clothing/head/hood/aureate + + //Tajaran head wears /datum/loadout_entry/head/furhat diff --git a/code/modules/loadout/loadout_role_restricted.dm b/code/modules/loadout/loadout_role_restricted.dm index 8fa1f87e51..38fb3f28f2 100644 --- a/code/modules/loadout/loadout_role_restricted.dm +++ b/code/modules/loadout/loadout_role_restricted.dm @@ -37,7 +37,7 @@ //Medical /datum/loadout_entry/restricted/medical subcategory = "Medical" - allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Head Nurse") + allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Senior Physician") /datum/loadout_entry/restricted/medical/eyes slot = SLOT_ID_GLASSES @@ -207,7 +207,7 @@ //Medical + Science /datum/loadout_entry/restricted/med_sci subcategory = "Med-Sci" - allowed_roles = list("Research Director", "Scientist", "Xenobiologist", "Roboticist", "Explorer", "Senior Researcher", "Pathfinder", "Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Head Nurse") + allowed_roles = list("Research Director", "Scientist", "Xenobiologist", "Roboticist", "Explorer", "Senior Researcher", "Pathfinder", "Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Psychiatrist", "Field Medic", "Senior Physician") /datum/loadout_entry/restricted/med_sci/head slot = SLOT_ID_HEAD diff --git a/code/modules/loadout/loadout_suit.dm b/code/modules/loadout/loadout_suit.dm index 87e1a75a17..2803d9e9d0 100644 --- a/code/modules/loadout/loadout_suit.dm +++ b/code/modules/loadout/loadout_suit.dm @@ -608,6 +608,11 @@ name = "Cropped Sweater (Female)" path = /obj/item/clothing/suit/cropped_sweater/female +/datum/loadout_entry/suit/aureate_kimono + name = "Aureate Kimono" + path = /obj/item/clothing/suit/storage/aureate + + //Tajaran wears //Cloak no hoods diff --git a/code/modules/loot/packs/gear.dm b/code/modules/loot/packs/gear.dm index 1b46a2b9dd..d4735a9e7b 100644 --- a/code/modules/loot/packs/gear.dm +++ b/code/modules/loot/packs/gear.dm @@ -15,6 +15,7 @@ /obj/item/tape_recorder, /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/head/helmet/space/void/mining, + /obj/random/ore_bag, ) /datum/prototype/struct/loot_pack/gear/space_miner/advanced @@ -22,4 +23,5 @@ /obj/item/pickaxe/diamonddrill, /obj/item/tape_recorder, /obj/item/hardsuit/industrial/equipped, + /obj/item/storage/bag/ore/bluespace, ) diff --git a/code/modules/mapping/map_helpers/paint.dm b/code/modules/mapping/map_helpers/paint.dm index a710d78b08..dde56e83d7 100644 --- a/code/modules/mapping/map_helpers/paint.dm +++ b/code/modules/mapping/map_helpers/paint.dm @@ -2,6 +2,7 @@ #define CREATE_PAINT_STRIPE(x, c) /obj/effect/paint_stripe/x/color=c // todo: why tf isn't this a map helper +// TODO: make this a map helper for my sanity. @Zandario /obj/effect/paint name = "coat of paint" @@ -15,16 +16,33 @@ return INITIALIZE_HINT_LATELOAD /obj/effect/paint/LateInitialize() - var/turf/simulated/wall/W = get_turf(src) - if(istype(W)) - W.paint_color = color - W.stripe_color = color - W.update_overlays() - var/obj/structure/wall_frame/WF = locate() in loc - if(WF) - WF.paint_color = color - WF.stripe_color = color - WF.update_icon() + for(var/obj/effect/paint/paint in loc) + if(paint == src) + continue + WARNING("Duplicate paint found at [x], [y], [z]") + qdel(src) + return + + var/did_anything = FALSE + + if(istype(loc, /turf/simulated/wall)) + var/turf/simulated/wall/target_wall = loc + if(!isnull(color)) + target_wall.paint_wall(color) + did_anything = TRUE + + else + var/obj/structure/wall_frame/low_wall = locate() in loc + if(low_wall) + if(!isnull(color)) + low_wall.paint_color = color + low_wall.stripe_color = color + low_wall.update_appearance() + did_anything = TRUE + + if(!did_anything) + WARNING("Redundant paint helper found at [x], [y], [z]") + qdel(src) //Stripes the wall it spawns on, then dies @@ -40,14 +58,32 @@ return INITIALIZE_HINT_LATELOAD /obj/effect/paint_stripe/LateInitialize() - var/turf/simulated/wall/W = get_turf(src) - if(istype(W)) - W.stripe_color = color - W.update_overlays() - var/obj/structure/wall_frame/WF = locate() in loc - if(WF) - WF.stripe_color = color - WF.update_icon() + for(var/obj/effect/paint_stripe/paint in loc) + if(paint == src) + continue + WARNING("Duplicate paint stripe found at [x], [y], [z]") + qdel(src) + return + + var/did_anything = FALSE + + if(istype(loc, /turf/simulated/wall)) + var/turf/simulated/wall/target_wall = loc + if(!isnull(color)) + target_wall.paint_stripe(color) + did_anything = TRUE + + else + var/obj/structure/wall_frame/low_wall = locate() in loc + if(low_wall) + if(!isnull(color)) + low_wall.stripe_color = color + low_wall.update_appearance() + did_anything = TRUE + + if(!did_anything) + WARNING("Redundant paint helper found at [x], [y], [z]") + qdel(src) //paint defines diff --git a/code/modules/mapping/spawner/window.dm b/code/modules/mapping/spawner/window.dm index 04d3d03495..4e8a8017b0 100644 --- a/code/modules/mapping/spawner/window.dm +++ b/code/modules/mapping/spawner/window.dm @@ -1,6 +1,7 @@ /obj/spawner/window icon = 'icons/mapping/spawners/windows.dmi' icon_state = "window_grille_pane" + layer = WINDOW_LAYER late = TRUE /// spawn full windows or panes on grille? diff --git a/code/modules/maps/generic/shuttles/station_shuttles/euthenia_shuttles.dm b/code/modules/maps/generic/shuttles/station_shuttles/euthenia_shuttles.dm new file mode 100644 index 0000000000..47be89e850 --- /dev/null +++ b/code/modules/maps/generic/shuttles/station_shuttles/euthenia_shuttles.dm @@ -0,0 +1,35 @@ +/datum/shuttle/autodock/overmap/euthenia_shuttles + name = "Beruang Trade Ship" + warmup_time = 0 + shuttle_area = list(/area/shuttle/trade_ship/cockpit, /area/shuttle/trade_ship/general) + current_location = "tradeport_hangar" + docking_controller_tag = "tradeport_hangar_docker" + fuel_consumption = 5 + move_time = 10 + defer_initialisation = TRUE + +/obj/overmap/entity/visitable/ship/landable/trade + name = "Beruang Trade Ship" + desc = "You know our motto: 'We deliver!'" + color = "#754116" //Brown + fore_dir = WEST + vessel_mass = 4000 + vessel_size = SHIP_SIZE_SMALL + shuttle = "Beruang Trade Ship" + +/obj/machinery/computer/shuttle_control/explore/trade + name = "short jump console" + shuttle_tag = "Beruang Trade Ship" + +/area/shuttle/trade_ship + requires_power = 1 + icon_state = "shuttle2" + area_flags = AREA_RAD_SHIELDED + +/area/shuttle/trade_ship/general + name = "\improper Beruang Trade Shuttle" + +/area/shuttle/trade_ship/cockpit + name = "\improper Beruang Trade Shuttle Cockpit" + +/datum/shuttle/autodock/overmap/euthenia_shuttles/skipper diff --git a/code/modules/maps/overmap/space/talon/talon.dm b/code/modules/maps/overmap/space/talon/talon.dm index 256250109e..6c89bea14d 100644 --- a/code/modules/maps/overmap/space/talon/talon.dm +++ b/code/modules/maps/overmap/space/talon/talon.dm @@ -169,14 +169,17 @@ Once in open space, consider disabling nonessential power-consuming electronics output_level = output_level_max input_attempt = TRUE +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/talon, 28) /obj/machinery/power/apc/talon req_access = list() req_one_access = list(ACCESS_FACTION_TALON) alarms_hidden = 1 +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/talon/hyper, 28) /obj/machinery/power/apc/talon/hyper cell_type = /obj/item/cell/hyper +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/air_alarm/talon, 26) /obj/machinery/air_alarm/talon req_access = list() req_one_access = list(ACCESS_FACTION_TALON) diff --git a/code/modules/media/walkpod.dm b/code/modules/media/walkpod.dm index 139f199fda..72b1811381 100644 --- a/code/modules/media/walkpod.dm +++ b/code/modules/media/walkpod.dm @@ -171,7 +171,7 @@ ui = new(user, src, "Jukebox", "PodZu Music Player") ui.open() -/obj/item/device/walkpod/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/device/walkpod/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["playing"] = playing @@ -193,7 +193,7 @@ return data -/obj/item/device/walkpod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/device/walkpod/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 8af7afc2a2..f3cbc6e268 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -14,9 +14,11 @@ var/list/obj/machinery/mining/brace/supports = list() var/supported = 0 var/active = 0 + var/orecount = 0 //current amount of ores it's holding var/list/resource_field = list() var/obj/item/radio/intercom/faultreporter = new /obj/item/radio/intercom{channels=list("Supply")}(null) - var/gps_tag = "DRILL0" + var/drill_id = 0 + var/datum/component/gps_signal/gps_component var/list/ore_types = list( MAT_HEMATITE = /obj/item/stack/ore/iron, MAT_URANIUM = /obj/item/stack/ore/uranium, @@ -44,7 +46,8 @@ var/need_player_check = 0 /obj/machinery/mining/drill/Initialize(mapload) - AddComponent(/datum/component/gps_signal, gps_tag) + gps_component = AddComponent(/datum/component/gps_signal, "DRILL#[drill_id]") + change_id(drill_id) //yes, this means mappers can assign it their own ID number on roundstart . = ..() component_parts = list( new /obj/item/stock_parts/matter_bin(src), @@ -54,6 +57,13 @@ ) RefreshParts() +/obj/machinery/mining/drill/examine() + . += ..() + . += SPAN_NOTICE("It looks like the storage cache can fit about [capacity - orecount] more ores before it reaches capacity.") + . += SPAN_NOTICE("The charge meter for the cell in the drill reads about [round(cell.percent())]%.") + . += SPAN_INFO("Alt-click to empty the drill's cache, if you have an ore satchel on you or an ore box nearby.") + . += SPAN_INFO("Use a multitool to change the drill's ID.") + /obj/machinery/mining/drill/get_cell(inducer) return cell @@ -104,7 +114,7 @@ for(var/metal in GLOB.ore_types) - var/orecount = 0 + orecount = 0 for(var/obj/item/stack/ore/s in contents) orecount += s.amount @@ -156,8 +166,8 @@ if(istype(O, /obj/item/multitool)) var/newtag = text2num(sanitizeSafe(input(user, "Enter new ID number or leave empty to cancel.", "Assign ID number") as text, 4)) if(newtag) - name = "[initial(name)] #[newtag]" - to_chat(user, "You changed the drill ID to: [newtag]") + change_id(newtag) + to_chat(user, "You changed the drill ID to: [drill_id]") return if(default_deconstruction_screwdriver(user, O)) return @@ -290,21 +300,40 @@ return 1 return 0 -/obj/machinery/mining/drill/verb/unload() +/obj/machinery/mining/drill/verb/unload_drill() set name = "Unload Drill" set category = "Object" set src in oview(1) - if(usr.stat) return + unload(usr) + +/obj/machinery/mining/drill/AltClick(user) + . = ..() + unload(user) + +/obj/machinery/mining/drill/proc/unload(mob/user) + if(user.stat || !user.Adjacent(src)) return var/obj/structure/ore_box/B = locate() in orange(1) + var/obj/item/storage/bag/ore/S = locate() in user.contents if(B) for(var/obj/item/stack/ore/O in contents) B.take(O) - to_chat(usr, "You unload the drill's storage cache into the ore box.") + to_chat(user, "You unload the drill's storage cache into [B].") + else if(S) + var/tookall = TRUE + for(var/obj/item/stack/ore/O in contents) + if(!S.take(O)) + tookall = FALSE + break + to_chat(user, "You unload [tookall ? "all" : "some"] of the drill's storage cache into [S].") else - to_chat(usr, "You must move an ore box up to the drill before you can unload it.") + to_chat(user, "You must move an ore box up to the drill or have an ore satchel before you can unload it.") +/obj/machinery/mining/drill/proc/change_id(newid = 0) + drill_id = newid + name = "[initial(name)] #[drill_id]" + gps_component.set_gps_tag("DRILL#[drill_id]") /obj/machinery/mining/brace name = "mining drill brace" @@ -318,6 +347,7 @@ . = ..() if(brace_tier >= 3) . += SPAN_NOTICE("The internals of the brace look resilient enough to support a drill by itself.") + . += SPAN_INFO("Alt-click to rotate the brace.") /obj/machinery/mining/brace/Initialize() . = ..() @@ -393,11 +423,19 @@ set category = "Object" set src in oview(1) - if(usr.stat) return + rotating_clockwise(usr) + +/obj/machinery/mining/brace/AltClick(user) //TODO: just make select objects rotatable with altclick for fucks sake + . = ..() + rotating_clockwise(user) + +/obj/machinery/mining/brace/proc/rotating_clockwise(mob/user) + if(user.stat || !user.Adjacent(src)) return if (src.anchored) - to_chat(usr, "It is anchored in place!") + to_chat(user, SPAN_WARNING("[src] is anchored in place!")) return 0 + to_chat(user, SPAN_NOTICE("You rotate [src] clockwise.")) src.setDir(turn(src.dir, 270)) return 1 diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index ead6d02743..c155b35460 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -42,105 +42,94 @@ if(!inserted_id) if(!user.attempt_insert_item_for_installation(I, src)) return + playsound(src, 'sound/machines/terminal_insert_disc.ogg', clickvol, TRUE) inserted_id = I interact(user) return ..() /obj/machinery/mineral/processing_unit_console/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) - . = ..() - - user.set_machine(src) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "MaterialProcessor", name) + ui.open() - var/dat = "

Ore processor console

" +/obj/machinery/mineral/processing_unit_console/ui_data(mob/user, datum/tgui/ui) + var/list/data = list() - dat += "Current unclaimed points: [machine.points]
" - if(istype(inserted_id)) - dat += "You have [inserted_id.mining_points] mining points collected. Eject ID.
" - dat += "Claim points.
" + var/list/ores = list() + for(var/orename in GLOB.ore_data) + var/datum/ore/O = GLOB.ore_data[orename] + ores.Add(list(list( + "name" = O.name, + "displayName" = O.display_name, + "processing" = machine.ores_processing[O.name], + "amount" = machine.ores_stored[O.name], + "ref" = REF(O) + ))) + + data["ores"] = ores + data["on"] = machine.active + data["fast"] = machine.speed_process + data["unclaimedPoints"] = machine.points + if(inserted_id) + data["idName"] = inserted_id.registered_name + data["idPoints"] = inserted_id.mining_points else - dat += "No ID inserted. Insert ID.
" - dat += "High-speed processing is [(machine.speed_process ? "active" : "inactive")]." - dat += "
" - - for(var/ore in machine.ores_processing) - - if(!machine.ores_stored[ore] && !show_all_ores) - continue - var/datum/ore/O = GLOB.ore_data[ore] - if(!O) - continue - dat += "" - - dat += "
[capitalize(O.display_name)][machine.ores_stored[ore]]" - if(machine.ores_processing[ore]) - switch(machine.ores_processing[ore]) - if(PROCESS_NONE) - dat += "not processing" - if(PROCESS_SMELT) - dat += "smelting" - if(PROCESS_COMPRESS) - dat += "compressing" - if(PROCESS_ALLOY) - dat += "alloying" - else - dat += "not processing" - dat += ".\[change\]
" - dat += "Currently displaying [show_all_ores ? "all ore types" : "only available ore types"]. \[[show_all_ores ? "show less" : "show more"]\]
" - dat += "The ore processor is currently [(machine.active ? "processing" : "disabled")]." - user << browse(dat, "window=processor_console;size=400x500") - onclose(user, "processor_console") - return + data["idName"] = "" + data["idPoints"] = 0 + return data -/obj/machinery/mineral/processing_unit_console/Topic(href, href_list) +/obj/machinery/mineral/processing_unit_console/ui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 - usr.set_machine(src) - src.add_fingerprint(usr) - - if(href_list["toggle_smelting"]) + return TRUE - var/choice = input("What setting do you wish to use for processing [href_list["toggle_smelting"]]?") as null|anything in list("Smelting","Compressing","Alloying","Nothing") - if(!choice) return + . = TRUE - switch(choice) - if("Nothing") choice = PROCESS_NONE - if("Smelting") choice = PROCESS_SMELT - if("Compressing") choice = PROCESS_COMPRESS - if("Alloying") choice = PROCESS_ALLOY - - machine.ores_processing[href_list["toggle_smelting"]] = choice - - if(href_list["toggle_power"]) - - machine.active = !machine.active + add_fingerprint(usr) + usr.set_machine(src) - if(href_list["toggle_ores"]) + if(action && !issilicon(usr)) + playsound(ui_host(), SFX_ALIAS_TERMINAL, clickvol, TRUE) - show_all_ores = !show_all_ores + switch(action) + if("change_mode") + machine.ores_processing[params["ore"]] = params["mode"] + return TRUE - if(href_list["toggle_speed"]) + if("toggle_power") + machine.active = !machine.active + playsound(src.loc, 'sound/machines/terminal_prompt_confirm.ogg', clickvol, 0) + return TRUE - machine.toggle_speed() + if("toggle_speed") + machine.toggle_speed() + return TRUE - if(href_list["choice"]) - if(istype(inserted_id)) - if(href_list["choice"] == "eject") + if("eject_id") + if(istype(inserted_id)) usr.grab_item_from_interacted_with(inserted_id, src) + playsound(src, 'sound/machines/terminal_eject.ogg', clickvol, 0) inserted_id = null - if(href_list["choice"] == "claim") + return TRUE + if("claim_points") + if(istype(inserted_id)) inserted_id.mining_points += machine.points machine.points = 0 - else if(href_list["choice"] == "insert") + playsound(src.loc, 'sound/machines/ping.ogg', clickvol, 0) + return TRUE + if("insert_id") var/obj/item/card/id/I = usr.get_active_held_item() if(istype(I)) if(!usr.attempt_insert_item_for_installation(I, src)) return + playsound(src, 'sound/machines/terminal_insert_disc.ogg', clickvol, 0) inserted_id = I + return TRUE else to_chat(usr, "No valid ID.") - src.updateUsrDialog() + return FALSE /**********************Mineral processing unit**************************/ diff --git a/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm b/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm index 12e3ed2a5e..9c4cb2edaf 100644 --- a/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/engineering_points_vendor.dm @@ -12,10 +12,7 @@ //circuit = /obj/item/circuitboard/engineering_equip prize_list = list( //Mining vendor steals - new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 3), - new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 3), - new /datum/data/mining_equipment("Special Blend Whiskey", /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, 5), - new /datum/data/mining_equipment("Random Booze", /obj/random/alcohol, 3), + new /datum/data/mining_equipment("Vodka", /obj/item/reagent_containers/food/drinks/bottle/vodka, 3), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 5), new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 2), new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 9), @@ -29,10 +26,7 @@ new /datum/data/mining_equipment("Hardsuit - Plasma Cutter", /obj/item/hardsuit_module/device/plasmacutter, 10), new /datum/data/mining_equipment("Hardsuit - Maneuvering Jets", /obj/item/hardsuit_module/maneuvering_jets, 12), new /datum/data/mining_equipment("Hardsuit - Intelligence Storage", /obj/item/hardsuit_module/ai_container, 25), - new /datum/data/mining_equipment("Injector (L) - Glucose", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50), new /datum/data/mining_equipment("Injector (L) - Panacea", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity, 50), - new /datum/data/mining_equipment("Injector (L) - Trauma", /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute, 50), - new /datum/data/mining_equipment("Nanopaste Tube", /obj/item/stack/nanopaste, 10), //Mining vendor steals - Ends //Power tools like the CE gets, if kev comes crying: https://cdn.discordapp.com/attachments/296237931587305472/956517623519141908/unknown.png new /datum/data/mining_equipment("Advanced Hardsuit", /obj/item/hardsuit/ce, 150), diff --git a/code/modules/mob/_modifiers/unholy.dm b/code/modules/mob/_modifiers/unholy.dm index ffb5205566..12fb739a88 100644 --- a/code/modules/mob/_modifiers/unholy.dm +++ b/code/modules/mob/_modifiers/unholy.dm @@ -134,7 +134,7 @@ for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones var/obj/item/organ/external/affected = E - if((affected.damage < affected.min_broken_damage * config_legacy.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN // fix IB affected.cure_specific_wound(/datum/wound/internal_bleeding, all = TRUE) diff --git a/code/modules/mob/characteristics/ui.dm b/code/modules/mob/characteristics/ui.dm index 2f4823d906..2a1289597f 100644 --- a/code/modules/mob/characteristics/ui.dm +++ b/code/modules/mob/characteristics/ui.dm @@ -3,9 +3,9 @@ /datum/characteristics_holder/ui_act(action, list/params, datum/tgui/ui) . = ..() -/datum/characteristics_holder/ui_static_data(mob/user) +/datum/characteristics_holder/ui_static_data(mob/user, datum/tgui/ui) . = ..() -/datum/characteristics_holder/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/characteristics_holder/ui_data(mob/user, datum/tgui/ui) . = ..() diff --git a/code/modules/mob/grab.dm b/code/modules/mob/grab.dm index f884657aad..dac151afa4 100644 --- a/code/modules/mob/grab.dm +++ b/code/modules/mob/grab.dm @@ -250,7 +250,7 @@ range = MESSAGE_RANGE_COMBAT_LOUD, visible = SPAN_DANGER("[clickchain.performer] shoves [affecting] against \the [target]!") ) - affecting.take_organ_damage(10) + affecting.take_random_targeted_damage(brute = 10) affecting.afflict_knockdown(0.5 SECONDS) qdel(src) return CLICKCHAIN_DO_NOT_PROPAGATE @@ -260,7 +260,7 @@ range = MESSAGE_RANGE_COMBAT_LOUD, visible = SPAN_DANGER("[clickchain.performer] slams [affecting] against \the [target]!") ) - affecting.take_organ_damage(20) + affecting.take_random_targeted_damage(brute = 20) affecting.afflict_paralyze(1 SECONDS) affecting.afflict_knockdown(2 SECONDS) qdel(src) @@ -271,7 +271,7 @@ range = MESSAGE_RANGE_COMBAT_LOUD, visible = SPAN_DANGER("[clickchain.performer] smashes [affecting] against \the [target]!") ) - affecting.take_organ_damage(30) + affecting.take_random_targeted_damage(brute = 30) affecting.afflict_paralyze(3 SECONDS) affecting.afflict_knockdown(4.5 SECONDS) qdel(src) diff --git a/code/modules/mob/health.dm b/code/modules/mob/health.dm index 80fefae3fd..f6f263f0f2 100644 --- a/code/modules/mob/health.dm +++ b/code/modules/mob/health.dm @@ -49,6 +49,7 @@ dead_mob_list += src if(update_mobility) update_mobility() + update_hud_med_status() return TRUE /** diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 33c15e5d89..a8e00c7ec7 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -144,11 +144,6 @@ slot_flags = SLOT_HOLSTER origin_tech = list(TECH_BIO = 3) -/obj/item/holder/protoblob - slot_flags = SLOT_HEAD | SLOT_OCLOTHING | SLOT_HOLSTER | SLOT_ICLOTHING | SLOT_ID | SLOT_MASK - w_class = ITEMSIZE_TINY - allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) - /obj/item/holder/fish/afterattack(atom/target, mob/user, clickchain_flags, list/params) if(!target) @@ -160,6 +155,12 @@ if(prob(10)) L.afflict_stun(20 * 2) +/obj/item/holder/protoblob + clothing_flags = ALLOWINTERNALS + slot_flags = SLOT_HEAD | SLOT_OCLOTHING | SLOT_HOLSTER | SLOT_ICLOTHING | SLOT_ID | SLOT_MASK | SLOT_GLOVES | SLOT_BACK | SLOT_BELT | SLOT_FEET | SLOT_EARS | SLOT_EYES + w_class = ITEMSIZE_TINY + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) + //Roach Types /obj/item/holder/roach w_class = ITEMSIZE_TINY diff --git a/code/modules/mob/inventory/items.dm b/code/modules/mob/inventory/items.dm index 192fa6c543..ea29bdf9ad 100644 --- a/code/modules/mob/inventory/items.dm +++ b/code/modules/mob/inventory/items.dm @@ -151,6 +151,8 @@ item_flags |= ITEM_IN_INVENTORY // TODO: THIS IS SHITCODE, MOVE TO EVENT DRIVEN. user.handle_actions() + // todo: should this be here + transform = null if(isturf(oldLoc) && !(flags & (INV_OP_SILENT | INV_OP_DIRECTLY_EQUIPPING))) playsound(src, pickup_sound, 20, ignore_walls = FALSE) diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index f4adefa060..c5d53d9a73 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -30,7 +30,7 @@ xeno_harm_strength = 9 req_one_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS) botcard_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_ENGINEERING_MAINT) - var/xeno_stun_strength = 6 + xeno_stun_strength = 6 /mob/living/bot/secbot/ed209/slime/update_icons() if(on && busy) @@ -56,13 +56,6 @@ P.old_style_target(A) P.fire() -/mob/living/bot/secbot/ed209/slime/UnarmedAttack(var/mob/living/L, var/proximity) - ..() - - if(istype(L, /mob/living/simple_mob/slime/xenobio)) - var/mob/living/simple_mob/slime/xenobio/S = L - S.slimebatoned(src, xeno_stun_strength) - // Assembly /obj/item/secbot_assembly/ed209_assembly/slime diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 167655f73e..08b8d8664c 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -107,11 +107,11 @@ update_icons() var/cleantime = istype(D, /obj/effect/debris/cleanable/dirt) ? 10 : 50 if(do_after(src, cleantime)) - if(istype(loc, /turf/simulated)) - var/turf/simulated/f = loc - f.dirt = FALSE if(!D) return + if(istype(get_turf(D), /turf/simulated)) + var/turf/simulated/f = get_turf(D) + f.dirt = 0 qdel(D) if(D == target) target = null @@ -149,7 +149,7 @@ ui = new(user, src, "Cleanbot", name) ui.open() -/mob/living/bot/cleanbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/cleanbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on data["open"] = open diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index e136b78e11..86ad18ba4f 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -81,7 +81,7 @@ qdel(src) return -/mob/living/bot/cleanbot/edCLN/ui_data(mob/user) +/mob/living/bot/cleanbot/edCLN/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["version"] = "v3.0" data["rgbpanel"] = TRUE diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 78ad53957f..368a1ccc48 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -42,7 +42,7 @@ ui = new(user, src, "Farmbot", name) ui.open() -/mob/living/bot/farmbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/farmbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index 88c8190693..211c434951 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -65,7 +65,7 @@ ui = new(user, src, "Floorbot", name) ui.open() -/mob/living/bot/floorbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/floorbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on @@ -74,7 +74,7 @@ data["amount"] = amount - data["possible_bmode"] = list("NORTH", "EAST", "SOUTH", "WEST") + data["possible_bmode"] = list("OFF","NORTH", "EAST", "SOUTH", "WEST") data["improvefloors"] = null data["eattiles"] = null @@ -85,7 +85,7 @@ data["improvefloors"] = improvefloors data["eattiles"] = eattiles data["maketiles"] = maketiles - data["bmode"] = dir2text(targetdirection) + data["bmode"] = targetdirection ? dir2text(targetdirection) : "OFF" return data @@ -132,7 +132,10 @@ . = TRUE if("bridgemode") - targetdirection = text2dir(params["dir"]) + if(params["dir"] != "OFF") + targetdirection = text2dir(params["dir"]) + else + targetdirection = null . = TRUE /mob/living/bot/floorbot/handleRegular() @@ -429,7 +432,7 @@ switch(build_step) if(ASSEMBLY_FIRST_STEP) if(isprox(W)) - if(!user.attempt_insert_item_for_installation(W, src)) + if(!user.attempt_consume_item_for_construction(W)) return to_chat(user, SPAN_NOTICE("You add the proximity sensor to [src].")) name = "incomplete floorbot assembly" diff --git a/code/modules/mob/living/bot/medibot.dm b/code/modules/mob/living/bot/medibot.dm index 4c180701c3..bc25e6d098 100644 --- a/code/modules/mob/living/bot/medibot.dm +++ b/code/modules/mob/living/bot/medibot.dm @@ -268,7 +268,7 @@ ui = new(user, src, "Medibot", name) ui.open() -/mob/living/bot/medibot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/medibot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on data["open"] = open diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index 44284820f8..ceeea75368 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -79,7 +79,7 @@ ui = new(user, src, "MuleBot", "Mulebot [suffix ? "([suffix])" : ""]") ui.open() -/mob/living/bot/mulebot/ui_data(mob/user) +/mob/living/bot/mulebot/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "suffix" = suffix, "power" = on, @@ -93,7 +93,7 @@ ) return data -/mob/living/bot/mulebot/ui_act(action, params) +/mob/living/bot/mulebot/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 6a2c2cd4dd..da0e584d1f 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -42,6 +42,7 @@ var/can_next_insult = 0 // Uses world.time var/stun_strength = 60 // For humans. var/xeno_harm_strength = 15 // How hard to hit simple_mobs. + var/xeno_stun_strength = 3 // How hard to slimebatoned()'d naughty slimes. Normal securitrons aren't all that good at it but can do it. var/baton_glow = "#FF6A00" var/used_weapon = /obj/item/melee/baton //Weapon used by the bot @@ -104,7 +105,7 @@ req_one_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS) botcard_access = list(ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_ROBOTICS, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_ENGINEERING_MAINT) used_weapon = /obj/item/melee/baton/slime - var/xeno_stun_strength = 5 // How hard to slimebatoned()'d naughty slimes. 5 works out to 2 discipline and 5 weaken. + xeno_stun_strength = 5 // 5 works out to 2 discipline and 5 weaken. /datum/category_item/catalogue/technology/bot/secbot/slime/slimesky name = "Bot - Doctor Slimesky" @@ -137,7 +138,7 @@ ui = new(user, src, "Secbot", name) ui.open() -/mob/living/bot/secbot/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/mob/living/bot/secbot/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["on"] = on @@ -360,7 +361,7 @@ var/mob/living/carbon/human/H = M var/cuff = TRUE - if(!H.lying || H.handcuffed || arrest_type) + if(CHECK_MOBILITY(H, MOBILITY_CAN_MOVE | MOBILITY_CAN_USE) || H.handcuffed || arrest_type) cuff = FALSE if(!cuff) H.stun_effect_act(0, stun_strength, null) @@ -390,6 +391,13 @@ busy = FALSE else if(istype(M, /mob/living)) var/mob/living/L = M + if(istype(L, /mob/living/simple_mob/slime/xenobio)) + var/mob/living/simple_mob/slime/xenobio/S = L + var/datum/ai_holder/simple_mob/xenobio_slime/sai = S.ai_holder + if(!S.is_justified_to_discipline() && !sai?.rabid) //will kill angry slimes. + attacked = FALSE //quit abusing the damn slimes. I don't care if they're hurting you. + return + S.slimebatoned(src, xeno_stun_strength) L.adjustBruteLoss(xeno_harm_strength) do_attack_animation(M) playsound(loc, "swing_hit", 50, 1, -1) @@ -401,13 +409,6 @@ visible_message("\The [M] was beaten by \the [src] with a stun baton!") insult(L) -/mob/living/bot/secbot/slime/UnarmedAttack(var/mob/living/L, var/proximity) - ..() - - if(istype(L, /mob/living/simple_mob/slime/xenobio)) - var/mob/living/simple_mob/slime/xenobio/S = L - S.slimebatoned(src, xeno_stun_strength) - /mob/living/bot/secbot/explode() visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) @@ -435,7 +436,7 @@ return "unidentified lifeform" /mob/living/bot/secbot/proc/check_threat(var/mob/living/M) - if(!M || !istype(M) || M.stat == DEAD || src == M) + if(!M || !istype(M) || M.stat == DEAD || src == M || (isslime(M) && M.incapacitated())) threat = 0 else if(emagged && !M.incapacitated()) //check incapacitated so emagged secbots don't keep attacking the same target forever diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0f4c3c6efd..eb87ea70b4 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -32,7 +32,7 @@ for(var/mob/M in src) if(M in src.stomach_contents) src.stomach_contents.Remove(M) - M.loc = src.loc + M.forceMove(loc) for(var/mob/N in viewers(src, null)) if(N.client) N.show_message("[M] bursts out of [src]!", 2) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index b32a7f8efd..8cea5e3981 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -1,8 +1,20 @@ +/** + * The root type of complex mobs. + * + * These mobs have: + * * organ / bodypart simulation + * * reagent metabolism + * * species + * * virus simulation + * * and more. + * + * todo: this should be carbon.dm at some point + */ /mob/living/carbon gender = MALE throw_force = 10 - //? Composition + //* Composition *// /// species - datumized handling of racial intrinsics like health, environmental, breathing, etc. set using set_species() **only** var/datum/species/species diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm new file mode 100644 index 0000000000..0f6d2d9f2c --- /dev/null +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -0,0 +1,46 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* Raw Damage *// + +/mob/living/carbon/take_random_targeted_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + var/list/obj/item/organ/external/targets = get_damageable_external_organs() + if(!length(targets)) + return 0 + var/obj/item/organ/external/target = pick(targets) + return take_targeted_damage(brute, burn, damage_mode, target.organ_tag, weapon_descriptor, defer_updates) + +/mob/living/carbon/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + + var/obj/item/organ/external/bodypart = get_bodypart_for_zone(body_zone) + if(isnull(bodypart)) + if(damage_mode & DAMAGE_MODE_REDIRECT) + // todo: maybe don't random lmfao + return take_random_targeted_damage(brute, burn, damage_mode & ~(DAMAGE_MODE_REDIRECT), weapon_descriptor, defer_updates) + return 0 + + . = bodypart.inflict_bodypart_damage(brute, burn, damage_mode, weapon_descriptor, TRUE) + + if(!defer_updates && .) + update_health() + UpdateDamageIcon() + +/mob/living/carbon/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + + . = 0 + + var/list/obj/item/organ/external/targets = get_damageable_external_organs() + var/divisor = 1 / length(targets) + + for(var/obj/item/organ/external/target as anything in targets) + . += target.inflict_bodypart_damage(brute * divisor, burn * divisor, damage_mode, weapon_descriptor, TRUE) + + if(!defer_updates && .) + update_health() + UpdateDamageIcon() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f2742d163b..b3d354b938 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -162,27 +162,39 @@ if (prob(50) && !shielded) afflict_unconscious(20 * 10) - var/update = 0 // focus most of the blast on one organ var/obj/item/organ/external/take_blast = pick(organs) - update |= take_blast.take_damage(b_loss * 0.9, f_loss * 0.9, used_weapon = "Explosive blast") + take_blast.inflict_bodypart_damage( + brute = b_loss * 0.9, + burn = f_loss * 0.9, + weapon_descriptor = "concussive force", + ) // distribute the remaining 10% on all limbs equally b_loss *= 0.1 f_loss *= 0.1 - var/weapon_message = "Explosive Blast" - for(var/obj/item/organ/external/temp in organs) switch(temp.organ_tag) if(BP_HEAD) - update |= temp.take_damage(b_loss * 0.2, f_loss * 0.2, used_weapon = weapon_message) + temp.inflict_bodypart_damage( + brute = b_loss * 0.2, + burn = f_loss * 0.2, + weapon_descriptor = "concussive force", + ) if(BP_TORSO) - update |= temp.take_damage(b_loss * 0.4, f_loss * 0.4, used_weapon = weapon_message) + temp.inflict_bodypart_damage( + brute = b_loss * 0.4, + burn = f_loss * 0.4, + weapon_descriptor = "concussive force", + ) else - update |= temp.take_damage(b_loss * 0.05, f_loss * 0.05, used_weapon = weapon_message) - if(update) UpdateDamageIcon() + temp.inflict_bodypart_damage( + brute = b_loss * 0.05, + burn = f_loss * 0.05, + weapon_descriptor = "concussive force", + ) /mob/living/carbon/human/proc/implant_loyalty(override = FALSE) // Won't override by default. if(!config_legacy.use_loyalty_implants && !override) return // Nuh-uh. @@ -1025,10 +1037,14 @@ "Your movement jostles [O] in your [organ.name] painfully.") custom_pain(msg, 40) if(istype(O, /obj/item/melee/spike)) - organ.take_damage(rand(3,9), 0, 0) // it has spikes on it it's going to stab you + organ.inflict_bodypart_damage( + brute = rand(3, 9), + ) to_chat(src, "The edges of [O] in your [organ.name] are not doing you any favors.") afflict_paralyze(20 * 2) // having a very jagged stick jammed into your bits is Bad for your health - organ.take_damage(rand(1,3), 0, 0) + organ.inflict_bodypart_damage( + brute = rand(1, 3), + ) if(!(organ.robotic >= ORGAN_ROBOT) && (should_have_organ(O_HEART))) //There is no blood in protheses. organ.status |= ORGAN_BLEEDING @@ -1154,6 +1170,11 @@ var/datum/mob_descriptor/descriptor = species.descriptors[desctype] descriptors[desctype] = descriptor.default_value + if(ispath(species.custom_ability_handler, /datum/ability_handler)) + ab_handler = new species.custom_ability_handler() + else + ab_handler = new /datum/ability_handler() + // dumb shit transformation shit here if(example) if(!(example == src)) @@ -1640,3 +1661,8 @@ return // groan . += ((size_multiplier * icon_scale_x) - 1) * ((dir & EAST)? -16 : 16) + +/mob/living/carbon/human/ClickOn(var/atom/A) + if(ab_handler?.process_click(src, A)) + return + ..() diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 8f13d57d47..7a74efb5c0 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -8,10 +8,16 @@ var/total_burn = 0 var/total_brute = 0 for(var/obj/item/organ/external/O in organs) //hardcoded to streamline things a bit - if((O.robotic >= ORGAN_ROBOT) && !O.vital) - continue //*non-vital* robot limbs don't count towards shock and crit - total_brute += O.brute_dam - total_burn += O.burn_dam + if(!O.vital) + if(O.robotic >= ORGAN_ROBOT) + continue //*non-vital* robot limbs don't count towards shock and crit + else + // todo: pending med rework, we count non vital organic limbs for less damage, but not less for shock! + total_brute += O.brute_dam * 0.75 + total_burn += O.burn_dam * 0.75 + else + total_brute += O.brute_dam + total_burn += O.burn_dam var/old = health health = getMaxHealth() - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute @@ -157,50 +163,6 @@ heal_overall_damage(0, -amount, include_robo) update_hud_med_all() -/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null) - amount = amount*species.brute_mod - if (organ_name in organs_by_name) - var/obj/item/organ/external/O = get_organ(organ_name) - - if(amount > 0) - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_damage_percent)) - amount *= M.incoming_damage_percent - if(!isnull(M.incoming_brute_damage_percent)) - amount *= M.incoming_brute_damage_percent - if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //NIF mod for damage resistance for this type of damage - O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) - else - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_healing_percent)) - amount *= M.incoming_healing_percent - //if you don't want to heal robot organs, they you will have to check that yourself before using this proc. - O.heal_damage(-amount, 0, internal=0, robo_repair=(O.robotic >= ORGAN_ROBOT)) - - update_hud_med_all() - -/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null) - amount = amount*species.burn_mod - if (organ_name in organs_by_name) - var/obj/item/organ/external/O = get_organ(organ_name) - - if(amount > 0) - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_damage_percent)) - amount *= M.incoming_damage_percent - if(!isnull(M.incoming_fire_damage_percent)) - amount *= M.incoming_fire_damage_percent - if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} // NIF mod for damage resistance for this type of damage - O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) - else - for(var/datum/modifier/M in modifiers) - if(!isnull(M.incoming_healing_percent)) - amount *= M.incoming_healing_percent - //if you don't want to heal robot organs, they you will have to check that yourself before using this proc. - O.heal_damage(0, -amount, internal=0, robo_repair=(O.robotic >= ORGAN_ROBOT)) - - update_hud_med_all() - /mob/living/carbon/human/proc/Stasis(amount) if((species.species_flags & NO_SCAN) || isSynthetic()) in_stasis = 0 @@ -318,7 +280,7 @@ /mob/living/carbon/human/proc/get_damageable_organs() var/list/obj/item/organ/external/parts = list() for(var/obj/item/organ/external/O in organs) - if(O.is_damageable()) + if(O.is_damageable(TRUE)) parts += O return parts @@ -333,20 +295,6 @@ UpdateDamageIcon() update_health() -/* -In most cases it makes more sense to use apply_damage() instead! And make sure to check armour if applicable. -*/ -//Damages ONE external organ, organ gets randomly selected from damagable ones. -//It automatically updates damage overlays if necesary -//It automatically updates health status -/mob/living/carbon/human/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0) - var/list/obj/item/organ/external/parts = get_damageable_organs() - if(!parts.len) - return - var/obj/item/organ/external/picked = pick(parts) - if(picked.take_damage(brute,burn,sharp,edge)) - UpdateDamageIcon() - update_health() //Heal MANY external organs, in random order //'include_robo' only applies to healing, for legacy purposes, as all damage typically hurts both types of organs @@ -370,25 +318,6 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t if(update) UpdateDamageIcon() -// damage MANY external organs, in random order -/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0, var/used_weapon = null) - if(status_flags & STATUS_GODMODE) return //godmode - var/list/obj/item/organ/external/parts = get_damageable_organs() - var/update = 0 - while(parts.len && (brute>0 || burn>0) ) - var/obj/item/organ/external/picked = pick(parts) - - var/brute_was = picked.brute_dam - var/burn_was = picked.burn_dam - - update |= picked.take_damage(brute,burn,sharp,edge,used_weapon) - brute -= (picked.brute_dam - brute_was) - burn -= (picked.burn_dam - burn_was) - - parts -= picked - update_health() - if(update) - UpdateDamageIcon() //////////////////////////////////////////// @@ -408,16 +337,6 @@ This function restores all organs. for(var/obj/item/organ/external/current_organ in organs) current_organ.rejuvenate_legacy(ignore_prosthetic_prefs) -/mob/living/carbon/human/proc/HealDamage(zone, brute, burn) - var/obj/item/organ/external/E = get_organ(zone) - if(istype(E, /obj/item/organ/external)) - if (E.heal_damage(brute, burn)) - UpdateDamageIcon() - update_hud_med_health() - else - return 0 - return - /mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null) if(GLOB.Debug2) log_world("## DEBUG: human/apply_damage() was called on [src], with [damage] damage, an armor value of [blocked], and a soak value of [soaked].") @@ -470,8 +389,11 @@ This function restores all organs. if(!isnull(M.incoming_brute_damage_percent)) damage *= M.incoming_brute_damage_percent - if(organ.take_damage(damage, 0, sharp, edge, used_weapon)) - UpdateDamageIcon() + organ.inflict_bodypart_damage( + brute = damage, + damage_mode = (edge? DAMAGE_MODE_EDGE : NONE) | (sharp? DAMAGE_MODE_SHARP : NONE), + weapon_descriptor = used_weapon, + ) if(BURN) damageoverlaytemp = 20 damage = damage*species.burn_mod @@ -482,8 +404,11 @@ This function restores all organs. if(!isnull(M.incoming_brute_damage_percent)) damage *= M.incoming_fire_damage_percent - if(organ.take_damage(0, damage, sharp, edge, used_weapon)) - UpdateDamageIcon() + organ.inflict_bodypart_damage( + burn = damage, + damage_mode = (edge? DAMAGE_MODE_EDGE : NONE) | (sharp? DAMAGE_MODE_SHARP : NONE), + weapon_descriptor = used_weapon, + ) // Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life(). update_health() diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index c81aa638e6..c5e04d926b 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -326,7 +326,7 @@ meteor_act effective_force -= round(effective_force*0.8) //want the dislocation chance to be such that the limb is expected to dislocate after dealing a fraction of the damage needed to break the limb - var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage * config_legacy.organ_health_multiplier)*100 + var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage)*100 if(prob(dislocate_chance * (100 - blocked)/100)) visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") organ.dislocate(1) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index e04f9f3988..e400818df3 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -271,3 +271,5 @@ var/hiding_wings = FALSE var/hiding_tail = FALSE var/hiding_horns = FALSE + + var/datum/ability_handler/ab_handler diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 3284d339a5..d13864efd1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -89,7 +89,7 @@ //No need to update all of these procs if the guy is dead. if(stat != DEAD && !stasis) - stabilize_body_temperature() //Body temperature adjusts itself (self-regulation) + stabilize_body_temperature(seconds) //Body temperature adjusts itself (self-regulation) weightgain() process_weaver_silk() handle_shock() @@ -313,7 +313,7 @@ to_chat(src, SPAN_WARNING("Warning: Ionization detected in control routes. Radiological threat suspected.")) #ifdef RAD_MOB_BURNS_SYNTHETICS if(radiation >= RAD_MOB_BURN_THRESHOLD) - take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), used_weapon = "Radiation Burns") + take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), weapon_descriptor = "radiation burns") #endif if(radiation >= RAD_MOB_TOXIN_THRESHOLD) adjustToxLoss(RAD_MOB_SYNTH_INSTABILITY_FOR(radiation, seconds)) @@ -330,7 +330,7 @@ if(prob(RAD_MOB_WARNING_CHANCE(radiation, seconds))) to_chat(src, SPAN_WARNING("You feel nauseous, and a hot presence burning through your flesh.")) if(radiation >= RAD_MOB_BURN_THRESHOLD) - take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), used_weapon = "Radiation Burns") + take_overall_damage(burn = RAD_MOB_BURN_DAMAGE_FOR(radiation, seconds), weapon_descriptor = "radiation burns") if(radiation >= RAD_MOB_TOXIN_THRESHOLD) adjustToxLoss(RAD_MOB_TOXIN_DAMAGE_FOR(radiation, seconds)) // todo: autopsy data @@ -655,7 +655,7 @@ else temp_adj /= (BODYTEMP_HEAT_DIVISOR * 5) //don't raise temperature as much as if we were directly exposed - var/density = breath.total_moles / (MOLES_CELLSTANDARD * BREATH_PERCENTAGE) + var/density = breath.total_moles / (CELL_MOLES * BREATH_PERCENTAGE) temp_adj *= density if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX @@ -671,15 +671,24 @@ breath.update_values() return 1 -/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment) - if(!environment) - return +/** + * @params + * * environment - the gas mixture we're in + * * dt - seconds to simulate + */ +/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment, dt) + + // legacy: species special processes //Stuff like the xenomorph's plasma regen happens here. - species.handle_environment_special(src) + // todo: why the shit is this here + species.handle_environment_special(src, environment, dt) + // legacy: incorporeal (shadekin) check if(is_incorporeal()) return + // legacy: synth snowflake shit + // todo: kill this shit with fire if(isSynthetic()) // synth specific temperature values in the absence of a synthetic species var/mob/living/carbon/human/H = src //! I hate this, fuck you. Don't override shit in human life(). @Zandario @@ -708,69 +717,87 @@ ) if(bodytemperature > species.heat_discomfort_level && !(H.species.get_species_id() == SPECIES_ID_PROTEAN)) if(world.time >= last_synthcooling_message || last_synthcooling_message == 0) - if(src.nutrition <= 50) // do they have enough energy for this? + last_synthcooling_message = world.time + 60 SECONDS + if(src.nutrition <= 25) // do they have enough energy for this? to_chat(src, "Warning: Temperature at critically high levels.") to_chat(src, "Warning: Power critical. Unable to deploy cooling systems.") - return else to_chat(src, "Warning: Temperature at critically high levels.") add_modifier(/datum/modifier/synthcooling, 15 SECONDS) // enable cooling systems at cost of energy - src.nutrition -= 50 - last_synthcooling_message = world.time + 60 SECONDS + adjust_nutrition(-25) - //Moved pressure calculations here for use in skip-processing check. - var/pressure = environment.return_pressure() - var/adjusted_pressure = calculate_affecting_pressure(pressure) + var/absolute_pressure = isnull(environment)? 0 : environment.return_pressure() + var/affecting_pressure = calculate_affecting_pressure(absolute_pressure) + // legacy: contamination //Check for contaminants before anything else because we don't want to skip it. - for(var/g in environment.gas) + for(var/g in environment?.gas) if(global.gas_data.flags[g] & GAS_FLAG_CONTAMINANT && environment.gas[g] > 1) pl_effects() break - if(istype(loc, /turf/space)) // No FBPs overheating on space turfs inside mechs or people. - //Don't bother if the temperature drop is less than 0.1 anyways. Hopefully BYOND is smart enough to turn this constant expression into a constant - if(bodytemperature > (0.1 * HUMAN_HEAT_CAPACITY/(HUMAN_EXPOSED_SURFACE_AREA*STEFAN_BOLTZMANN_CONSTANT))**(1/4) + COSMIC_RADIATION_TEMPERATURE) - //Thermal radiation into space - var/heat_loss = HUMAN_EXPOSED_SURFACE_AREA * STEFAN_BOLTZMANN_CONSTANT * ((bodytemperature - COSMIC_RADIATION_TEMPERATURE)**4) - var/temperature_loss = heat_loss/HUMAN_HEAT_CAPACITY - bodytemperature -= temperature_loss - else - var/loc_temp = T0C - if(istype(loc, /obj/mecha)) - var/obj/mecha/M = loc - loc_temp = M.return_temperature() - else if(istype(loc, /obj/machinery/atmospherics/component/unary/cryo_cell)) - var/obj/machinery/atmospherics/component/unary/cryo_cell/CC = loc - loc_temp = CC.air_contents.temperature + // legacy: bodytemperature equalizaiton + // todo: we should rework most of this + // we simulate in space, or in somewhere with a gasmixture. otherwise, we don't care. + if(istype(loc, /turf/space)) + // in space, we use blackbody radiation + var/heat_loss = HUMAN_EXPOSED_SURFACE_AREA * STEFAN_BOLTZMANN_CONSTANT * ((bodytemperature - COSMIC_RADIATION_TEMPERATURE)**4) + var/temperature_loss = heat_loss/HUMAN_HEAT_CAPACITY + adjust_bodytemperature(-temperature_loss) + else if(!isnull(environment)) + // todo: this shit is all suboptimal + // otherwise, we use environment temperature + var/environment_temperature = environment.temperature + var/difference = environment_temperature - bodytemperature + // relative density multiplier + var/density_multiplier = environment.total_moles / CELL_MOLES + + density_multiplier = density_multiplier > 1? sqrt(density_multiplier) : density_multiplier + + var/thermal_insulation + + var/nominal = species.body_temperature || T20C + var/to_nominal = nominal - bodytemperature + var/is_stabilizing = (to_nominal > 0? 1 : -1) == (difference > 0? 1 : -1) + + var/adjust = is_stabilizing? \ + max( \ + difference * MOB_BODYTEMP_EQUALIZATION_FAVORABLE_RATIO * density_multiplier, \ + min(difference, MOB_BODYTEMP_EQUALIZATION_MIN_FAVORABLE) \ + ) : \ + clamp( \ + difference * MOB_BODYTEMP_EQUALIZATION_UNFAVORABLE_RATIO * density_multiplier, \ + min(difference, MOB_BODYTEMP_EQUALIZATION_MIN_UNFAVORABLE), \ + MOB_BODYTEMP_EQUALIZATION_MAX_UNFAVORABLE \ + ) + + if(is_stabilizing) + adjust_bodytemperature(adjust) + else if(difference < 0) + // we are being cooled + thermal_insulation = get_cold_protection(environment_temperature) + if(thermal_insulation < 1) + // we aren't entirely shielded + adjust_bodytemperature(adjust * (1 - thermal_insulation)) else - loc_temp = environment.temperature - - if(adjusted_pressure < species.warning_high_pressure && adjusted_pressure > species.warning_low_pressure && abs(loc_temp - bodytemperature) < 20 && bodytemperature < species.heat_level_1 && bodytemperature > species.cold_level_1) - pressure_alert = 0 - return // Temperatures are within normal ranges, fuck all this processing. ~Ccomp - - //Body temperature adjusts depending on surrounding atmosphere based on your thermal protection (convection) - var/temp_adj = 0 - if(loc_temp < bodytemperature) //Place is colder than we are - var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 0.99) //For some reason, < 1 returns false if the value is 1. - temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR) //this will be negative - else if (loc_temp > bodytemperature) //Place is hotter than we are - var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 0.99) //For some reason, < 1 returns false if the value is 1. - temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR) - - //Use heat transfer as proportional to the gas density. However, we only care about the relative density vs standard 101 kPa/20 C air. Therefore we can use mole ratios - var/density = environment.total_moles / MOLES_CELLSTANDARD - bodytemperature += between(BODYTEMP_COOLING_MAX, temp_adj*density, BODYTEMP_HEATING_MAX) + // we are getting heated + thermal_insulation = get_heat_protection(environment_temperature) + if(thermal_insulation < 1) + // we aren't entirely shielded + adjust_bodytemperature(adjust * (1 - thermal_insulation)) + + // legacy: godmode check + if(status_flags & STATUS_GODMODE) + fire_alert = 0 + pressure_alert = 0 + return + + // todo: completely rework eveyrthing about this to be surface vs deep burns // +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt. if(bodytemperature >= species.heat_level_1) //Body temperature is too hot. fire_alert = max(fire_alert, 1) - if(status_flags & STATUS_GODMODE) - return 1 //godmode var/burn_dam = 0 @@ -787,17 +814,13 @@ else burn_dam = HEAT_DAMAGE_LEVEL_1 - take_overall_damage(burn=burn_dam, used_weapon = "High Body Temperature") + take_overall_damage(burn = burn_dam, damage_mode = DAMAGE_MODE_GRADUAL, weapon_descriptor = "internal burns") fire_alert = max(fire_alert, 2) else if(bodytemperature <= species.cold_level_1 && !IS_DEAD(src)) // dead check is temporary bandaid for health rework //Body temperature is too cold. fire_alert = max(fire_alert, 1) - if(status_flags & STATUS_GODMODE) - return 1 //godmode - - if(!istype(loc, /obj/machinery/atmospherics/component/unary/cryo_cell)) var/cold_dam = 0 if(bodytemperature <= species.cold_level_1) @@ -809,33 +832,28 @@ else cold_dam = COLD_DAMAGE_LEVEL_1 - take_overall_damage(burn=cold_dam, used_weapon = "Low Body Temperature") + take_overall_damage(burn = cold_dam, damage_mode = DAMAGE_MODE_GRADUAL, weapon_descriptor = "frostbite") fire_alert = max(fire_alert, 1) - // Account for massive pressure differences. Done by Polymorph - // Made it possible to actually have something that can protect against high pressure... Done by Errorage. Polymorph now has an axe sticking from his head for his previous hardcoded nonsense! - if(status_flags & STATUS_GODMODE) - return 1 //godmode - - if(adjusted_pressure >= species.hazard_high_pressure) - var/pressure_damage = min( ( (adjusted_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) - take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure") + if(affecting_pressure >= species.hazard_high_pressure) + var/pressure_damage = min( ( (affecting_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) + take_overall_damage(brute = pressure_damage, damage_mode = DAMAGE_MODE_GRADUAL | DAMAGE_MODE_NO_OVERFLOW, weapon_descriptor = "barotrauma") pressure_alert = 2 - else if(adjusted_pressure >= species.warning_high_pressure) + else if(affecting_pressure >= species.warning_high_pressure) pressure_alert = 1 - else if(adjusted_pressure >= species.warning_low_pressure) + else if(affecting_pressure >= species.warning_low_pressure) pressure_alert = 0 - else if(adjusted_pressure >= species.hazard_low_pressure) + else if(affecting_pressure >= species.hazard_low_pressure) pressure_alert = -1 else if( !(MUTATION_COLD_RESIST in mutations)) if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) // NIF pressure seals - take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") + take_overall_damage(brute = LOW_PRESSURE_DAMAGE, damage_mode = DAMAGE_MODE_GRADUAL | DAMAGE_MODE_NO_OVERFLOW, weapon_descriptor = "barotrauma") if(getOxyLoss() < 55) // 12 OxyLoss per 4 ticks when wearing internals; unconsciousness in 16 ticks, roughly half a minute var/pressure_dam = 3 // 16 OxyLoss per 4 ticks when no internals present; unconsciousness in 13 ticks, roughly twenty seconds // (Extra 1 oxyloss from failed breath) // Being in higher pressure decreases the damage taken, down to a minimum of (species.hazard_low_pressure / ONE_ATMOSPHERE) at species.hazard_low_pressure - pressure_dam *= (ONE_ATMOSPHERE - adjusted_pressure) / ONE_ATMOSPHERE + pressure_dam *= (ONE_ATMOSPHERE - affecting_pressure) / ONE_ATMOSPHERE if(wear_suit && wear_suit.min_pressure_protection && head && head.min_pressure_protection) var/protection = max(wear_suit.min_pressure_protection, head.min_pressure_protection) // Take the weakest protection @@ -848,8 +866,6 @@ else pressure_alert = -1 - return - /* /mob/living/carbon/human/proc/adjust_body_temperature(current, loc_temp, boost) var/temperature = current @@ -869,47 +885,50 @@ return temp_change */ -/mob/living/carbon/human/proc/stabilize_body_temperature() - // We produce heat naturally. - if (species.passive_temp_gain) - bodytemperature += species.passive_temp_gain - if (species.body_temperature == null) - return //this species doesn't have metabolic thermoregulation - - // FBPs will overheat when alive, prosthetic limbs are fine. - if(stat != DEAD && robobody_count) - if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) // NIF heatsinks prevent the base heat increase per tick if installed. - bodytemperature += round(robobody_count*1.15) +/** + * metabolism for body temperature + * + * should only be called while alive + * + * @params + * * dt - seconds for this cycle + */ +/mob/living/carbon/human/proc/stabilize_body_temperature(dt) + if(isnull(loc)) + // okay we should probably like + // not. + return + + var/buffer = bodytemperature + + // legacy: species passive gain + // todo: shouldn't exist probably + buffer += species.passive_temp_gain * dt + // legacy: robot limbs gain heat + // todo: rewrite + if(robobody_count) + if(!nif?.flag_check(NIF_O_HEATSINKS, NIF_FLAGS_OTHER)) + buffer += round(robobody_count* 1.15) * dt var/obj/item/organ/internal/robotic/heatsink/HS = internal_organs_by_name[O_HEATSINK] if(!HS || HS.is_broken()) // However, NIF Heatsinks will not compensate for a core FBP component (your heatsink) being lost. - bodytemperature += round(robobody_count*0.5) - - var/body_temperature_difference = species.body_temperature - bodytemperature - - if (abs(body_temperature_difference) < 0.5) - return //fuck this precision - - if (on_fire) - return //too busy for pesky metabolic regulation - - if(bodytemperature < species.cold_level_1) //260.15 is 310.15 - 50, the temperature where you start to feel effects. - if(nutrition >= 2) //If we are very, very cold we'll use up quite a bit of nutriment to heat us up. - nutrition -= 2 - var/recovery_amt = max((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) - //to_chat(world, "Cold. Difference = [body_temperature_difference]. Recovering [recovery_amt]") -// log_debug(SPAN_DEBUG("Cold. Difference = [body_temperature_difference]. Recovering [recovery_amt]")) - bodytemperature += recovery_amt - else if(species.cold_level_1 <= bodytemperature && bodytemperature <= species.heat_level_1) - var/recovery_amt = body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR - //to_chat(world, "Norm. Difference = [body_temperature_difference]. Recovering [recovery_amt]") -// log_debug(SPAN_DEBUG("Norm. Difference = [body_temperature_difference]. Recovering [recovery_amt]")) - bodytemperature += recovery_amt - else if(bodytemperature > species.heat_level_1) //360.15 is 310.15 + 50, the temperature where you start to feel effects. - adjust_hydration(-(10 * DEFAULT_THIRST_FACTOR)) //Sweating - var/recovery_amt = min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers - //to_chat(world, "Hot. Difference = [body_temperature_difference]. Recovering [recovery_amt]") -// log_debug(SPAN_DEBUG("Hot. Difference = [body_temperature_difference]. Recovering [recovery_amt]")) - bodytemperature += recovery_amt + buffer += round(robobody_count * 0.5) * dt + + // legacy: thermal regulation + // todo: rework + if(species.body_temperature != null) + // species has metabolic thermoregulation + var/difference = species.body_temperature - bodytemperature + + if(buffer < species.cold_level_1) + adjust_nutrition(-2) + buffer += max((difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) + else if(buffer > species.heat_level_1) + adjust_hydration(-(10 * DEFAULT_THIRST_FACTOR)) + buffer += min((difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) + else + buffer += difference / BODYTEMP_AUTORECOVERY_DIVISOR + + set_bodytemperature(buffer) //This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, UPPER_TORSO, LOWER_TORSO, etc. See setup.dm for the full list) /mob/living/carbon/human/proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to. @@ -918,7 +937,7 @@ for(var/obj/item/clothing/C in list(head,wear_suit,w_uniform,shoes,gloves,wear_mask)) if(C) if(C.max_heat_protection_temperature && C.max_heat_protection_temperature >= temperature) - . |= C.heat_protection + . |= C.heat_protection_cover //See proc/get_heat_protection_flags(temperature) for the description of this proc. /mob/living/carbon/human/proc/get_cold_protection_flags(temperature) @@ -927,7 +946,7 @@ for(var/obj/item/clothing/C in list(head,wear_suit,w_uniform,shoes,gloves,wear_mask)) if(C) if(C.min_cold_protection_temperature && C.min_cold_protection_temperature <= temperature) - . |= C.cold_protection + . |= C.cold_protection_cover /mob/living/carbon/human/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to. var/thermal_protection_flags = get_heat_protection_flags(temperature) @@ -1019,7 +1038,7 @@ // This is hacky, I'm so sorry. if(I != l_hand && I != r_hand) //If the item isn't in your hands, you're probably wearing it. Full damage for you. total_phoronloss += loss_per_part - else if((I == l_hand | I == r_hand) && !((src.wear_suit.body_cover_flags & HANDS) | src.gloves | (src.w_uniform.body_cover_flags & HANDS))) //If the item is in your hands, but you're wearing protection, you might be alright. + else if((I == l_hand | I == r_hand) && !((src.wear_suit?.body_cover_flags & HANDS) | src.gloves | (src.w_uniform?.body_cover_flags & HANDS))) //If the item is in your hands, but you're wearing protection, you might be alright. //If you hold it in hand, and your hands arent covered by anything total_phoronloss += loss_per_part if(total_phoronloss) @@ -1631,23 +1650,6 @@ playsound_local(src,pick(scarySounds),50, 1, -1) */ -/mob/living/carbon/human/handle_stomach() - spawn(0) - for(var/mob/living/M in stomach_contents) - if(M.loc != src) - stomach_contents.Remove(M) - continue - if(istype(M, /mob/living/carbon) && stat != 2) - if(M.stat == 2) - M.death(1) - stomach_contents.Remove(M) - qdel(M) - continue - if(SSair.current_cycle%3==1) - if(!(M.status_flags & STATUS_GODMODE)) - M.adjustBruteLoss(5) - nutrition += 10 - /mob/living/carbon/human/proc/handle_changeling() if(mind && mind.changeling) mind.changeling.regenerate() @@ -1695,8 +1697,10 @@ /mob/living/carbon/human/handle_shock() ..() - if(status_flags & STATUS_GODMODE) return 0 //godmode - if(!can_feel_pain()) return + if(status_flags & STATUS_GODMODE) + return 0 //godmode + if(!can_feel_pain()) + return if(health < config_legacy.health_threshold_softcrit)// health 0 makes you immediately collapse shock_stage = max(shock_stage, 61) @@ -1707,7 +1711,7 @@ shock_stage = max(shock_stage, 61) else shock_stage = min(shock_stage, 160) - shock_stage = max(shock_stage-1, 0) + shock_stage = max(shock_stage - (traumatic_shock? 1 : 2), 0) return if(stat) @@ -1880,10 +1884,8 @@ //Our call for the NIF to do whatever /mob/living/carbon/human/proc/handle_nif() - if(!nif) return - //Process regular life stuff - nif.on_life() + nif?.on_life() #undef HUMAN_MAX_OXYLOSS #undef HUMAN_CRIT_MAX_OXYLOSS diff --git a/code/modules/mob/living/carbon/human/traits/_trait.dm b/code/modules/mob/living/carbon/human/traits/_trait.dm index 8ea7fb8641..553c79953e 100644 --- a/code/modules/mob/living/carbon/human/traits/_trait.dm +++ b/code/modules/mob/living/carbon/human/traits/_trait.dm @@ -20,6 +20,9 @@ /datum/trait/proc/apply(datum/species/S, mob/living/carbon/human/H) SHOULD_CALL_PARENT(TRUE) + if(istype(H, /mob/observer)) + return + for(var/trait in traits) ADD_TRAIT(H, trait, QUIRK_TRAIT) diff --git a/code/modules/mob/living/carbon/human/traits/negative.dm b/code/modules/mob/living/carbon/human/traits/negative.dm index 393a371808..1a7fc280cf 100644 --- a/code/modules/mob/living/carbon/human/traits/negative.dm +++ b/code/modules/mob/living/carbon/human/traits/negative.dm @@ -140,6 +140,7 @@ name = "Colorblindness (Monochromancy)" desc = "You simply can't see colors at all, period. You are 100% colorblind." cost = -1 + custom_only = FALSE /datum/trait/negative/colorblind/mono/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -181,6 +182,7 @@ name = "Blind" desc = "You're blind. Permanently." cost = -3 + custom_only = FALSE traits = list( TRAIT_BLIND ) @@ -193,6 +195,7 @@ name = "Deaf" desc = "You're deaf. Permanently." cost = -2 + custom_only = FALSE traits = list( TRAIT_DEAF ) @@ -209,6 +212,7 @@ name = "Mute" desc = "You're mute. Permanently." cost = 0 // TTS bypasses this instantly, no powergaming mute ass explo characters + custom_only = FALSE traits = list( TRAIT_MUTE ) diff --git a/code/modules/mob/living/carbon/human/traits/positive.dm b/code/modules/mob/living/carbon/human/traits/positive.dm index 5a1e05670c..d1f4223407 100644 --- a/code/modules/mob/living/carbon/human/traits/positive.dm +++ b/code/modules/mob/living/carbon/human/traits/positive.dm @@ -34,15 +34,23 @@ /datum/trait/positive/melee_attack name = "Sharp Melee" - desc = "Provides sharp melee attacks that do slightly more damage." + desc = "Provides sharp melee attacks that do more damage." cost = 1 - var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)) + var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/good, /datum/unarmed_attack/bite/sharp/good)) + +/datum/trait/positive/melee_attack/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + S.update_attack_types() /datum/trait/positive/melee_attack_fangs - name = "Sharp Melee & Numbing Fangs" - desc = "Provides sharp melee attacks that do slightly more damage, along with fangs that makes the person bit unable to feel their body or pain." + name = "Sharp Melee & Venomous Fangs" + desc = "Provides sharp melee attacks that do more damage, along with venomous fangs." cost = 2 - var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) + var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/good/venom, /datum/unarmed_attack/bite/sharp/good/venom)) + +/datum/trait/positive/melee_attack_fangs/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + S.update_attack_types() /datum/trait/positive/minor_brute_resist name = "Minor Brute Resist" diff --git a/code/modules/mob/living/carbon/organs.dm b/code/modules/mob/living/carbon/organs.dm new file mode 100644 index 0000000000..b22c1e0c3a --- /dev/null +++ b/code/modules/mob/living/carbon/organs.dm @@ -0,0 +1,26 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +/** + * get organ for body zone + */ +/mob/living/carbon/proc/get_bodypart_for_zone(body_zone) + return organs_by_name[body_zone] + +/** + * get external organs + */ +/mob/living/carbon/proc/get_external_organs() + . = list() + for(var/obj/item/organ/external/E in organs) + . += E + +/** + * get external organs that are targetable + */ +/mob/living/carbon/proc/get_damageable_external_organs(check_damage_cap) + . = list() + for(var/obj/item/organ/external/E in organs) + if(!E.is_damageable(check_damage_cap)) + continue + . += E diff --git a/code/modules/mob/living/carbon/physiology.dm b/code/modules/mob/living/carbon/physiology.dm new file mode 100644 index 0000000000..3609d1b202 --- /dev/null +++ b/code/modules/mob/living/carbon/physiology.dm @@ -0,0 +1,32 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +/mob/living/carbon/add_physiology_modifier(datum/physiology_modifier/modifier) + . = ..() + if(!.) + return + for(var/obj/item/organ/external/bodypart in organs) + // todo: check biology + bodypart.physiology.apply(modifier) + +/mob/living/carbon/remove_physiology_modifier(datum/physiology_modifier/modifier) + . = ..() + if(!.) + return + for(var/obj/item/organ/external/bodypart in organs) + // todo: check biology + if(!bodypart.physiology.revert(modifier)) + // todo: optimize? + bodypart.rebuild_physiology() + for(var/datum/physiology_modifier/rebuilding as anything in physiology_modifiers) + // todo: check biology + bodypart.physiology.apply(rebuilding) + +/mob/living/carbon/rebuild_physiology() + . = ..() + // at this point, physiology_modifier is a list of datums. + for(var/obj/item/organ/external/bodypart in organs) + bodypart.rebuild_physiology() + for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) + // todo: check biology + bodypart.physiology.apply(modifier) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 1e0775294e..058777a602 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -106,10 +106,53 @@ return 1 // todo: refactor above -//? Raw "damage" -// todo: better name -// /mob/living/proc/damage_brute() +//* Raw Damage *// + +/** + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAGE_MODE_* flags for the form of this damage + * * weapon_descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * + * @return amount taken + */ +/mob/living/proc/take_random_targeted_damage(brute, burn, damage_mode, weapon_descriptor) + return take_targeted_damage(brute, burn, damage_mode, pick(GLOB.body_zones), weapon_descriptor) + +/** + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAGE_MODE_* flags for the form of this damage + * * body_zone - body zone define (BP_*) + * * weapon_descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * * defer_updates - update health / perform damage checks? + * + * @return amount taken + */ +/mob/living/proc/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + // todo: don't update health immediately + . = adjustBruteLoss(brute) + adjustFireLoss(burn) + +/** + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAG_EMODE_* flags for the form of this damage + * * weapon descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * * defer_updates - update health / perform damage checks? + * + * @return amount taken + */ +/mob/living/proc/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return 0 + // todo: don't update health immediately + . = adjustBruteLoss(brute) + adjustFireLoss(burn) //? Afflictions /** diff --git a/code/modules/mob/living/defense.dm b/code/modules/mob/living/defense.dm index bf3bcbff25..ea14518ae1 100644 --- a/code/modules/mob/living/defense.dm +++ b/code/modules/mob/living/defense.dm @@ -337,7 +337,7 @@ //This is called when the mob is thrown into a dense turf /mob/living/proc/turf_collision(var/turf/T, var/speed) - src.take_organ_damage(speed*5) + src.take_random_targeted_damage(brute = speed*5) /mob/living/proc/near_wall(var/direction,var/distance=1) var/turf/T = get_step(get_turf(src),direction) @@ -535,6 +535,8 @@ var/button_number = 0 for(var/datum/action/A in actions) + if(!A.button_visibility) + continue button_number++ var/atom/movable/screen/movable/action_button/B = A.button diff --git a/code/modules/mob/living/health.dm b/code/modules/mob/living/health.dm index 1e31970521..d5f9d9ea5d 100644 --- a/code/modules/mob/living/health.dm +++ b/code/modules/mob/living/health.dm @@ -5,7 +5,10 @@ health = 100 set_stat(CONSCIOUS) else + var/old_health = health health = getMaxHealth() - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() - halloss + if(old_health != health) + update_hud_med_health() /mob/living/update_stat(forced, update_mobility) if(stat == DEAD) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 56c8852dd2..fccee1a68b 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -73,10 +73,10 @@ /mob/living/proc/handle_random_events() return -/mob/living/proc/handle_environment(var/datum/gas_mixture/environment) - return - -/mob/living/proc/handle_stomach() +/** + * Handle exposure to the environment, whether atmospherics or otherwise. + */ +/mob/living/proc/handle_environment(datum/gas_mixture/environment) return /mob/living/proc/update_pulling() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 926b646f73..f90f46f691 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -112,9 +112,9 @@ default behaviour is: var/divided_damage = (burn_amount)/(H.organs.len) var/extradam = 0 //added to when organ is at max dam for(var/obj/item/organ/external/affecting in H.organs) - if(!affecting) continue - if(affecting.take_damage(0, divided_damage+extradam)) //TODO: fix the extradam stuff. Or, ebtter yet...rewrite this entire proc ~Carn - H.UpdateDamageIcon() + affecting.inflict_bodypart_damage( + burn = divided_damage + extradam, + ) H.update_health() return 1 else if(istype(src, /mob/living/silicon/ai)) @@ -449,26 +449,12 @@ default behaviour is: adjustFireLoss(-burn) src.update_health() -// damage ONE external organ, organ gets randomly selected from damaged ones. -/mob/living/proc/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0) - if(status_flags & STATUS_GODMODE) return 0 //godmode - adjustBruteLoss(brute) - adjustFireLoss(burn) - src.update_health() - // heal MANY external organs, in random order /mob/living/proc/heal_overall_damage(var/brute, var/burn) adjustBruteLoss(-brute) adjustFireLoss(-burn) src.update_health() -// damage MANY external organs, in random order -/mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null) - if(status_flags & STATUS_GODMODE) return 0 //godmode - adjustBruteLoss(brute) - adjustFireLoss(burn) - src.update_health() - /mob/living/proc/restore_all_organs() return @@ -762,21 +748,6 @@ default behaviour is: /mob/living/proc/needs_to_breathe() return !isSynthetic() -/mob/living/vv_get_header() - . = ..() - . += {" - [src] -
[ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"] -
- BRUTE:[getBruteLoss()] - FIRE:[getFireLoss()] - TOXIN:[getToxLoss()] - OXY:[getOxyLoss()] - CLONE:[getCloneLoss()] - BRAIN:[getBrainLoss()] - - "} - /** *! Enable this one if you're enabling the butchering component. Otherwise it's useless. /mob/living/proc/harvest(mob/living/user) //used for extra objects etc. in butchering diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 1a6aedd103..3a0496bfc6 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -249,6 +249,13 @@ var/list/channel_to_radio_key = new verb = speaking.speech_verb w_not_heard = "[speaking.speech_verb] something [w_adverb]" + var/list/message_args = list("message" = message, "whispering" = whispering, "cancelled" = FALSE) + + SEND_SIGNAL(src, COMSIG_MOB_SAY, message_args) + + if(message_args["cancelled"]) + return + //For speech disorders (hulk, slurring, stuttering) if(!(speaking && (speaking.language_flags & LANGUAGE_NO_STUTTER || speaking.language_flags & LANGUAGE_SIGNLANG))) var/list/message_data = list(message, verb, whispering) diff --git a/code/modules/mob/living/silicon/pai/actions.dm b/code/modules/mob/living/silicon/pai/actions.dm new file mode 100644 index 0000000000..dee8c3e1fd --- /dev/null +++ b/code/modules/mob/living/silicon/pai/actions.dm @@ -0,0 +1,89 @@ +/datum/action/pai + button_icon = 'icons/screen/actions/pai.dmi' + var/update_on_grant = FALSE + var/update_on_chassis_change = FALSE + +/// Toggle unfolding/collapsing chassis +/datum/action/pai/toggle_fold + name = "Unfold Chassis" + desc = "Unfold Chassis" + button_icon_state = "pai" + update_on_grant = TRUE + update_on_chassis_change = TRUE + +/datum/action/pai/toggle_fold/on_trigger(mob/living/silicon/pai/user) + if(user.loc == user.shell) + user.open_up_safe() + else + user.close_up_safe() + +/datum/action/pai/toggle_fold/update_button() + var/mob/living/silicon/pai/user = owner + if(!istype(user)) + return + + if(user.loc == user.shell) + name = "Unfold Chassis" + desc = "Unfold Chassis" + button_icon = user.icon + button_icon_state = user.icon_state + else + name = "Collapse Chassis" + desc = "Collapse Chassis" + button_icon = user.shell.icon + button_icon_state = user.shell.icon_state + + ..() + +/// Change chassis +/datum/action/pai/change_chassis + name = "Change Chassis" + desc = "Select a different chassis" + button_icon_state = "pai_chassis_change" + +/datum/action/pai/change_chassis/on_trigger(mob/living/silicon/pai/user) + user.update_chassis() + +/// Revert to card +/// This only shows if your shell is not currently the card, otherwise this action is hidden +/datum/action/pai/revert_to_card + name = "Revert To Card" + desc = "Revert your shell back to card-form" + button_icon_state = "pai_shell_revert" + update_on_chassis_change = TRUE + +/datum/action/pai/revert_to_card/on_trigger(mob/living/silicon/pai/user) + user.revert_to_card() + +/datum/action/pai/revert_to_card/update_button() + ..() + + var/mob/living/silicon/pai/user = owner + button_visibility = (user.shell != user.card) + +/// Clothing Transform +/datum/action/pai/clothing_transform + name = "Clothing Transform" + desc = "Change shell to clothing form" + button_icon_state = "pai_clothing" + update_on_chassis_change = TRUE + +/datum/action/pai/clothing_transform/on_trigger(mob/living/silicon/pai/user) + user.change_to_clothing() + +/// Hologram Display (show scanned object from card form) +/// This only shows if you are in card form, otherwise this action is hidden +/datum/action/pai/hologram_display + name = "Hologram Display" + desc = "Display a scanned object as a hologram" + button_icon_state = "pai_hologram_display" + update_on_chassis_change = TRUE + +/datum/action/pai/hologram_display/on_trigger(mob/living/silicon/pai/user) + user.card_hologram_display() + +/datum/action/pai/hologram_display/update_button() + ..() + + var/mob/living/silicon/pai/user = owner + button_visibility = (user.loc == user.card) diff --git a/code/modules/mob/living/silicon/pai/mobility.dm b/code/modules/mob/living/silicon/pai/mobility.dm index cfc5398187..dd233dcf50 100644 --- a/code/modules/mob/living/silicon/pai/mobility.dm +++ b/code/modules/mob/living/silicon/pai/mobility.dm @@ -3,12 +3,11 @@ return FALSE ..() -/mob/living/silicon/pai/proc/close_up() - // we can't close up if already inside our shell +/mob/living/silicon/pai/proc/close_up_safe() + /// We can't close up if already inside our shell if(src.loc == shell) return - // we check mobility here to stop people folding up if they currently cannot move if(!CHECK_MOBILITY(src, MOBILITY_CAN_MOVE)) return @@ -19,19 +18,22 @@ if(!can_action()) return - last_special = world.time + 20 + close_up() + + last_special = world.time + 2 SECONDS +/mob/living/silicon/pai/proc/close_up() release_vore_contents() stop_pulling() - // If we are being held, handle removing our holder from their inv. + /// If we are being held, handle removing our holder from their inv. var/obj/item/holder/H = loc if(istype(H)) H.forceMove(get_turf(src)) forceMove(get_turf(src)) - // Move us into the shell and move the shell to the ground. + /// Move us into the shell and move the shell to the ground. transform_component.put_in_object() update_perspective() @@ -40,11 +42,22 @@ update_mobility() update_icon() remove_verb(src, /mob/living/silicon/pai/proc/pai_nom) + update_chassis_actions() -/mob/living/silicon/pai/proc/open_up() - last_special = world.time + 20 +/mob/living/silicon/pai/proc/open_up_safe() + /// Don't check mobility here because while folded up, you can't move + if(!can_action()) + return + /// To fold out the pAI needs to be in the shell + if(src.loc != shell) + return + + open_up() - // stops unfolding in hardsuits and vore bellies, if implanted you explode out + last_special = world.time + 2 SECONDS + +/mob/living/silicon/pai/proc/open_up() + /// Stops unfolding in hardsuits and vore bellies, if implanted you explode out if(istype(shell.loc,/obj/item/hardsuit_module)) to_chat(src, "There is no room to unfold inside this hardsuit module. You're good and stuck.") return FALSE @@ -58,7 +71,9 @@ var/mob/living/carbon/human/H = holder for(var/obj/item/organ/external/affecting in H.organs) if(shell in affecting.implants) - affecting.take_damage(rand(30,50)) + affecting.inflict_bodypart_damage( + brute = rand(30, 50), + ) affecting.implants -= shell H.visible_message("\The [src] explodes out of \the [H]'s [affecting.name] in shower of gore!") break @@ -67,7 +82,7 @@ var/obj/item/pda/holder = shell.loc holder.pai = null - // handle the actual object stuffing via the component, essentially swapping their loc's around + /// Handle the actual object stuffing via the component, essentially swapping their loc's around transform_component.put_in_mob() update_perspective() @@ -76,7 +91,7 @@ if(istype(card)) card.screen_loc = null - // we might not actually be on a turf after the object stuffing, so make sure we are + /// Possible to not be on a turf after the object stuffing, so make sure var/turf/T = get_turf(src) if(istype(T)) src.forceMove(T) @@ -85,8 +100,9 @@ add_verb(src, /mob/living/silicon/pai/proc/pai_nom) card.stop_displaying_hologram() update_icon() + update_chassis_actions() -// Handle being picked up. +/// Handle being picked up. /mob/living/silicon/pai/get_scooped(var/mob/living/carbon/grabber, var/self_drop) var/obj/item/holder/H = ..(grabber, self_drop) if(!istype(H)) @@ -97,12 +113,12 @@ grabber.update_inv_r_hand() return H -// handle movement speed +/// Handle movement speed /mob/living/silicon/pai/movement_delay() return ..() + speed -// this is a general check for if we can do things such as fold in/out or perform other special actions -// (basically if some condition should be checked upon the use of all mob abilities like closing/opening the shell it goes here instead) +/// This is a general check for if the pAI can do things such as fold in/out or perform other special actions +/// (basically if some condition should be checked upon the use of all mob abilities like closing/opening the shell it goes here instead) /mob/living/silicon/pai/proc/can_action() if(world.time <= last_special) return FALSE @@ -112,11 +128,11 @@ return TRUE -// space movement (we get one ion burst every 3 seconds) +/// Space movement (pAI gets one ion burst every 3 seconds) /mob/living/silicon/pai/Process_Spacemove(movement_dir = NONE) . = ..() if(!. && src.loc != shell) - if(world.time >= last_space_movement + 30) + if(world.time >= last_space_movement + 3 SECONDS) last_space_movement = world.time // place an effect for the movement new /obj/effect/temp_visual/pai_ion_burst(get_turf(src)) @@ -141,13 +157,13 @@ var/desired_scale_y = size_multiplier * icon_scale_y M.Scale(desired_scale_x, desired_scale_y) M.Translate(0, 16*(desired_scale_y-1)) - // no chassis means we're using a hologram + /// No chassis means pAI is using a hologram var/turning_value_to_use = 0 if(!chassis) turning_value_to_use = lying - // handle turning + /// Handle turning M.Turn(turning_value_to_use) - // extremely lazy heuristic to see if we should shift down to appear to be, well, down. + /// Extremely lazy heuristic to see if we should shift down to appear to be, well, down. if(turning_value_to_use < -45 || turning_value_to_use > 45) M.Translate(1,-6) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 6713a78c7d..d2fb19a1db 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -119,6 +119,12 @@ var/list/scanned_objects = list() var/last_scanned_time = 0 + var/list/actions_to_grant = list(/datum/action/pai/toggle_fold, + /datum/action/pai/change_chassis, + /datum/action/pai/clothing_transform, + /datum/action/pai/revert_to_card, + /datum/action/pai/hologram_display) + /mob/living/silicon/pai/Initialize(mapload) . = ..() shell = loc @@ -132,6 +138,8 @@ card.radio = new /obj/item/radio(src.card) radio = card.radio + /// Verbs & Actions + generate_actions() add_verb(src, /mob/living/silicon/pai/proc/choose_chassis) add_verb(src, /mob/living/silicon/pai/proc/choose_verbs) add_verb(src, /mob/living/proc/set_size) @@ -264,6 +272,8 @@ if(!istype(new_shell, /obj/item/paicard)) RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, PROC_REF(pass_attack_self_to_card)) + update_chassis_actions() + // changing the shell into clothing /mob/living/silicon/pai/proc/change_shell_by_path(obj/item/clothing/object_path) if(!can_change_shell()) @@ -344,3 +354,113 @@ /mob/living/silicon/pai/get_centering_pixel_x_offset(dir) return base_pixel_x + (WORLD_ICON_SIZE - icon_x_dimension) / 2 + +/mob/living/silicon/pai/proc/update_chassis() + var/original_chassis = chassis + var/choice + var/finalized = "No" + while(finalized == "No" && src.client) + + choice = tgui_input_list(usr, "What would you like to use for your mobile chassis icon?", "Options", list("-- LOAD CHARACTER SLOT --") + possible_chassis) + if(!choice) + chassis = original_chassis + return + + if(choice == "-- LOAD CHARACTER SLOT --") + last_rendered_hologram_icon = get_holo_image() + card.cached_holo_image = null + card.get_holo_image() + icon = last_rendered_hologram_icon + chassis = possible_chassis[choice] + update_icon(FALSE) + else + icon = 'icons/mob/pai_vr.dmi' + chassis = possible_chassis[choice] + update_icon(FALSE) + + finalized = alert("Look at your sprite. Is this what you wish to use?",,"No","Yes") + + add_verb(src, /mob/living/proc/hide) + update_icon(FALSE) + update_chassis_actions() + +/mob/living/silicon/pai/proc/revert_to_card() + if(!can_change_shell()) + return + if(!card || card.loc != src || card == shell) + return + switch_shell(card) + +/mob/living/silicon/pai/proc/change_to_clothing() + if(!can_change_shell()) + return + + var/clothing_entry = tgui_input_list(usr, "What clothing would you like to change your shell to?", "Options", list("Chameleon Clothing List","Last Uploaded Clothing")) + if(clothing_entry) + if(clothing_entry == "Chameleon Clothing List") + var/clothing_type_entry = tgui_input_list(usr, "What type of clothing would you like to change your shell to?", "Clothing Type", list("Undershirt", "Suit", "Hat", "Shoes", "Gloves", "Mask", "Glasses", "Accessory")) + var/list/clothing_for_type + if(clothing_type_entry) + switch(clothing_type_entry) + if("Undershirt") + clothing_for_type = GLOB.clothing_under + if("Suit") + clothing_for_type = GLOB.clothing_suit + if("Hat") + clothing_for_type = GLOB.clothing_head + if("Shoes") + clothing_for_type = GLOB.clothing_shoes + if("Gloves") + clothing_for_type = GLOB.clothing_gloves + if("Mask") + clothing_for_type = GLOB.clothing_mask + if("Glasses") + clothing_for_type = GLOB.clothing_glasses + if("Accessory") + clothing_for_type = GLOB.clothing_accessory + var/clothing_item_entry = tgui_input_list(usr, "Choose clothing item", "Clothing", clothing_for_type) + if(clothing_item_entry) + change_shell_by_path(clothing_for_type[clothing_item_entry]) + else if(clothing_entry == "Last Uploaded Clothing") + if(last_uploaded_path && can_change_shell()) + last_special = world.time + 20 + var/state = initial(last_uploaded_path.icon_state) + var/icon = initial(last_uploaded_path.icon) + var/obj/item/clothing/new_clothing = new base_uploaded_path + new_clothing.forceMove(src.loc) + new_clothing.name = "[src.name] (pAI)" + new_clothing.desc = src.desc + new_clothing.icon = icon + new_clothing.icon_state = state + new_clothing.add_atom_colour(uploaded_color, FIXED_COLOUR_PRIORITY) + + var/obj/item/clothing/under/U = new_clothing + if(istype(U)) + U.snowflake_worn_state = uploaded_snowflake_worn_state + + switch_shell(new_clothing) + +/mob/living/silicon/pai/proc/card_hologram_display() + if(src.loc == card) + var/scanned_item_to_show = tgui_input_list(usr, "Select Scanned Object", "Scanned Objects", list("Cancel") + scanned_objects) + if(scanned_item_to_show) + if(scanned_item_to_show == "Cancel") + card.stop_displaying_hologram() + else + var/image/I = scanned_objects[scanned_item_to_show] + card.display_hologram_from_image(I) + else + to_chat(src, "You must be in card form to do this!") + +/mob/living/silicon/pai/proc/generate_actions() + for(var/path in actions_to_grant) + var/datum/action/pai/A = new path() + A.grant(src) + if(A.update_on_grant) + A.update_button() + +/mob/living/silicon/pai/proc/update_chassis_actions() + for(var/datum/action/pai/A in actions) + if(A.update_on_chassis_change) + A.update_button() + update_action_buttons() diff --git a/code/modules/mob/living/silicon/pai/verbs.dm b/code/modules/mob/living/silicon/pai/verbs.dm index f11d0484b0..f8b0400157 100644 --- a/code/modules/mob/living/silicon/pai/verbs.dm +++ b/code/modules/mob/living/silicon/pai/verbs.dm @@ -2,61 +2,19 @@ set category = "pAI Commands" set name = "Unfold Chassis" - // see pai/mobility.dm - // we don't check mobility here because while folded up, you can't move - if(!can_action()) - return - // to fold out we need to be in the shell - if(src.loc != shell) - return - - open_up() + open_up_safe() /mob/living/silicon/pai/verb/fold_up() set category = "pAI Commands" set name = "Collapse Chassis" - // we check mobility here to stop people folding up if they currently cannot move - if(!CHECK_MOBILITY(src, MOBILITY_CAN_MOVE)) - return - if(!can_action()) - return - // to fold up we need to not be in the card already - if(src.loc == shell) - return - - close_up() + close_up_safe() /mob/living/silicon/pai/proc/choose_chassis() set category = "pAI Commands" set name = "Choose Chassis" - var/original_chassis = chassis - var/choice - var/finalized = "No" - while(finalized == "No" && src.client) - - choice = input(usr,"What would you like to use for your mobile chassis icon?") as null|anything in (list("-- LOAD CHARACTER SLOT --") + possible_chassis) - if(!choice) - chassis = original_chassis - return - - if(choice == "-- LOAD CHARACTER SLOT --") - last_rendered_hologram_icon = get_holo_image() - card.cached_holo_image = null - card.get_holo_image() - icon = last_rendered_hologram_icon - chassis = possible_chassis[choice] - update_icon(FALSE) - else - icon = 'icons/mob/pai_vr.dmi' - chassis = possible_chassis[choice] - update_icon(FALSE) - - finalized = alert("Look at your sprite. Is this what you wish to use?",,"No","Yes") - - add_verb(src, /mob/living/proc/hide) - update_icon(FALSE) + update_chassis() /mob/living/silicon/pai/proc/choose_verbs() set category = "pAI Commands" @@ -132,77 +90,18 @@ set category = "pAI Commands" set desc = "Allows you to transform your shell into clothing." - if(!can_change_shell()) - return - - var/clothing_entry = tgui_input_list(usr, "What clothing would you like to change your shell to?", "Options", list("Chameleon Clothing List","Last Uploaded Clothing")) - if(clothing_entry) - if(clothing_entry == "Chameleon Clothing List") - var/clothing_type_entry = tgui_input_list(usr, "What type of clothing would you like to change your shell to?", "Clothing Type", list("Undershirt", "Suit", "Hat", "Shoes", "Gloves", "Mask", "Glasses", "Accessory")) - var/list/clothing_for_type - if(clothing_type_entry) - switch(clothing_type_entry) - if("Undershirt") - clothing_for_type = GLOB.clothing_under - if("Suit") - clothing_for_type = GLOB.clothing_suit - if("Hat") - clothing_for_type = GLOB.clothing_head - if("Shoes") - clothing_for_type = GLOB.clothing_shoes - if("Gloves") - clothing_for_type = GLOB.clothing_gloves - if("Mask") - clothing_for_type = GLOB.clothing_mask - if("Glasses") - clothing_for_type = GLOB.clothing_glasses - if("Accessory") - clothing_for_type = GLOB.clothing_accessory - var/clothing_item_entry = tgui_input_list(usr, "Choose clothing item", "Clothing", clothing_for_type) - if(clothing_item_entry) - change_shell_by_path(clothing_for_type[clothing_item_entry]) - else if(clothing_entry == "Last Uploaded Clothing") - if(last_uploaded_path && can_change_shell()) - last_special = world.time + 20 - var/state = initial(last_uploaded_path.icon_state) - var/icon = initial(last_uploaded_path.icon) - var/obj/item/clothing/new_clothing = new base_uploaded_path - new_clothing.forceMove(src.loc) - new_clothing.name = "[src.name] (pAI)" - new_clothing.desc = src.desc - new_clothing.icon = icon - new_clothing.icon_state = state - new_clothing.add_atom_colour(uploaded_color, FIXED_COLOUR_PRIORITY) - - var/obj/item/clothing/under/U = new_clothing - if(istype(U)) - U.snowflake_worn_state = uploaded_snowflake_worn_state - - switch_shell(new_clothing) + change_to_clothing() /mob/living/silicon/pai/verb/revert_shell_to_card() set name = "Reset Shell" set category = "pAI Commands" set desc = "Reverts your shell back to card form." - if(!can_change_shell()) - return - if(!card || card.loc != src || card == shell) - return - switch_shell(card) + revert_to_card() /mob/living/silicon/pai/verb/hologram_display() set name = "Hologram Display" set category = "pAI Commands" set desc = "Allows you to pick a scanned object to display from your holoprojector." - if(src.loc == card) - var/scanned_item_to_show = tgui_input_list(usr, "Select Scanned Object", "Scanned Objects", list("Cancel") + scanned_objects) - if(scanned_item_to_show) - if(scanned_item_to_show == "Cancel") - card.stop_displaying_hologram() - else - var/image/I = scanned_objects[scanned_item_to_show] - card.display_hologram_from_image(I) - else - to_chat(src, "You must be in card form to do this!") + card_hologram_display() diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index cedecbc750..e17ba0fe0a 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -39,7 +39,7 @@ installed = -1 uninstall() -/datum/robot_component/proc/take_damage_legacy(brute, electronics, sharp, edge) +/datum/robot_component/proc/take_damage_legacy(brute, electronics) if(installed != 1) return brute_damage += brute diff --git a/code/modules/mob/living/silicon/robot/damage_procs.dm b/code/modules/mob/living/silicon/robot/damage_procs.dm new file mode 100644 index 0000000000..29c13838be --- /dev/null +++ b/code/modules/mob/living/silicon/robot/damage_procs.dm @@ -0,0 +1,75 @@ +//* Raw Damage *// + +/mob/living/silicon/robot/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + var/list/components = get_damageable_components() + if(!components.len) + return + + //Combat shielding absorbs a percentage of damage directly into the cell. + if(has_active_type(/obj/item/borg/combat/shield)) + var/obj/item/borg/combat/shield/shield = locate() in src + if(shield && shield.active) + //Shields absorb a certain percentage of damage based on their power setting. + var/absorb_brute = brute*shield.shield_level + var/absorb_burn = burn*shield.shield_level + var/cost = (absorb_brute+absorb_burn) * 25 + + cell.charge -= cost + if(cell.charge <= 0) + cell.charge = 0 + to_chat(src, "Your shield has overloaded!") + else + brute -= absorb_brute + burn -= absorb_burn + to_chat(src, "Your shield absorbs some of the impact!") + + if(!(damage_mode & DAMAGE_MODE_INTERNAL)) + var/datum/robot_component/armour/A = get_armour() + if(A) + A.take_damage_legacy(brute,burn) + return + + var/datum/robot_component/C = pick(components) + C.take_damage_legacy(brute,burn) + +/mob/living/silicon/robot/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + if(status_flags & STATUS_GODMODE) + return //godmode + var/list/datum/robot_component/parts = get_damageable_components() + + //Combat shielding absorbs a percentage of damage directly into the cell. + if(has_active_type(/obj/item/borg/combat/shield)) + var/obj/item/borg/combat/shield/shield = locate() in src + if(shield) + //Shields absorb a certain percentage of damage based on their power setting. + var/absorb_brute = brute*shield.shield_level + var/absorb_burn = burn*shield.shield_level + var/cost = (absorb_brute+absorb_burn) * 25 + + cell.charge -= cost + if(cell.charge <= 0) + cell.charge = 0 + to_chat(src, "Your shield has overloaded!") + else + brute -= absorb_brute + burn -= absorb_burn + to_chat(src, "Your shield absorbs some of the impact!") + + var/datum/robot_component/armour/A = get_armour() + if(A) + A.take_damage_legacy(brute,burn) + return + + while(parts.len && (brute>0 || burn>0) ) + var/datum/robot_component/picked = pick(parts) + + var/brute_was = picked.brute_damage + var/burn_was = picked.electronics_damage + + picked.take_damage_legacy(brute,burn) + + brute -= (picked.brute_damage - brute_was) + burn -= (picked.electronics_damage - burn_was) + + parts -= picked + diff --git a/code/modules/mob/living/silicon/robot/drone/damage_procs.dm b/code/modules/mob/living/silicon/robot/drone/damage_procs.dm new file mode 100644 index 0000000000..4b97e71409 --- /dev/null +++ b/code/modules/mob/living/silicon/robot/drone/damage_procs.dm @@ -0,0 +1,15 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + +//* Raw Damage *// + +/mob/living/silicon/robot/drone/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) + // for now, we don't do anything other than give raw damage as drones don't simulate like robots do + bruteloss += brute + fireloss += burn + if(!defer_updates) + update_health() + return brute + burn + +/mob/living/silicon/robot/drone/take_targeted_damage(brute, burn, damage_mode, body_zone, weapon_descriptor, defer_updates) + return take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index edc82f8470..e11d2eab33 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -14,7 +14,7 @@ /obj/machinery/computer/drone_control/attack_ai(var/mob/user as mob) return src.attack_hand(user) -/obj/machinery/computer/drone_control/ui_status(mob/user) +/obj/machinery/computer/drone_control/ui_status(mob/user, datum/ui_state/state) if(!allowed(user)) return UI_CLOSE return ..() @@ -31,7 +31,7 @@ ui = new(user, src, "DroneConsole", name) ui.open() -/obj/machinery/computer/drone_control/ui_data(mob/user) +/obj/machinery/computer/drone_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/drones = list() @@ -59,7 +59,7 @@ return data -/obj/machinery/computer/drone_control/ui_act(action, params) +/obj/machinery/computer/drone_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm index 1c7e39ca74..b5fbb33c7e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm @@ -1,7 +1,4 @@ //Redefining some robot procs, since drones can't be repaired and really shouldn't take component damage. -/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null) - bruteloss += brute - fireloss += burn /mob/living/silicon/robot/drone/heal_overall_damage(var/brute, var/burn) @@ -11,9 +8,6 @@ if(bruteloss<0) bruteloss = 0 if(fireloss<0) fireloss = 0 -/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/emp = 0) - take_overall_damage(brute,burn) - /mob/living/silicon/robot/drone/heal_organ_damage(var/brute, var/burn) heal_overall_damage(brute,burn) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 4e2d8dba1b..ae3ee58572 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -495,6 +495,13 @@ set name = "Emit Sparks" spark_system.start() +/mob/living/silicon/robot/verb/toggle_cover() + set category = "Robot Commands" + set name = "Toggle Cover" + locked = !locked + to_chat(src, "You [ locked ? "lock" : "unlock"] your interface.") + updateicon() + // this function returns the robots jetpack, if one is installed /mob/living/silicon/robot/proc/installed_jetpack() if(module) @@ -1129,7 +1136,7 @@ cleaned_human.clean_blood(1) to_chat(cleaned_human, "[src] cleans your face!") - if((module_state_1 && istype(module_state_1, /obj/item/storage/bag/ore)) || (module_state_2 && istype(module_state_2, /obj/item/storage/bag/ore)) || (module_state_3 && istype(module_state_3, /obj/item/storage/bag/ore))) //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use. + if(istype(module_state_1, /obj/item/storage/bag/ore) || istype(module_state_2, /obj/item/storage/bag/ore) || istype(module_state_3, /obj/item/storage/bag/ore)) //Borgs and drones can use their mining bags ~automagically~ if they're deployed in a slot. Only mining bags, as they're optimized for mass use. var/obj/item/storage/bag/ore/B = null if(istype(module_state_1, /obj/item/storage/bag/ore)) //First orebag has priority, if they for some reason have multiple. B = module_state_1 diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 25b5c49bdc..fe12049464 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -62,38 +62,6 @@ var/datum/robot_component/picked = pick(parts) picked.heal_damage(brute,burn) -/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0) - var/list/components = get_damageable_components() - if(!components.len) - return - - //Combat shielding absorbs a percentage of damage directly into the cell. - if(has_active_type(/obj/item/borg/combat/shield)) - var/obj/item/borg/combat/shield/shield = locate() in src - if(shield && shield.active) - //Shields absorb a certain percentage of damage based on their power setting. - var/absorb_brute = brute*shield.shield_level - var/absorb_burn = burn*shield.shield_level - var/cost = (absorb_brute+absorb_burn) * 25 - - cell.charge -= cost - if(cell.charge <= 0) - cell.charge = 0 - to_chat(src, "Your shield has overloaded!") - else - brute -= absorb_brute - burn -= absorb_burn - to_chat(src, "Your shield absorbs some of the impact!") - - if(!emp) - var/datum/robot_component/armour/A = get_armour() - if(A) - A.take_damage_legacy(brute,burn,sharp,edge) - return - - var/datum/robot_component/C = pick(components) - C.take_damage_legacy(brute,burn,sharp,edge) - /mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn) var/list/datum/robot_component/parts = get_damaged_components(brute,burn) @@ -109,47 +77,3 @@ burn -= (burn_was-picked.electronics_damage) parts -= picked - -/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null) - if(status_flags & STATUS_GODMODE) return //godmode - var/list/datum/robot_component/parts = get_damageable_components() - - //Combat shielding absorbs a percentage of damage directly into the cell. - if(has_active_type(/obj/item/borg/combat/shield)) - var/obj/item/borg/combat/shield/shield = locate() in src - if(shield) - //Shields absorb a certain percentage of damage based on their power setting. - var/absorb_brute = brute*shield.shield_level - var/absorb_burn = burn*shield.shield_level - var/cost = (absorb_brute+absorb_burn) * 25 - - cell.charge -= cost - if(cell.charge <= 0) - cell.charge = 0 - to_chat(src, "Your shield has overloaded!") - else - brute -= absorb_brute - burn -= absorb_burn - to_chat(src, "Your shield absorbs some of the impact!") - - var/datum/robot_component/armour/A = get_armour() - if(A) - A.take_damage_legacy(brute,burn,sharp) - return - - while(parts.len && (brute>0 || burn>0) ) - var/datum/robot_component/picked = pick(parts) - - var/brute_was = picked.brute_damage - var/burn_was = picked.electronics_damage - - picked.take_damage_legacy(brute,burn) - - brute -= (picked.brute_damage - brute_was) - burn -= (picked.electronics_damage - burn_was) - - parts -= picked - -/mob/living/silicon/robot/emp_act(severity) - uneq_all() - ..() //Damage is handled at /silicon/ level. diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index ec554610ae..691cb0625e 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -115,16 +115,16 @@ /mob/living/silicon/emp_act(severity) switch(severity) if(1) - src.take_organ_damage(0,20,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 20, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(5) if(2) - src.take_organ_damage(0,15,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 15, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(4) if(3) - src.take_organ_damage(0,10,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 10, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(3) if(4) - src.take_organ_damage(0,5,emp=1) + src.take_random_targeted_damage(brute = 0, burn = 5, damage_mode = DAMAGE_MODE_INTERNAL, weapon_descriptor = "electromagnetic surge") Confuse(2) flash_eyes(affect_silicon = 1) to_chat(src, "*BZZZT*") diff --git a/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm b/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm index 48e64c211f..80ff1f1fb6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm +++ b/code/modules/mob/living/simple_mob/subtypes/lavaland/stormdrifter.dm @@ -139,11 +139,14 @@ /mob/living/simple_mob/animal/stormdrifter/bull/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/tool/wirecutters) || is_sharp(O)) - to_chat(user, "You amputate the [src]'s stingers! It may now be domesticated!") - neutered = 1 - legacy_melee_damage_lower = 5 - legacy_melee_damage_upper = 10 - ai_holder_type = /datum/ai_holder/simple_mob/stormdrifter/bull_neutered + if(!neutered) + to_chat(user, "You amputate the [src]'s stingers! It may now be domesticated!") + neutered = 1 + legacy_melee_damage_lower = 5 + legacy_melee_damage_upper = 10 + ai_holder_type = /datum/ai_holder/simple_mob/stormdrifter/bull_neutered + else + return ..() if(istype(O, /obj/item/saddle/stormdrifter) && !rideable) if(!neutered) diff --git a/code/modules/mob/living/throwing.dm b/code/modules/mob/living/throwing.dm index 34d38ceda0..3f1db65b03 100644 --- a/code/modules/mob/living/throwing.dm +++ b/code/modules/mob/living/throwing.dm @@ -64,7 +64,7 @@ newtonian_move(get_dir(target, src)) - throwing.throw_at(target, the_range, null, (a_intent == INTENT_HELP? THROW_AT_IS_NEAT : NONE) | (overhand? THROW_AT_OVERHAND : NONE), src, force = impulse) + throwing.throw_at(target, the_range, null, (a_intent != INTENT_HARM? THROW_AT_IS_NEAT : NONE) | (overhand? THROW_AT_OVERHAND : NONE), src, force = impulse) trigger_aiming(TARGET_CAN_CLICK) return TRUE diff --git a/code/modules/mob/living/vv.dm b/code/modules/mob/living/vv.dm new file mode 100644 index 0000000000..d002ab76e7 --- /dev/null +++ b/code/modules/mob/living/vv.dm @@ -0,0 +1,15 @@ + +/mob/living/vv_get_header() + . = ..() + . += {" + [src] +
[ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"] +
+ BRUTE:[getBruteLoss()] + FIRE:[getFireLoss()] + TOXIN:[getToxLoss()] + OXY:[getOxyLoss()] + CLONE:[getCloneLoss()] + BRAIN:[getBrainLoss()] + + "} diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 1820d5514a..74191dc0a1 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -1,3 +1,11 @@ +/** + * Linter check, do not call. + */ +/proc/lint__check_mob_login_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/mob/M + M.Login() + /** * Run when a client is put in this mob or reconnets to byond and their client was on this mob * diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm index 8cebd172f6..4bd4d81517 100644 --- a/code/modules/mob/logout.dm +++ b/code/modules/mob/logout.dm @@ -1,3 +1,12 @@ + +/** + * Linter check, do not call. + */ +/proc/lint__check_mob_logout_doesnt_sleep() + SHOULD_NOT_SLEEP(TRUE) + var/mob/M + M.Logout() + /mob/Logout() SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGOUT, client) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 46fcfc281a..b0ab80166f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -879,7 +879,11 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) affected.implants -= selection H.shock_stage+=20 - affected.take_damage((selection.w_class * 3), 0, 0, 1, "Embedded object extraction") + affected.inflict_bodypart_damage( + brute = selection.w_class * 3, + damage_mode = DAMAGE_MODE_EDGE, + weapon_descriptor = "object removal", + ) if(prob(selection.w_class * 5) && (affected.robotic < ORGAN_ROBOT)) //I'M SO ANEMIC I COULD JUST -DIE-. affected.create_specific_wound(/datum/wound/internal_bleeding, min(selection.w_class * 5, 15)) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 5c7ee29c7e..4a6f712e0b 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -236,6 +236,7 @@ var/timeofdeath = 0 //?Living + // todo: go to carbon, simple mobs don't need environmental stabilization var/bodytemperature = 310.055 //98.7 F var/drowsyness = 0 //?Carbon diff --git a/code/modules/mob/new_player/join_menu.dm b/code/modules/mob/new_player/join_menu.dm index 7504ad42ab..4342134147 100644 --- a/code/modules/mob/new_player/join_menu.dm +++ b/code/modules/mob/new_player/join_menu.dm @@ -14,10 +14,10 @@ GLOBAL_DATUM_INIT(join_menu, /datum/join_menu, new) /datum/join_menu/proc/queue_update() addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, update_static_data)), 0, TIMER_UNIQUE | TIMER_OVERRIDE) -/datum/join_menu/ui_state(mob/user, datum/tgui_module/module) +/datum/join_menu/ui_state() return GLOB.explicit_new_player_state -/datum/join_menu/ui_static_data(mob/user) +/datum/join_menu/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() // every entry will have: // - faction @@ -89,7 +89,7 @@ GLOBAL_DATUM_INIT(join_menu, /datum/join_menu, new) ghostroles += list(ghostrole_data) // wrap list return data -/datum/join_menu/ui_data(mob/user) +/datum/join_menu/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // common info goes into ui data var/level = "green" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 107b16dd47..122742c194 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -450,7 +450,7 @@ var/obj/structure/AIcore/deactivated/C = GLOB.empty_playable_ai_cores[1] GLOB.empty_playable_ai_cores -= C - character.loc = C.loc + character.forceMove(C.loc) AnnounceCyborg(character, rank, "has been transferred to the empty core in \the [character.loc.loc]") SSticker.mode.latespawn(character) @@ -466,7 +466,7 @@ // Moving wheelchair if they have one if(character.buckled && istype(character.buckled, /obj/structure/bed/chair/wheelchair)) - character.buckled.loc = character.loc + character.buckled.forceMove(character.loc) character.buckled.setDir(character.dir) SSticker.mode.latespawn(character) diff --git a/code/modules/mob/observer/dead/observer_movement.dm b/code/modules/mob/observer/dead/observer_movement.dm index 887cda1815..6d632a3481 100644 --- a/code/modules/mob/observer/dead/observer_movement.dm +++ b/code/modules/mob/observer/dead/observer_movement.dm @@ -25,3 +25,6 @@ /mob/observer/dead/canface() return TRUE + +/mob/observer/dead/CanAllowThrough(atom/movable/mover, turf/target) + return TRUE // ghosts don't block diff --git a/code/modules/mob/observer/dead/orbit.dm b/code/modules/mob/observer/dead/orbit.dm index 51c04a647a..e3099ce859 100644 --- a/code/modules/mob/observer/dead/orbit.dm +++ b/code/modules/mob/observer/dead/orbit.dm @@ -6,7 +6,7 @@ qdel(src) owner = new_owner -/datum/orbit_menu/ui_state(mob/user) +/datum/orbit_menu/ui_state() return GLOB.observer_state /datum/orbit_menu/ui_interact(mob/user, datum/tgui/ui) @@ -15,7 +15,7 @@ ui = new(user, src, "Orbit") ui.open() -/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return @@ -35,7 +35,7 @@ update_static_data() . = TRUE -/datum/orbit_menu/ui_static_data(mob/user) +/datum/orbit_menu/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/players = list() @@ -52,11 +52,17 @@ serialized["ref"] = REF(name) var/mob/M = name + + if(M == user) + continue//Should only really happen with observers, but just to be sure + if(!istype(M)) misc += list(serialized) continue if(isobserver(M)) + if(M.invisibility >= INVISIBILITY_MAXIMUM) + continue ghosts += list(serialized) else if(issimple(M)) simplemobs += list(serialized) diff --git a/code/modules/mob/physiology.dm b/code/modules/mob/physiology.dm index 8c548254a7..9fa1b0dbf0 100644 --- a/code/modules/mob/physiology.dm +++ b/code/modules/mob/physiology.dm @@ -1,15 +1,12 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2023 Citadel Station developers. *// + /** * physiology holder * * todo: on biologies update, we might need to lazy-cache this, and have different physiologies for each biology. */ /datum/global_physiology - // back-reference to mob, for vv purposes. - var/mob/ownership - - // todo: /datum/global_physiology should hold global body physiology, limbs should hold modifiers/whatever themselves. - // this way biologies can be supported as efficiently as possible. - /// carry baseline modify var/carry_strength = CARRY_STRENGTH_BASELINE /// carry penalty modifier @@ -23,10 +20,6 @@ /// carry weight bias - multipled to carry_bias for carry weight only, not encumbrance var/carry_weight_bias = 1 -/datum/global_physiology/Destroy() - ownership = null - return ..() - /datum/global_physiology/proc/reset() carry_strength = initial(carry_strength) carry_factor = initial(carry_factor) @@ -34,6 +27,7 @@ carry_weight_factor = initial(carry_weight_factor) carry_bias = initial(carry_bias) carry_weight_bias = initial(carry_weight_bias) + return TRUE /datum/global_physiology/proc/apply(datum/physiology_modifier/modifier) if(!isnull(modifier.carry_strength_add)) @@ -67,39 +61,16 @@ if(!isnull(modifier.carry_weight_bias)) carry_weight_bias /= modifier.carry_weight_bias -/datum/global_physiology/vv_edit_var(var_name, var_value, mass_edit, raw_edit) - // we automatically hook varedits and change the admin varedit holder so rebuilds take it into account - // this is not necessarily the best of ideas, - // because things like multiplicative factors don't scale as admins usually would expect - // but having this is better than not having it, as otherwise things would silently be wiped. - if(raw_edit) - return ..() - if(isnull(ownership)) - return ..() - var/datum/physiology_modifier/varedit/varedit_modifier = ownership.get_varedit_physiology_modifier() - switch(var_name) - if(NAMEOF(src, carry_strength)) - if(!isnum(var_value)) - if(!mass_edit) - to_chat(usr, SPAN_WARNING("Invalid value [var_value] for [var_name] physiology edit rejected.")) - return FALSE - . = ..() - if(!.) - return - varedit_modifier.carry_strength_add = var_value - carry_strength - if(NAMEOF(src, carry_factor)) - if(!isnum(var_value)) - if(!mass_edit) - to_chat(usr, SPAN_WARNING("Invalid value [var_value] for [var_name] physiology edit rejected.")) - return FALSE - . = ..() - if(!.) - return - varedit_modifier.carry_strength_factor = var_value / carry_factor - else - return ..() - if(!mass_edit) - to_chat(usr, SPAN_NOTICE("Committing change to [var_name] on [ownership] ([REF(ownership)]) to physiology modifiers automatically.")) +/datum/local_physiology + +/datum/local_physiology/proc/reset() + return TRUE + +/datum/local_physiology/proc/apply(datum/physiology_modifier/modifier) + return TRUE + +/datum/local_physiology/proc/revert(datum/physiology_modifier/modifier) + return TRUE /** * physiology modifier @@ -111,10 +82,12 @@ var/name = "Some Modifier" /// is this a globally cached modifier? var/is_globally_cached = FALSE + /// biologies this applies to, for limb-specific modifiers + var/biology_types = BIOLOGY_TYPES_ALL - // todo: on biologies update, we need to specify what biologies this applies to + //* -- global modifiers -- *// - //? global modifiers + //* carry strength / weight *// var/carry_strength_add = 0 var/carry_strength_factor = 1 var/carry_strength_bias = 1 @@ -146,7 +119,7 @@ if(isnum(data["carry_weight_factor"])) carry_weight_factor = data["carry_weight_factor"] if(isnum(data["carry_weight_bias"])) - carry_weight_bias = data["carry_Weight_bias"] + carry_weight_bias = data["carry_weight_bias"] /** * subtype for hardcoded physiology modifiers @@ -194,6 +167,7 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) ASSERT(!(modifier in physiology_modifiers)) LAZYADD(physiology_modifiers, modifier) physiology.apply(modifier) + return TRUE /** * removes a modifier from physiology @@ -208,13 +182,13 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) if(!physiology.revert(modifier)) // todo: optimize with reset(). rebuild_physiology() + return TRUE /** * completely rebuilds physiology from our modifiers */ /mob/proc/rebuild_physiology() physiology = new - physiology.ownership = src for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) if(!istype(modifier)) physiology_modifiers -= modifier @@ -232,36 +206,13 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) if(href_list[VV_HK_ADD_PHYSIOLOGY_MODIFIER]) // todo: this should be able to be done globally via admin panel and then added to mobs - var/datum/tgui_dynamic_query/query = new - query.string("name", "Name", "Name your modifier.", 64, FALSE, "Custom Modifier") - query.number("carry_strength_add", "Carry Strength - Add", "Modify the person's base carry strength. Higher is better.", default = 0) - query.number("carry_strength_factor", "Carry Factor - Multiply", "Multiply the person's carry weight/encumbrance to slowdown effect when carrying over their limit. Lower is better.", default = 1) - query.number("carry_strength_bias", "Carry Bias - Multiply", "Multiply the person's carry weight/encumbrance to slowdown bias when carrying over their limit. Lower is better.", default = 1) - query.number("carry_weight_add", "Carry Weight - Add", "Modify the person's base carry weight. Higher is better. This only applies to weight, not encumbrance.", default = 0) - query.number("carry_weight_factor", "Carry Weight - Multiply", "Multiply the person's weight to slowdown effect when carrying over their limit. Lower is better. This only applies to weight, not encumbrance.", default = 1) - query.number("carry_weight_bias", "Carry Weight - Bias", "Multiply the person's weight to slowdown calculation bias; lower is better.", default = 1) - - var/list/choices = tgui_dynamic_input(usr, "Add a physiology modifier", "Add Physiology Modifier", query) + var/datum/physiology_modifier/modifier = ask_admin_for_a_physiology_modifier(usr) - if(isnull(choices)) + if(isnull(modifier)) return if(QDELETED(src)) return - var/datum/physiology_modifier/modifier = new - - // we manually deserialize because we might have custom datatypes - // in the future that won't be serialized by the ui necessarily in the same way - // we would serialize it via json. - - modifier.name = choices["name"] - modifier.carry_strength_add = choices["carry_strength_add"] - modifier.carry_strength_factor = choices["carry_strength_factor"] - modifier.carry_strength_bias = choices["carry_strength_bias"] - modifier.carry_weight_add = choices["carry_weight_add"] - modifier.carry_weight_factor = choices["carry_weight_factor"] - modifier.carry_weight_bias = choices["carry_weight_bias"] - log_admin("[key_name(usr)] --> [key_name(src)] - added physiology modifier [json_encode(modifier.serialize())]") add_physiology_modifier(modifier) return TRUE @@ -279,11 +230,44 @@ GLOBAL_LIST_EMPTY(cached_physiology_modifiers) remove_physiology_modifier(removing) return TRUE -/mob/proc/get_varedit_physiology_modifier() - RETURN_TYPE(/datum/physiology_modifier) - . = locate(/datum/physiology_modifier/varedit) in physiology_modifiers - if(!isnull(.)) +// i'm not going to fucking support vv without automated backreferences and macros, holy shit. +// /mob/proc/get_varedit_physiology_modifier() +// RETURN_TYPE(/datum/physiology_modifier) +// . = locate(/datum/physiology_modifier/varedit) in physiology_modifiers +// if(!isnull(.)) +// return +// var/datum/physiology_modifier/varedit/new_holder = new +// add_physiology_modifier(new_holder) +// return new_holder + +// todo: you can tell from the proc name that this needs to be kicked somewhere eles later. +/proc/ask_admin_for_a_physiology_modifier(mob/user) + var/datum/tgui_dynamic_query/query = new + query.string("name", "Name", "Name your modifier.", 64, FALSE, "Custom Modifier") + query.number("carry_strength_add", "Carry Strength - Add", "Modify the person's base carry strength. Higher is better.", default = 0) + query.number("carry_strength_factor", "Carry Factor - Multiply", "Multiply the person's carry weight/encumbrance to slowdown effect when carrying over their limit. Lower is better.", default = 1) + query.number("carry_strength_bias", "Carry Bias - Multiply", "Multiply the person's carry weight/encumbrance to slowdown bias when carrying over their limit. Lower is better.", default = 1) + query.number("carry_weight_add", "Carry Weight - Add", "Modify the person's base carry weight. Higher is better. This only applies to weight, not encumbrance.", default = 0) + query.number("carry_weight_factor", "Carry Weight - Multiply", "Multiply the person's weight to slowdown effect when carrying over their limit. Lower is better. This only applies to weight, not encumbrance.", default = 1) + query.number("carry_weight_bias", "Carry Weight - Bias", "Multiply the person's weight to slowdown calculation bias; lower is better.", default = 1) + + var/list/choices = tgui_dynamic_input(user, "Add a physiology modifier", "Add Physiology Modifier", query) + + if(isnull(choices)) return - var/datum/physiology_modifier/varedit/new_holder = new - add_physiology_modifier(new_holder) - return new_holder + + var/datum/physiology_modifier/modifier = new + + // we manually deserialize because we might have custom datatypes + // in the future that won't be serialized by the ui necessarily in the same way + // we would serialize it via json. + + modifier.name = choices["name"] + modifier.carry_strength_add = choices["carry_strength_add"] + modifier.carry_strength_factor = choices["carry_strength_factor"] + modifier.carry_strength_bias = choices["carry_strength_bias"] + modifier.carry_weight_add = choices["carry_weight_add"] + modifier.carry_weight_factor = choices["carry_weight_factor"] + modifier.carry_weight_bias = choices["carry_weight_bias"] + + return modifier diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index 8affd68528..2ae564ead1 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -33,7 +33,7 @@ ui.set_autoupdate(TRUE) ui.open() -/obj/item/modular_computer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/modular_computer/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["login"] = list() @@ -76,7 +76,7 @@ return data // Handles user's GUI input -/obj/item/modular_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/modular_computer/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 3e0b98ee80..ff1c41b2f6 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -167,9 +167,13 @@ ui = SStgui.try_update_ui(user, src, ui) if(!ui && tgui_id) ui = new(user, src, tgui_id, filedesc) + ui_pre_open(ui) ui.open() return 1 +/datum/computer_file/program/proc/ui_pre_open(datum/tgui/ui) + return + // CONVENTIONS, READ THIS WHEN CREATING NEW PROGRAM AND OVERRIDING THIS PROC: // Topic calls are automagically forwarded from NanoModule this program contains. // Calls beginning with "PRG_" are reserved for programs handling. @@ -186,7 +190,7 @@ // Calls beginning with "PRG_" are reserved for programs handling. // Calls beginning with "PC_" are reserved for computer handling (by whatever runs the program) // ALWAYS INCLUDE PARENT CALL ..() OR DIE IN FIRE. -/datum/computer_file/program/ui_act(action,list/params, datum/tgui/ui) +/datum/computer_file/program/ui_act(action, list/params, datum/tgui/ui) if(..()) return 1 if(computer) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm index 959ee3ee21..e4312cdb15 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm @@ -77,7 +77,7 @@ ntnet_global.intrusion_detection_alarm = TRUE return TRUE -/datum/computer_file/program/access_decrypter/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/access_decrypter/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global) return var/list/data = get_header_data() diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm index a329f18346..3d61fe057e 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm @@ -40,7 +40,7 @@ ..(forced) -/datum/computer_file/program/ntnet_dos/ui_data(mob/user) +/datum/computer_file/program/ntnet_dos/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global) return @@ -62,7 +62,7 @@ return data -/datum/computer_file/program/ntnet_dos/ui_act(action, params) +/datum/computer_file/program/ntnet_dos/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 595c79f6cf..b9d379f2cd 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -37,7 +37,7 @@ if(computer.tesla_link && prob(50)) qdel(computer.tesla_link) -/datum/computer_file/program/revelation/ui_act(action, params) +/datum/computer_file/program/revelation/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) @@ -59,7 +59,7 @@ temp.armed = armed return temp -/datum/computer_file/program/revelation/ui_data(mob/user) +/datum/computer_file/program/revelation/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["armed"] = armed diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 3036fab9d8..78f9e82325 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -18,21 +18,17 @@ . = ..() QDEL_NULL(tgui_cardmod) -/datum/computer_file/program/card_mod/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/card_mod/ui_static_data(mob/user, datum/tgui/ui) . = get_header_data() -/datum/computer_file/program/card_mod/ui_module_route(action, list/params, datum/tgui/ui, id) - . = ..() - if(.) - return - switch(id) - if("modify") - return tgui_cardmod.ui_act(action, params, ui) - -/datum/computer_file/program/card_mod/ui_module_data(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.data(user, computer.card_slot.stored_card, user.GetIdCard()) +/datum/computer_file/program/card_mod/ui_route(action, list/params, datum/tgui/ui, id) + . = ..() + if(.) + return + switch(id) + if("modify") + return tgui_cardmod.ui_act(action, params, ui) -/datum/computer_file/program/card_mod/ui_module_static(mob/user, datum/tgui/ui, datum/ui_state/state) - . = ..() - .["modify"] = tgui_cardmod.static_data(user, computer.card_slot.stored_card, user.GetIdCard()) +/datum/computer_file/program/card_mod/ui_pre_open(datum/tgui/ui) + ui.register_module(tgui_cardmod, "modify") + return ..() diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index 034bf6a6f8..4d57821797 100644 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -140,7 +140,7 @@ HDD.store_file(C) return TRUE -/datum/computer_file/program/filemanager/ui_data(mob/user) +/datum/computer_file/program/filemanager/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index fa7bba9c1e..5fe42f33b9 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -90,7 +90,7 @@ /** * This provides all of the relevant data to the UI in a list(). */ -/datum/computer_file/program/game/ui_data(mob/user) +/datum/computer_file/program/game/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["Hitpoints"] = boss_hp data["PlayerHitpoints"] = player_hp @@ -105,7 +105,7 @@ /** * This is tgui's replacement for Topic(). It handles any user input from the UI. */ -/datum/computer_file/program/game/ui_act(action, list/params) +/datum/computer_file/program/game/ui_act(action, list/params, datum/tgui/ui) if(..()) // Always call parent in ui_act, it handles making sure the user is allowed to interact with the UI. return TRUE diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index 4e8f4c3ad9..efdaa3569f 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -36,7 +36,7 @@ requires_ntnet = 0 // Turn off NTNet requirement as we already loaded the file into local memory. SStgui.update_uis(src) -/datum/computer_file/program/newsbrowser/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/newsbrowser/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() var/list/all_articles = list() diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm index 310a7a7bce..139b1896f0 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm @@ -105,7 +105,7 @@ download_netspeed = NTNETSPEED_ETHERNET download_completion += download_netspeed -/datum/computer_file/program/ntnetdownload/ui_act(action, params) +/datum/computer_file/program/ntnetdownload/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) @@ -127,7 +127,7 @@ return TRUE return FALSE -/datum/computer_file/program/ntnetdownload/ui_data(mob/user) +/datum/computer_file/program/ntnetdownload/ui_data(mob/user, datum/tgui/ui) my_computer = computer if(!istype(my_computer)) return diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index 23374990a5..30629e870a 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -24,7 +24,7 @@ username = "DefaultUser[rand(100, 999)]" ntnet = ntnet_global -/datum/computer_file/program/chatclient/ui_act(action, params) +/datum/computer_file/program/chatclient/ui_act(action, list/params, datum/tgui/ui) if(..()) return @@ -170,12 +170,12 @@ channel.remove_client(src) ..() -/datum/computer_file/program/chatclient/ui_static_data(mob/user) +/datum/computer_file/program/chatclient/ui_static_data(mob/user, datum/tgui/ui) var/list/data = list() data["can_admin"] = can_run(user, FALSE, ACCESS_NETWORK) return data -/datum/computer_file/program/chatclient/ui_data(mob/user) +/datum/computer_file/program/chatclient/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global || !ntnet_global.chat_channels) return list() diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm index b5fff1167e..4d2cccd12c 100644 --- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm +++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm @@ -75,7 +75,7 @@ var/global/nttransfer_uid = 0 remote = null download_completion = 0 -/datum/computer_file/program/nttransfer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/nttransfer/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["error"] = error diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 0170a4dd30..a98dbac94e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -182,7 +182,7 @@ return TRUE return TRUE -/datum/computer_file/program/wordprocessor/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/wordprocessor/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm index 40d58b1ec7..16c8ef1187 100644 --- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm +++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm @@ -15,7 +15,7 @@ var/datum/computer_file/data/email_message/current_message = null var/error = "" -/datum/computer_file/program/email_administration/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/email_administration/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["error"] = error diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm index cd734a9c4b..1979a8d625 100644 --- a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm @@ -11,7 +11,7 @@ available_on_ntnet = TRUE tgui_id = "NtosNetMonitor" -/datum/computer_file/program/ntnetmonitor/ui_data(mob/user) +/datum/computer_file/program/ntnetmonitor/ui_data(mob/user, datum/tgui/ui) if(!ntnet_global) return var/list/data = get_header_data() @@ -38,7 +38,7 @@ return data -/datum/computer_file/program/ntnetmonitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/ntnetmonitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) @@ -60,7 +60,7 @@ return TRUE var/response = alert(usr, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No") - if(response == "Yes" && ui_status(usr, state) == UI_INTERACTIVE) + if(response == "Yes" && ui?.still_interactive()) ntnet_global.setting_disabled = TRUE return TRUE if("purgelogs") @@ -81,13 +81,13 @@ if(!ntnet_global) return var/nid = input(usr,"Enter NID of device which you want to block from the network:", "Enter NID") as null|num - if(nid && ui_status(usr, state) == UI_INTERACTIVE) + if(nid && ui?.still_interactive()) ntnet_global.banned_nids |= nid return TRUE if("unban_nid") if(!ntnet_global) return var/nid = input(usr,"Enter NID of device which you want to unblock from the network:", "Enter NID") as null|num - if(nid && ui_status(usr, state) == UI_INTERACTIVE) + if(nid && ui?.still_interactive()) ntnet_global.banned_nids -= nid return TRUE diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index 1b2c0edd1f..a9d70ef27d 100644 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -25,7 +25,7 @@ var/global/warrant_uid = 0 var/datum/data/record/warrant/activewarrant -/datum/computer_file/program/digitalwarrant/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/digitalwarrant/ui_data(mob/user, datum/tgui/ui) var/list/data = get_header_data() data["warrantname"] = null @@ -52,7 +52,7 @@ var/global/warrant_uid = 0 return data -/datum/computer_file/program/digitalwarrant/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/datum/computer_file/program/digitalwarrant/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -81,7 +81,7 @@ var/global/warrant_uid = 0 . = TRUE var/datum/data/record/warrant/W = new() var/temp = sanitize(input(usr, "Do you want to create a search-, or an arrest warrant?") as null|anything in list("search","arrest")) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if(temp == "arrest") W.fields["namewarrant"] = "Unknown" W.fields["charges"] = "No charges present" @@ -110,7 +110,7 @@ var/global/warrant_uid = 0 for(var/datum/data/record/t in data_core.general) namelist += t.fields["name"] var/new_name = sanitize(input(usr, "Please input name") as null|anything in namelist) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if (!new_name) return activewarrant.fields["namewarrant"] = new_name @@ -118,7 +118,7 @@ var/global/warrant_uid = 0 if("editwarrantnamecustom") . = TRUE var/new_name = sanitize(input("Please input name") as null|text) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if (!new_name) return activewarrant.fields["namewarrant"] = new_name @@ -126,7 +126,7 @@ var/global/warrant_uid = 0 if("editwarrantcharges") . = TRUE var/new_charges = sanitize(input("Please input charges", "Charges", activewarrant.fields["charges"]) as null|text) - if(ui_status(usr, state) == UI_INTERACTIVE) + if(ui?.still_interactive()) if (!new_charges) return activewarrant.fields["charges"] = new_charges diff --git a/code/modules/nanites/chamber_control.dm b/code/modules/nanites/chamber_control.dm index e1615a48a5..8a76664cfa 100644 --- a/code/modules/nanites/chamber_control.dm +++ b/code/modules/nanites/chamber_control.dm @@ -73,7 +73,7 @@ linked.try_refresh_protean(usr) return TRUE -/obj/machinery/computer/nanite_chamber/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/nanite_chamber/ui_data(mob/user, datum/tgui/ui) . = ..() if(isnull(linked)) return @@ -81,7 +81,7 @@ .["locked"] = linked.locked .["operating"] = linked.operating -/obj/machinery/computer/nanite_chamber/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/nanite_chamber/ui_static_data(mob/user, datum/tgui/ui) . = ..() if(isnull(linked)) .["hasChamber"] = FALSE diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 43bed334a4..a505448584 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -35,7 +35,7 @@ /// The layout key for this ui (this is used on the frontend, leave it as "default" unless you know what you're doing) var/layout_key = "default" /// Optional layout key for additional ui header content to include - var/layout_header_key = "default_header" + // var/layout_header_key = "default_header" /// This sets whether to re-render the ui layout with each update (default 0, turning on will break the map ui if it's in use) var/auto_update_layout = FALSE /// This sets whether to re-render the ui content with each update (default 1) @@ -342,8 +342,8 @@ // before the UI opens, add the layout files based on the layout key add_stylesheet("layout_[layout_key].css") add_template("layout", "layout_[layout_key].tmpl") - if (layout_header_key) - add_template("layoutHeader", "layout_[layout_header_key].tmpl") + // if (layout_header_key) + // add_template("layoutHeader", "layout_[layout_header_key].tmpl") var/head_content = "" @@ -445,7 +445,7 @@ */ /datum/nanoui/proc/close() is_auto_updating = 0 - SSnanoui.ui_closed(src) + SSnanoui.on_ui_closed(src) user << browse(null, "window=[window_id]") for(var/datum/nanoui/child in children) child.close() diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm index 882c5a88e7..ad09f0c653 100644 --- a/code/modules/nifsoft/nif_tgui.dm +++ b/code/modules/nifsoft/nif_tgui.dm @@ -96,7 +96,7 @@ /** * The NIF State ensures that only our authorized implanted user can touch us. */ -/obj/item/nif/ui_state(mob/user, datum/tgui_module/module) +/obj/item/nif/ui_state() return GLOB.ui_nif_main_state /** @@ -112,7 +112,7 @@ * ui_data gives the UI any relevant data it needs. * In our case, that's basically everything from our statpanel. */ -/obj/item/nif/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/nif/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["theme"] = save_data["ui_theme"] diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index b3dc7a2d10..86c87cb8c3 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -175,7 +175,7 @@ if(!active) return null var/datum/gas_mixture/breath = new(BREATH_VOLUME) - breath.adjust_gas(/datum/gas/oxygen, BREATH_MOLES) + breath.adjust_gas(GAS_ID_OXYGEN, BREATH_MOLES) breath.temperature = T20C return breath /* diff --git a/code/modules/organs/external/external.dm b/code/modules/organs/external/external.dm index e09e6c6820..83d45f3801 100644 --- a/code/modules/organs/external/external.dm +++ b/code/modules/organs/external/external.dm @@ -6,11 +6,22 @@ organ_tag = "limb" decays = FALSE - //? Coverage + //* Coverage *// /// body_cover_flags that count as covering us var/body_part_flags = NONE - //? Wounds + //* Damage + /// https://www.desmos.com/calculator/eyn1lj5gq7 + /// intensifier value used for inverse-damage softcap + var/damage_softcap_intensifier = 0 + + //* Physiology *// + /// local physiology holder + var/datum/local_physiology/physiology + /// local-ized physiology modifiers - these are always on us, even when we are mob-less + var/list/datum/physiology_modifier/physiology_modifiers + + //* Wounds *// /// Wound datum list. var/list/wounds /// Number of wounds we have - some wounds like bruises will collate into one datum representing all of them. @@ -134,6 +145,7 @@ var/syringe_infection_queued /obj/item/organ/external/Initialize(mapload) + init_local_physiology() . = ..(mapload, FALSE) if(istype(owner)) replaced(owner) @@ -183,7 +195,10 @@ burn_damage += rand(2, 6) if(burn_damage) - take_damage(0, burn_damage * emp_mod) + inflict_bodypart_damage( + burn = burn_damage * emp_mod, + weapon_descriptor = "electromagnetic overload", + ) /obj/item/organ/external/attack_self(mob/user) . = ..() @@ -201,7 +216,7 @@ removable_objects |= I if(removable_objects.len) var/obj/item/I = pick(removable_objects) - I.loc = get_turf(user) //just in case something was embedded that is not an item + I.forceMove(get_turf(user)) //just in case something was embedded that is not an item if(istype(I)) user.put_in_hands(I) user.visible_message("\The [user] rips \the [I] out of \the [src]!") @@ -233,7 +248,7 @@ if(istype(W,/obj/item/surgical/hemostat)) if(contents.len) var/obj/item/removing = pick(contents) - removing.loc = get_turf(user.loc) + removing.forceMove(get_turf(user.loc)) user.put_in_hands(removing) user.visible_message("[user] extracts [removing] from [src] with [W]!") else @@ -285,6 +300,12 @@ /obj/item/organ/external/replaced(var/mob/living/carbon/human/target) owner = target forceMove(owner) + + // todo: removed() is not necessarily reliable. + for(var/datum/physiology_modifier/modifier as anything in owner.physiology_modifiers) + // todo: check biology + physiology.apply(modifier) + if(istype(owner)) owner.organs_by_name[organ_tag] = src owner.organs |= src @@ -304,18 +325,41 @@ DAMAGE PROCS ****************************************************/ -/obj/item/organ/external/proc/is_damageable(var/additional_damage = 0) - //Continued damage to vital organs can kill you, and robot organs don't count towards total damage so no need to cap them. - return (vital || (robotic >= ORGAN_ROBOT) || brute_dam + burn_dam + additional_damage < max_damage) +/obj/item/organ/external/proc/is_damageable(check_damage_cap) + // todo: rework + if(check_damage_cap) + //Continued damage to vital organs can kill you, and robot organs don't count towards total damage so no need to cap them. + // todo: this is absolutely fucking stupid, rework asap. + if(vital || (robotic >= ORGAN_ROBOT) || brute_dam + burn_dam < max_damage) + return TRUE + return FALSE + return TRUE -/obj/item/organ/external/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list(), permutation = 0) +/** + * process incoming damage + * + * @params + * * brute - brute damage to take + * * burn - burn damage to take + * * damage_mode - DAMAG_EMODE_* flags for the form of this damage + * * weapon descriptor - a string describing how it happened ("flash burns", "multiple precision cuts", etc) + * * defer_host_updates - update health / perform damage checks? this is only for owner updates, not self updates!! + */ +/obj/item/organ/external/proc/inflict_bodypart_damage(brute, burn, damage_mode, weapon_descriptor, defer_host_updates) + // todo: get rid of this shit, should be physiology + // legacy: brute/burnmod brute = round(brute * brute_mod, 0.1) burn = round(burn * burn_mod, 0.1) - if((brute <= 0) && (burn <= 0)) + if(!brute && !burn) return 0 - // High brute damage or sharp objects may damage internal organs + // todo: this is awful + var/sharp = damage_mode & DAMAGE_MODE_SHARP + var/edge = damage_mode & DAMAGE_MODE_EDGE + + // todo: lol this is shit + // legacy: organ damage on high damage if(internal_organs && (brute_dam >= max_damage || (((sharp && brute >= 5) || brute >= 10) && prob(5)))) // Damage an internal organ if(internal_organs && internal_organs.len) @@ -323,22 +367,28 @@ brute *= 0.5 I.take_damage(brute) - if(status & ORGAN_BROKEN && brute) + // todo: lol this is shit + // legacy: jostle if broken + if(is_broken() && brute && !(damage_mode & DAMAGE_MODE_GRADUAL)) jostle_bone(brute) - if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper)) + if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && prob(40)) owner.emote("scream") //getting hit on broken hand hurts - if(used_weapon) - add_autopsy_data("[used_weapon]", brute + burn) + + // todo: optimization + // legacy: autopsy data + if(weapon_descriptor) + add_autopsy_data(weapon_descriptor, brute + burn) + + //! LEGACY BELOW var/can_cut = (sharp) && (robotic < ORGAN_ROBOT) // If the limbs can break, make sure we don't exceed the maximum damage a limb can take before breaking // Non-vital organs are limited to max_damage. You can't kill someone by bludeonging their arm all the way to 200 -- you can // push them faster into paincrit though, as the additional damage is converted into shock. - var/brute_overflow = 0 - var/burn_overflow = 0 - if(is_damageable(brute + burn) || !config_legacy.limbs_can_break) - if(brute) + if(brute) + var/can_inflict_brute = max(0, max_damage - brute_dam) + if(can_inflict_brute >= brute) if(can_cut) if(sharp && !edge) create_wound( PIERCE, brute ) @@ -346,90 +396,91 @@ create_wound( CUT, brute ) else create_wound( BRUISE, brute ) - if(burn) - create_wound( BURN, burn ) - else - //If we can't inflict the full amount of damage, spread the damage in other ways - //How much damage can we actually cause? - var/can_inflict = max_damage * config_legacy.organ_health_multiplier - (brute_dam + burn_dam) - var/spillover = 0 - if(can_inflict >= 0) - if (brute > 0) - //Inflict all burte damage we can - if(can_cut) - if(sharp && !edge) - create_wound( PIERCE, min(brute,can_inflict) ) - else - create_wound( CUT, min(brute,can_inflict) ) + else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) + var/overflow_brute = brute - can_inflict_brute + // keep allowing it, but, diminishing returns + var/damage_anyways_brute = brute * min(1, 1 / ((brute_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) + if(can_cut) + if(sharp && !edge) + create_wound( PIERCE, damage_anyways_brute ) else - create_wound( BRUISE, min(brute,can_inflict) ) - //How much more damage can we inflict - brute_overflow = max(0, brute - can_inflict) - //How much brute damage is left to inflict - spillover += max(0, brute - can_inflict) - - can_inflict = max_damage * config_legacy.organ_health_multiplier - (brute_dam + burn_dam) //Refresh the can_inflict var, so burn doesn't overload the limb if it is set to take both. - - if (burn > 0 && can_inflict) - //Inflict all burn damage we can - create_wound(BURN, min(burn,can_inflict)) - //How much burn damage is left to inflict - burn_overflow = max(0, burn - can_inflict) - spillover += burn_overflow - - //If there is pain to dispense. - if(spillover) - owner.shock_stage += spillover * config_legacy.organ_damage_spillover_multiplier + create_wound( CUT, damage_anyways_brute ) + else + create_wound( BRUISE, damage_anyways_brute ) + // rest goes into shock + owner.shock_stage += overflow_brute * 0.33 + if(burn) + var/can_inflict_burn = max(0, max_damage - burn_dam) + if(can_inflict_burn >= burn) + create_wound( BURN, burn ) + else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) + var/overflow_burn = burn - can_inflict_burn + // keep allowing it, but, diminishing returns + var/damage_anyways_burn = burn * min(1, 1 / ((burn_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) + create_wound( BURN, damage_anyways_burn ) + // rest goes into shock + owner.shock_stage += overflow_burn * 0.33 // sync the organ's damage with its wounds - src.update_damages() - if(owner) - owner.update_health() //droplimb will call update_health() again if it does end up being called + update_damages() + + // break it if needed + // todo: shit code lmao + if(brute_dam > min_broken_damage && prob((brute * ((brute_dam - min_broken_damage) / min_broken_damage)) * 2)) + fracture() //If limb took enough damage, try to cut or tear it off - if(owner && loc == owner && !is_stump()) - if(!cannot_amputate && config_legacy.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config_legacy.organ_health_multiplier)) - //organs can come off in three cases - //1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off. - //2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated. - //3. If the organ has already reached or would be put over it's max damage amount (currently redundant), - // and the brute damage dealt exceeds the tearoff threshold, the organ is torn off. - - //Check edge eligibility - var/edge_eligible = 0 - if(edge) - if(istype(used_weapon,/obj/item)) - var/obj/item/W = used_weapon - if(W.w_class >= w_class) - edge_eligible = 1 - else - edge_eligible = 1 - - if(nonsolid && damage >= max_damage) - droplimb(TRUE, DROPLIMB_EDGE) - else if (robotic >= ORGAN_NANOFORM && damage >= max_damage) - droplimb(TRUE, DROPLIMB_BURN) - else if(edge_eligible && brute >= max_damage / DROPLIMB_THRESHOLD_EDGE && prob(brute)) - droplimb(0, DROPLIMB_EDGE) - else if((burn >= max_damage / DROPLIMB_THRESHOLD_DESTROY) && prob(burn*0.33)) - droplimb(0, DROPLIMB_BURN) - else if((brute >= max_damage / DROPLIMB_THRESHOLD_DESTROY && prob(brute))) - droplimb(0, DROPLIMB_BLUNT) - else if(brute >= max_damage / DROPLIMB_THRESHOLD_TEAROFF && prob(brute*0.33)) - droplimb(0, DROPLIMB_EDGE) - else if(spread_dam && owner && parent && (brute_overflow || burn_overflow) && (brute_overflow >= 5 || burn_overflow >= 5) && !permutation) //No infinite damage loops. - var/brute_third = brute_overflow * 0.33 - var/burn_third = burn_overflow * 0.33 - if(children && children.len) - var/brute_on_children = brute_third / children.len - var/burn_on_children = burn_third / children.len - spawn() - for(var/obj/item/organ/external/C in children) - if(!C.is_stump()) - C.take_damage(brute_on_children, burn_on_children, 0, 0, null, forbidden_limbs, 1) //Splits the damage to each individual 'child', incase multiple exist. - parent.take_damage(brute_third, burn_third, 0, 0, null, forbidden_limbs, 1) - - return update_icon() + if(!(damage_mode & DAMAGE_MODE_GRADUAL) && !is_stump() && !cannot_amputate && ((brute_dam > max_damage) || (burn_dam > max_damage))) + //organs can come off in three cases + //1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off. + //2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated. + //3. If the organ has already reached or would be put over it's max damage amount (currently redundant), + // and the brute damage dealt exceeds the tearoff threshold, the organ is torn off. + + //Check edge eligibility + //! edge eligibility disabled; organs should optimally not reqiure the item reference and should instead + //! get descriptors (damage, damage mode, etc) of the inbound attack. + var/edge_eligible = edge + // var/edge_eligible = 0 + // if(edge) + // if(istype(used_weapon,/obj/item)) + // var/obj/item/W = used_weapon + // if(W.w_class >= w_class) + // edge_eligible = 1 + // else + // edge_eligible = 1 + + if(nonsolid && damage >= max_damage) + droplimb(TRUE, DROPLIMB_EDGE) + else if (robotic >= ORGAN_NANOFORM && damage >= max_damage) + droplimb(TRUE, DROPLIMB_BURN) + else if(edge_eligible && brute >= max_damage / DROPLIMB_THRESHOLD_EDGE && prob(brute)) + droplimb(0, DROPLIMB_EDGE) + else if((burn >= max_damage / DROPLIMB_THRESHOLD_DESTROY) && prob(burn*0.33)) + droplimb(0, DROPLIMB_BURN) + else if((brute >= max_damage / DROPLIMB_THRESHOLD_DESTROY && prob(brute))) + droplimb(0, DROPLIMB_BLUNT) + else if(brute >= max_damage / DROPLIMB_THRESHOLD_TEAROFF && prob(brute*0.33)) + droplimb(0, DROPLIMB_EDGE) + //! damage spreading disabled; the attacking weapon should handle this if necessary. + // else if(spread_dam && owner && parent && (brute_overflow || burn_overflow) && (brute_overflow >= 5 || burn_overflow >= 5) && !permutation) //No infinite damage loops. + // var/brute_third = brute_overflow * 0.33 + // var/burn_third = burn_overflow * 0.33 + // if(children && children.len) + // var/brute_on_children = brute_third / children.len + // var/burn_on_children = burn_third / children.len + // spawn() + // for(var/obj/item/organ/external/C in children) + // if(!C.is_stump()) + // C.take_damage(brute_on_children, burn_on_children, 0, 0, null, forbidden_limbs, 1) //Splits the damage to each individual 'child', incase multiple exist. + // parent.take_damage(brute_third, burn_third, 0, 0, null, forbidden_limbs, 1) + + //! LEGACY ABOVE + + if(!defer_host_updates) + owner?.update_health() + + update_icon() /obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0) if(robotic >= ORGAN_ROBOT && !robo_repair) @@ -537,7 +588,7 @@ // remove embedded objects and drop them on the floor for(var/obj/implanted_object in implants) if(!istype(implanted_object,/obj/item/implant) && !istype(implanted_object,/obj/item/nif)) // We don't want to remove REAL implants. Just shrapnel etc. - implanted_object.loc = get_turf(src) + implanted_object.forceMove(get_turf(src)) implants -= implanted_object if(owner && !ignore_prosthetic_prefs) @@ -754,8 +805,7 @@ Note that amputating the affected organ does in fact remove the infection from t if (W.can_autoheal() && W.wound_damage() < 50) heal_amt += 0.5 - //configurable regen speed woo, no-regen hardcore or instaheal hugbox, choose your destiny - heal_amt = heal_amt * config_legacy.organ_regeneration_multiplier + // todo: config entry after more med refactors // amount of healing is spread over all the wounds heal_amt = heal_amt / (length(wounds) + 1) // making it look prettier on scanners @@ -804,10 +854,6 @@ Note that amputating the affected organ does in fact remove the infection from t if (open && !clamped && (H && H.should_have_organ(O_HEART))) status |= ORGAN_BLEEDING - //Bone fractures - if(config_legacy.bones_can_break && brute_dam > min_broken_damage * config_legacy.organ_health_multiplier && !(robotic >= ORGAN_ROBOT)) - src.fracture() - update_health() // new damage icon system @@ -1087,7 +1133,7 @@ Note that amputating the affected organ does in fact remove the infection from t /obj/item/organ/external/proc/mend_fracture() if(robotic >= ORGAN_ROBOT) return 0 //ORGAN_BROKEN doesn't have the same meaning for robot limbs - if(brute_dam > min_broken_damage * config_legacy.organ_health_multiplier) + if(brute_dam > min_broken_damage) return 0 //will just immediately fracture again status &= ~ORGAN_BROKEN @@ -1235,6 +1281,16 @@ Note that amputating the affected organ does in fact remove the infection from t var/is_robotic = robotic >= ORGAN_ROBOT var/mob/living/carbon/human/victim = owner + // todo: removed() is not necessarily reliable. + for(var/datum/physiology_modifier/modifier as anything in owner.physiology_modifiers) + // todo: check biology + if(!physiology.revert(modifier)) + // todo: optimize? + rebuild_physiology() + for(var/datum/physiology_modifier/rebuilding as anything in owner.physiology_modifiers) + // todo: check biology + physiology.apply(rebuilding) + ..() victim.bad_external_organs -= src @@ -1439,3 +1495,86 @@ Note that amputating the affected organ does in fact remove the infection from t for(var/obj/item/I in L.implants) if(!istype(I,/obj/item/implant) && !istype(I,/obj/item/nif)) return TRUE + +//* Environmentals *// + +// todo: limb specific + +//* Physiology *// + +/obj/item/organ/external/proc/rebuild_physiology() + physiology = new + for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) + if(!istype(modifier)) + physiology_modifiers -= modifier + continue + physiology.apply(modifier) + +/obj/item/organ/external/proc/init_local_physiology() + for(var/i in 1 to length(physiology_modifiers)) + if(ispath(physiology_modifiers[i])) + physiology_modifiers[i] = cached_physiology_modifier(physiology_modifiers[i]) + rebuild_physiology() + +/obj/item/organ/external/proc/add_local_physiology_modifier(datum/physiology_modifier/modifier) + if(ispath(modifier)) + modifier = cached_physiology_modifier(modifier) + ASSERT(!(modifier in physiology_modifiers)) + LAZYADD(physiology_modifiers, modifier) + physiology.apply(modifier) + return TRUE + +/obj/item/organ/external/proc/remove_local_physiology_modifier(datum/physiology_modifier/modifier) + if(ispath(modifier)) + modifier = cached_physiology_modifier(modifier) + ASSERT(modifier in physiology_modifiers) + LAZYREMOVE(physiology_modifiers, modifier) + if(!physiology.revert(modifier)) + // todo: optimize with reset(). + rebuild_physiology() + return TRUE + +/obj/item/organ/external/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION(null, "-----") + VV_DROPDOWN_OPTION(VV_HK_ADD_PHYSIOLOGY_MODIFIER, "Add Physiology Modifier") + VV_DROPDOWN_OPTION(VV_HK_REMOVE_PHYSIOLOGY_MODIFIER, "Remove Physiology Modifier") + +/obj/item/organ/external/vv_do_topic(list/href_list) + . = ..() + if(href_list[VV_HK_ADD_PHYSIOLOGY_MODIFIER]) + // todo: this should be able to be done globally via admin panel and then added to mobs + + var/datum/physiology_modifier/modifier = ask_admin_for_a_physiology_modifier(usr) + + if(isnull(modifier)) + return + if(QDELETED(src)) + return + + log_admin("[key_name(usr)] --> organ [ref(src)] - added physiology modifier [json_encode(modifier.serialize())]") + add_local_physiology_modifier(modifier) + return TRUE + + if(href_list[VV_HK_REMOVE_PHYSIOLOGY_MODIFIER]) + var/list/assembled = list() + var/i = 0 + for(var/datum/physiology_modifier/modifier as anything in physiology_modifiers) + assembled["[modifier.name] (#[++i])"] = modifier + var/picked = input(usr, "Which modifier to remove? Please do not do this unless you know what you are doing.", "Remove Physiology Modifier") as null|anything in assembled + var/datum/physiology_modifier/removing = assembled[picked] + if(!(removing in physiology_modifiers)) + return TRUE + log_admin("[key_name(usr)] --> organ [ref(src)] - removed physiology modifier [json_encode(removing.serialize())]") + remove_local_physiology_modifier(removing) + return TRUE + +// i'm not going to fucking support vv without automated backreferences and macros, holy shit. +// /obj/item/organ/external/proc/get_varedit_physiology_modifier() +// RETURN_TYPE(/datum/physiology_modifier) +// . = locate(/datum/physiology_modifier/varedit) in physiology_modifiers +// if(!isnull(.)) +// return +// var/datum/physiology_modifier/varedit/new_holder = new +// add_local_physiology_modifier(new_holder) +// return new_holder diff --git a/code/modules/organs/external/robolimbs.dm b/code/modules/organs/external/robolimbs.dm index 977c69ca3c..ed554bc60a 100644 --- a/code/modules/organs/external/robolimbs.dm +++ b/code/modules/organs/external/robolimbs.dm @@ -44,7 +44,16 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ uwu=cyber_uwu;\ question=cyber_question;\ lowpower=cyber_lowpower;\ - idle=cyber_idle" + idle=cyber_idle;\ + catface=cyber_catface;\ + eyes_normal=cyber_eyes_normal;\ + eyes_happy=cyber_eyes_happy;\ + eyes_sad=cyber_eyes_sad;\ + eyes_big=cyber_eyes_big;\ + confounded=cyber_confounded;\ + eyes_confounded=cyber_eyes_confounded;\ + halffrown=cyber_halffrown;\ + angry=cyber_angry" /proc/populate_robolimb_list() GLOB.basic_robolimb = new() @@ -492,6 +501,10 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ parts = list(BP_HEAD) monitor_styles = cyberbeast_monitor_styles +/datum/robolimb/cyber_beast/flat + company = "Cyber Tech (Flat)" + icon = 'icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi' + /datum/robolimb/wooden company = "Morgan Trading Co" desc = "A simplistic, metal-banded, wood-panelled prosthetic." diff --git a/code/modules/organs/internal/internal.dm b/code/modules/organs/internal/internal.dm index b06a25a3e1..1b520655d8 100644 --- a/code/modules/organs/internal/internal.dm +++ b/code/modules/organs/internal/internal.dm @@ -67,3 +67,16 @@ if(. >= 3 && antibiotics < ANTIBIO_OD) //INFECTION_LEVEL_THREE if (prob(50)) take_damage(1,silent=prob(15)) + +/obj/item/organ/internal/emp_act(severity) + if(!(robotic >= ORGAN_ASSISTED)) + return + switch (severity) + if (1) + take_damage(rand(3, 7)) + if (2) + take_damage(rand(2, 6)) + if (3) + take_damage(rand(1, 4)) + if (4) + take_damage(rand(0, 2)) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index d22c18a686..e9c8f2dc25 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -51,6 +51,7 @@ /// Damage before becoming broken var/min_broken_damage = 30 /// Damage cap + /// For external organs / bodyparts, this is actually both brute and burn separate, so, you can have for 50 max damage 50 brute and 50 burn. var/max_damage /// Can this organ reject? var/can_reject = TRUE @@ -333,19 +334,6 @@ /obj/item/organ/proc/digitize() robotize() -/obj/item/organ/emp_act(severity) - if(!(robotic >= ORGAN_ASSISTED)) - return - switch (severity) - if (1) - take_damage(rand(3, 7)) - if (2) - take_damage(rand(2, 6)) - if (3) - take_damage(rand(1, 4)) - if (4) - take_damage(rand(0, 2)) - /obj/item/organ/proc/removed(var/mob/living/user) if(owner) owner.internal_organs_by_name[organ_tag] = null diff --git a/code/modules/overmap/legacy/disperser/disperser_console.dm b/code/modules/overmap/legacy/disperser/disperser_console.dm index 838c34a776..2261dadb54 100644 --- a/code/modules/overmap/legacy/disperser/disperser_console.dm +++ b/code/modules/overmap/legacy/disperser/disperser_console.dm @@ -127,7 +127,7 @@ ui = new(user, src, "OvermapDisperser", "[linked.name] ORB control") // 400, 550 ui.open() -/obj/machinery/computer/ship/disperser/ui_data(mob/user) +/obj/machinery/computer/ship/disperser/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["faillink"] = FALSE data["calibration"] = null diff --git a/code/modules/overmap/legacy/ships/computers/engine_control.dm b/code/modules/overmap/legacy/ships/computers/engine_control.dm index 4c6b58fee7..98e3fbb4dc 100644 --- a/code/modules/overmap/legacy/ships/computers/engine_control.dm +++ b/code/modules/overmap/legacy/ships/computers/engine_control.dm @@ -23,7 +23,7 @@ ui = new(user, src, "OvermapEngines", "[linked.name] Engines Control") // 390, 530 ui.open() -/obj/machinery/computer/ship/engines/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/ship/engines/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["global_state"] = linked.engines_state data["global_limit"] = round(linked.thrust_limit*100) diff --git a/code/modules/overmap/legacy/ships/computers/helm.dm b/code/modules/overmap/legacy/ships/computers/helm.dm index c1a1c01930..cbd8d4cfaa 100644 --- a/code/modules/overmap/legacy/ships/computers/helm.dm +++ b/code/modules/overmap/legacy/ships/computers/helm.dm @@ -95,7 +95,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) ui = new(user, src, "OvermapHelm", "[linked.name] Helm Control") // 565, 545 ui.open() -/obj/machinery/computer/ship/helm/ui_data(mob/user) +/obj/machinery/computer/ship/helm/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/turf/T = get_turf(linked) diff --git a/code/modules/overmap/legacy/ships/computers/sensors.dm b/code/modules/overmap/legacy/ships/computers/sensors.dm index 05284c9f09..4daa1aeb0c 100644 --- a/code/modules/overmap/legacy/ships/computers/sensors.dm +++ b/code/modules/overmap/legacy/ships/computers/sensors.dm @@ -37,7 +37,7 @@ ui = new(user, src, "OvermapShipSensors", "[linked.name] Sensors Control") // 420, 530 ui.open() -/obj/machinery/computer/ship/sensors/ui_data(mob/user) +/obj/machinery/computer/ship/sensors/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["viewing"] = viewing_overmap(user) diff --git a/code/modules/overmap/legacy/ships/computers/ship.dm b/code/modules/overmap/legacy/ships/computers/ship.dm index 22a1601538..cb34713e24 100644 --- a/code/modules/overmap/legacy/ships/computers/ship.dm +++ b/code/modules/overmap/legacy/ships/computers/ship.dm @@ -101,7 +101,7 @@ /obj/machinery/computer/ship/proc/viewing_overmap(mob/user) return (WEAKREF(user) in viewers) -/obj/machinery/computer/ship/ui_status(mob/user) +/obj/machinery/computer/ship/ui_status(mob/user, datum/ui_state/state) . = ..() if(. > UI_DISABLED) if(viewing_overmap(user)) @@ -109,7 +109,7 @@ return unlook(user) -/obj/machinery/computer/ship/ui_close(mob/user, datum/tgui_module/module) +/obj/machinery/computer/ship/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() user.unset_machine() unlook(user) diff --git a/code/modules/overmap/legacy/ships/computers/shuttle.dm b/code/modules/overmap/legacy/ships/computers/shuttle.dm index 8141287349..e367340352 100644 --- a/code/modules/overmap/legacy/ships/computers/shuttle.dm +++ b/code/modules/overmap/legacy/ships/computers/shuttle.dm @@ -25,7 +25,7 @@ "fuel_span" = fuel_span ) -/obj/machinery/computer/shuttle_control/explore/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/explore/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index b934c3fc88..b9ecb5dd67 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -83,7 +83,7 @@ return to_chat(user, SPAN_NOTICE("You find nothing in [src].")) -/obj/structure/filingcabinet/ui_state(mob/user, datum/tgui_module/module) +/obj/structure/filingcabinet/ui_state() return GLOB.physical_state /obj/structure/filingcabinet/ui_interact(mob/user, datum/tgui/ui) @@ -93,7 +93,7 @@ ui.set_autoupdate(FALSE) ui.open() -/obj/structure/filingcabinet/ui_data(mob/user) +/obj/structure/filingcabinet/ui_data(mob/user, datum/tgui/ui) var/list/files = list() for(var/obj/item/P in src) files.Add(list(list( @@ -103,7 +103,7 @@ return list("contents" = files) -/obj/structure/filingcabinet/ui_act(action, params) +/obj/structure/filingcabinet/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index a6e76ca15c..fb51bba4f9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -50,190 +50,42 @@ GLOBAL_LIST_EMPTY(apcs) #define NIGHTSHIFT_ALWAYS 3 //NOTE: STUFF STOLEN FROM AIRLOCK.DM thx - -/obj/machinery/power/apc/direction_bump //For the love of god there's so many fucking var edits of the APC, use these instead pleaaaaase -Bloop - -/obj/machinery/power/apc/direction_bump/east - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/direction_bump/west - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/direction_bump/north - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/direction_bump/south - name = "south bump" - pixel_y = -28 - //Critical// +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/critical, 22) /obj/machinery/power/apc/critical is_critical = 1 -/obj/machinery/power/apc/critical/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/critical/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/critical/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/critical/south_bump - name = "south bump" - pixel_y = -28 - /// High capacity cell APCs +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/high, 22) /obj/machinery/power/apc/high cell_type = /obj/item/cell/high -/obj/machinery/power/apc/high/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/high/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/high/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/high/south_bump - name = "south bump" - pixel_y = -28 - /// Super capacity cell APCS +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/super, 22) /obj/machinery/power/apc/super cell_type = /obj/item/cell/super -/obj/machinery/power/apc/super/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/super/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/super/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/super/south_bump - name = "south bump" - pixel_y = -28 - - /// Critical APCs with super cells +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/super/critical, 22) /obj/machinery/power/apc/super/critical is_critical = 1 -/obj/machinery/power/apc/super/critical/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/super/critical/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/super/critical/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/super/critical/south_bump - name = "south bump" - pixel_y = -28 - /// APCS with hyper cells. How lewd +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/hyper, 22) /obj/machinery/power/apc/hyper cell_type = /obj/item/cell/hyper -/obj/machinery/power/apc/hyper/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 -/obj/machinery/power/apc/hyper/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/hyper/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/hyper/south_bump - name = "south bump" - pixel_y = -28 - - /// APCs with alarms hidden. Use these for POI's and offmap stuff so engineers dont get notified that shitty_ruins4 is running out of power -Bloop +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/alarms_hidden, 22) /obj/machinery/power/apc/alarms_hidden alarms_hidden = TRUE -/obj/machinery/power/apc/alarms_hidden/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/alarms_hidden/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/alarms_hidden/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/alarms_hidden/south_bump - name = "south bump" - pixel_y = -28 - /// APCS with hidden alarms and no power cells +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc/alarms_hidden/no_cell, 22) /obj/machinery/power/apc/alarms_hidden/no_cell cell_type = null chargelevel = 0 -/obj/machinery/power/apc/alarms_hidden/no_cell/east_bump - name = "east bump" - dir = 4 - pixel_x = 28 - -/obj/machinery/power/apc/alarms_hidden/no_cell/west_bump - name = "west bump" - dir = 8 - pixel_x = -28 - -/obj/machinery/power/apc/alarms_hidden/no_cell/north_bump - name = "north bump" - dir = 1 - pixel_y = 28 - -/obj/machinery/power/apc/alarms_hidden/no_cell/south_bump - name = "south bump" - pixel_y = -28 - - - /** * APCs * @@ -255,6 +107,7 @@ GLOBAL_LIST_EMPTY(apcs) * * ~silicons */ +CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22) /obj/machinery/power/apc name = "area power controller" desc = "A control terminal for the area electrical systems." @@ -365,8 +218,6 @@ GLOBAL_LIST_EMPTY(apcs) if (building) setDir(ndir) - pixel_x = (src.dir & 3)? 0 : (src.dir == 4 ? 24 : -24) - pixel_y = (src.dir & 3)? (src.dir ==1 ? 24 : -24) : 0 if(!building) autobuild() else @@ -406,14 +257,27 @@ GLOBAL_LIST_EMPTY(apcs) // APCs are pixel-shifted, so they need to be updated. /obj/machinery/power/apc/setDir(new_dir) - ..() - pixel_x = (src.dir & 3)? 0 : (src.dir == 4 ? 24 : -24) - pixel_y = (src.dir & 3)? (src.dir ==1 ? 24 : -24) : 0 + . = ..() + + base_pixel_x = 0 + base_pixel_y = 0 + var/turf/T = get_step(src, turn(dir, 180)) + if(T.get_wallmount_anchor()) + switch(dir) + if(SOUTH) + base_pixel_y = 22 + if(NORTH) + base_pixel_y = -22 + if(EAST) + base_pixel_x = -22 + if(WEST) + base_pixel_x = 22 + reset_pixel_offsets() + if(terminal) terminal.disconnect_from_network() - terminal.setDir(src.dir) // Terminal has same dir as master + terminal.setDir(turn(src.dir, 180)) // Terminal has same dir as master terminal.connect_to_network() // Refresh the network the terminal is connected to. - return /obj/machinery/power/apc/proc/energy_fail(var/duration) failure_timer = max(failure_timer, round(duration)) @@ -422,7 +286,7 @@ GLOBAL_LIST_EMPTY(apcs) // create a terminal object at the same position as original turf loc // wires will attach to this terminal = new/obj/machinery/power/terminal(src.loc) - terminal.setDir(dir) + terminal.setDir(turn(dir, 180)) terminal.master = src /obj/machinery/power/apc/proc/autobuild() @@ -568,24 +432,6 @@ GLOBAL_LIST_EMPTY(apcs) else set_light(0) -/obj/machinery/power/apc/setDir(new_dir) - . = ..() - base_pixel_x = 0 - base_pixel_y = 0 - var/turf/T = get_step(get_turf(src), dir) - if(istype(T) && T.density) - switch(dir) - if(SOUTH) - base_pixel_y = -22 - if(NORTH) - base_pixel_y = 22 - if(EAST) - base_pixel_x = 22 - if(WEST) - base_pixel_x = -22 - reset_pixel_offsets() - - /obj/machinery/power/apc/proc/check_updates() var/last_update_state = update_state @@ -1002,7 +848,7 @@ GLOBAL_LIST_EMPTY(apcs) ui = new(user, src, "APC", name) // 510, 460 ui.open() -/obj/machinery/power/apc/ui_data(mob/user) +/obj/machinery/power/apc/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "locked" = locked, "normallyLocked" = locked, @@ -1058,7 +904,7 @@ GLOBAL_LIST_EMPTY(apcs) return data -/obj/machinery/power/apc/ui_act(action, params) +/obj/machinery/power/apc/ui_act(action, list/params, datum/tgui/ui) if(..() || !can_use(usr, TRUE)) return TRUE diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index c33bf31060..328ce54071 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -255,33 +255,20 @@ return /obj/item/cell/proc/get_electrocute_damage() - switch (charge) -/* if (9000 to INFINITY) - return min(rand(90,150),rand(90,150)) - if (2500 to 9000-1) - return min(rand(70,145),rand(70,145)) - if (1750 to 2500-1) - return min(rand(35,110),rand(35,110)) - if (1500 to 1750-1) - return min(rand(30,100),rand(30,100)) - if (750 to 1500-1) - return min(rand(25,90),rand(25,90)) - if (250 to 750-1) - return min(rand(20,80),rand(20,80)) - if (100 to 250-1) - return min(rand(20,65),rand(20,65))*/ - if (1000000 to INFINITY) - return min(rand(50,160),rand(50,160)) - if (200000 to 1000000-1) - return min(rand(25,80),rand(25,80)) - if (100000 to 200000-1)//Ave powernet - return min(rand(20,60),rand(20,60)) - if (50000 to 100000-1) - return min(rand(15,40),rand(15,40)) - if (1000 to 50000-1) - return min(rand(10,20),rand(10,20)) - else - return 0 + //1kW = 5 + //10kW = 24 + //100kW = 45 + //250kW = 53 + //1MW = 66 + //10MW = 88 + //100MW = 110 + //1GW = 132 + if(charge >= 1000) + var/damage = log(1.1,charge) + damage = damage - (log(1.1,damage)*1.5) + return round(damage) + else + return 0 /obj/item/cell/suicide_act(mob/user) var/datum/gender/TU = GLOB.gender_datums[user.get_visible_gender()] diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 372564cb0d..55f00fb7aa 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(all_turbines) ui = new(user, src, "TEGenerator", name) ui.open() -/obj/machinery/power/generator/ui_data(mob/user) +/obj/machinery/power/generator/ui_data(mob/user, datum/tgui/ui) // this is the data which will be sent to the ui var/vertical = 0 if (dir == NORTH || dir == SOUTH) diff --git a/code/modules/power/geothermal_power.dm b/code/modules/power/geothermal_power.dm index b406a5b5fa..e8ffede55e 100644 --- a/code/modules/power/geothermal_power.dm +++ b/code/modules/power/geothermal_power.dm @@ -23,6 +23,14 @@ var/active_for = -1 var/power_total = 0 +/obj/machinery/power/geothermal_controller/examine(mob/user, dist) + . = ..() + if(isrobot(user) && !scanner) + . += "You can connect the controller to your internal scanning array, and allow it to temporary connect to the collectors, [src] would generate power for approximately 30 Minutes." + if(scanner) + . += "With [scanner] installed, [src] is providing [power_total/power_factor] Kilowatts." + + /obj/machinery/power/geothermal_controller/can_drain_energy(datum/actor, flags) return FALSE diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 27ec2fa4f1..d4bcc7eebf 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -251,7 +251,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) ui = new(user, src, "GravityGenerator", name) ui.open() -/obj/machinery/gravity_generator/main/ui_data(mob/user) +/obj/machinery/gravity_generator/main/ui_data(mob/user, datum/tgui/ui) var/data[0] data["breaker"] = breaker @@ -262,7 +262,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) return data -/obj/machinery/gravity_generator/main/ui_act(action, params) +/obj/machinery/gravity_generator/main/ui_act(action, list/params, datum/tgui/ui) if((..())) return TRUE diff --git a/code/modules/power/lighting/lighting.dm b/code/modules/power/lighting/lighting.dm index aa97f40d75..01cbb7b10b 100644 --- a/code/modules/power/lighting/lighting.dm +++ b/code/modules/power/lighting/lighting.dm @@ -296,6 +296,10 @@ var/global/list/light_type_cache = list() var/brightness_power_ns var/brightness_color_ns + #ifdef IN_MAP_EDITOR // So its actually visible in the mapping editor + icon_state = "tube_map" + #endif + /obj/machinery/light/flicker auto_flicker = TRUE @@ -419,6 +423,8 @@ var/global/list/light_type_cache = list() light_type = /obj/item/light/tube/large shows_alerts = FALSE +/obj/machinery/light/spot/no_nightshift + nightshift_allowed = FALSE /obj/machinery/light/spot/flicker auto_flicker = TRUE @@ -560,9 +566,9 @@ var/global/list/light_type_cache = list() needsound = FALSE // Don't play sound again until we've been turned off if(on) - var/correct_range = nightshift_enabled ? brightness_range_ns : brightness_range - var/correct_power = nightshift_enabled ? brightness_power_ns : brightness_power - var/correct_color = nightshift_enabled ? brightness_color_ns : brightness_color + var/correct_range = nightshift_enabled ? (brightness_range_ns || brightness_range) : brightness_range + var/correct_power = nightshift_enabled ? (brightness_power_ns || brightness_power) : brightness_power + var/correct_color = nightshift_enabled ? (brightness_color_ns || brightness_color) : brightness_color if(light_range != correct_range || light_power != correct_power || light_color != correct_color) if(!auto_flicker) switchcount++ diff --git a/code/modules/power/lighting/lights.dm b/code/modules/power/lighting/lights.dm index 310aa16730..9b8c12f5bc 100644 --- a/code/modules/power/lighting/lights.dm +++ b/code/modules/power/lighting/lights.dm @@ -20,13 +20,18 @@ var/rigged = 0 var/broken_chance = 0 - ///how much light it gives off + /// range of light var/brightness_range = 8 + /// power of light var/brightness_power = 0.8 + /// color of light var/brightness_color = LIGHT_COLOR_HALOGEN - var/nightshift_range = 6 - var/nightshift_power = 0.5 + /// range of light under nightshift; null for no change + var/nightshift_range = LIGHT_RANGE_NIGHTSHIFT + /// power of light under nightshift; null for no change + var/nightshift_power = LIGHT_POWER_NIGHTSHIFT + /// color of light under nightshift; null for no change var/nightshift_color = LIGHT_COLOR_NIGHTSHIFT /obj/item/light/tube @@ -104,12 +109,17 @@ base_icon_state = "lbulb" item_state = "contvapour" materials_base = list(MAT_GLASS = 100) - brightness_color = LIGHT_COLOR_TUNGSTEN + brightness_color = LIGHT_COLOR_TUNGSTEN brightness_range = 4 + brightness_power = 0.8 - nightshift_range = 4 - nightshift_power = 0.5 + // todo: bulb nightshift stuff needs to be defines + // we basically disable it because bulbs are already pretty weak + + nightshift_color = null + nightshift_range = null + nightshift_power = null /obj/item/light/bulb/strong name = "light bulb" @@ -118,14 +128,9 @@ base_icon_state = "lbulb" item_state = "contvapour" materials_base = list(MAT_GLASS = 100) - brightness_color = LIGHT_COLOR_TUNGSTEN brightness_range = 8 - nightshift_range = 8 //Basically just a no-nightshift light. - nightshift_power = 0.8 - nightshift_color = LIGHT_COLOR_TUNGSTEN - /obj/item/light/throw_impact(atom/hit_atom) ..() shatter() diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 6d63e7f0bc..c747461807 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -317,7 +317,7 @@ ui = new(user, src, "PortableGenerator", name) ui.open() -/obj/machinery/power/port_gen/pacman/ui_data(mob/user) +/obj/machinery/power/port_gen/pacman/ui_data(mob/user, datum/tgui/ui) // todo: rewrite the whole fuckin' UI. var/list/data = list() @@ -349,7 +349,7 @@ return data -/obj/machinery/power/port_gen/pacman/ui_act(action, params) +/obj/machinery/power/port_gen/pacman/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index cf23334ca3..57a2d18c83 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -131,19 +131,20 @@ newavail = 0 /datum/powernet/proc/get_electrocute_damage() - switch(avail) - if (1000 to INFINITY) - return min(rand(50,160),rand(50,160)) - if (200 to 1000) - return min(rand(25,80),rand(25,80)) - if (100 to 200)//Ave powernet - return min(rand(20,60),rand(20,60)) - if (50 to 100) - return min(rand(15,40),rand(15,40)) - if (1 to 50) - return min(rand(10,20),rand(10,20)) - else - return 0 + //1kW = 5 + //10kW = 24 + //100kW = 45 + //250kW = 53 + //1MW = 66 + //10MW = 88 + //100MW = 110 + //1GW = 132 + if(avail >= 1000) + var/damage = log(1.1,avail) + damage = damage - (log(1.1,damage)*1.5) + return round(damage) + else + return 0 /datum/powernet/proc/drain_energy_handler(datum/actor, amount, flags) // amount is in kj so no conversion needed diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm index 3cdbd95245..5d78626e64 100644 --- a/code/modules/power/sensors/powernet_sensor.dm +++ b/code/modules/power/sensors/powernet_sensor.dm @@ -92,7 +92,7 @@ if(demand.len > record_size) demand.Cut(1, 2) -/obj/machinery/power/sensor/ui_data() +/obj/machinery/power/sensor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["name"] = name_tag diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 6a8e69517e..2d2291df60 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -8,6 +8,7 @@ anchored = 0 density = 1 req_access = list(ACCESS_ENGINEERING_ENGINE) + armor_type = /datum/armor/object/medium var/id = null use_power = USE_POWER_OFF //uses powernet power, not APC power @@ -27,9 +28,6 @@ var/burst_delay = 2 var/initial_fire_delay = 100 - integrity = 80 - - /obj/machinery/power/emitter/verb/rotate_clockwise() set name = "Rotate Emitter Clockwise" set category = "Object" @@ -220,7 +218,7 @@ if(do_after(user, 30)) if(P.use(amt)) to_chat(user, "You have repaired \the [src].") - integrity = initial(integrity) + set_integrity(integrity_max) return else to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") @@ -246,37 +244,6 @@ user.visible_message("[user.name] emags [src].","You short out the lock.") return 1 -/obj/machinery/power/emitter/bullet_act(var/obj/projectile/P) - if(!P || !P.damage || P.get_structure_damage() <= 0 ) - return - - adjust_integrity_emitter(-P.get_structure_damage()) - -/obj/machinery/power/emitter/blob_act() - adjust_integrity_emitter(-1000) // This kills the emitter. - -/obj/machinery/power/emitter/proc/adjust_integrity_emitter(amount) - integrity = clamp( integrity + amount, 0, initial(integrity)) - if(integrity == 0) - if(powernet && avail(active_power_usage * 0.001)) // If it's powered, it goes boom if killed. - visible_message(src, "\The [src] explodes violently!", "You hear an explosion!") - explosion(get_turf(src), 1, 2, 4) - else - src.visible_message("\The [src] crumples apart!", "You hear metal collapsing.") - if(src) - qdel(src) - -/obj/machinery/power/emitter/examine(mob/user, dist) - . = ..() - var/integrity_percentage = round((integrity / initial(integrity)) * 100) - switch(integrity_percentage) - if(0 to 30) - . += "\The [src] is close to falling apart!" - if(31 to 70) - . += "\The [src] is damaged." - if(77 to 99) - . += "\The [src] is slightly damaged." - //R-UST port /obj/machinery/power/emitter/proc/get_initial_fire_delay() return initial_fire_delay diff --git a/code/modules/power/smes/smes.dm b/code/modules/power/smes/smes.dm index 2a744c2905..9d2082dd45 100644 --- a/code/modules/power/smes/smes.dm +++ b/code/modules/power/smes/smes.dm @@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(smeses) ui = new(user, src, "Smes", name) ui.open() -/obj/machinery/power/smes/ui_data() +/obj/machinery/power/smes/ui_data(mob/user, datum/tgui/ui) var/list/data = list( "capacity" = capacity, "capacityPercent" = round(100.0*charge/capacity, 0.1), @@ -330,7 +330,7 @@ GLOBAL_LIST_EMPTY(smeses) ) return data -/obj/machinery/power/smes/ui_act(action, params) +/obj/machinery/power/smes/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE switch(action) diff --git a/code/modules/power/smes/smes_construction.dm b/code/modules/power/smes/smes_construction.dm index 1f31d68d47..ff6d1f8bbe 100644 --- a/code/modules/power/smes/smes_construction.dm +++ b/code/modules/power/smes/smes_construction.dm @@ -165,7 +165,7 @@ log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100") message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") - var/used_hand = h_user.hand?"l_hand":"r_hand" + var/used_hand = h_user.hand? BP_L_HAND : BP_R_HAND switch (intensity) if (0 to 15) @@ -176,7 +176,11 @@ to_chat(h_user, "A small electrical arc almost burns your hand. Luckily you had your gloves on!") else to_chat(h_user, "A small electrical arc sparks and burns your hand as you touch the [src]!") - h_user.adjustFireLossByPart(rand(5,10), used_hand) + h_user.take_targeted_damage( + burn = rand(5, 10), + damage_mode = DAMAGE_MODE_REDIRECT, + body_zone = used_hand, + ) h_user.afflict_paralyze(20 * 2) if (16 to 35) @@ -187,7 +191,11 @@ to_chat(h_user, "A medium electrical arc sparks and almost burns your hand. Luckily you had your gloves on!") else to_chat(h_user, "A medium electrical arc sparks as you touch the [src], severely burning your hand!") - h_user.adjustFireLossByPart(rand(10,25), used_hand) + h_user.take_targeted_damage( + burn = rand(10, 25), + damage_mode = DAMAGE_MODE_REDIRECT, + body_zone = used_hand, + ) h_user.afflict_paralyze(20 * 5) spawn() empulse(get_turf(src), 1, 2, 3, 4) @@ -198,7 +206,11 @@ s.set_up(7,1,src) if (user_protected) to_chat(h_user, "A strong electrical arc sparks between you and [src], ignoring your gloves and burning your hand!") - h_user.adjustFireLossByPart(rand(25,60), used_hand) + h_user.take_targeted_damage( + burn = rand(25, 60), + damage_mode = DAMAGE_MODE_REDIRECT, + body_zone = used_hand, + ) h_user.afflict_paralyze(20 * 8) else to_chat(h_user, "A strong electrical arc sparks between you and [src], knocking you out for a while!") @@ -241,8 +253,6 @@ s.start() charge = 0 - - // Proc: apcs_overload() // Parameters: 2 (failure_chance - chance to actually break the APC, overload_chance - Chance of breaking lights) // Description: Damages output powernet by power surge. Destroys few APCs and lights, depending on parameters. diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 6baeccbbb8..a952df51bc 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -416,7 +416,7 @@ ui.open() // This is purely informational UI that may be accessed by AIs or robots -/obj/machinery/power/supermatter/ui_data(mob/user) +/obj/machinery/power/supermatter/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["integrity_percentage"] = round(get_integrity()) diff --git a/code/modules/preferences/preference_setup/helpers/language_pick.dm b/code/modules/preferences/preference_setup/helpers/language_pick.dm index 7ebdef1abb..eb7a52085f 100644 --- a/code/modules/preferences/preference_setup/helpers/language_pick.dm +++ b/code/modules/preferences/preference_setup/helpers/language_pick.dm @@ -60,10 +60,10 @@ GLOBAL_LIST_EMPTY(language_picker_active) ui.autoupdate = FALSE // why the fuck are you updating language data?? ui.open() -/datum/tgui_language_picker/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_language_picker/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE -/datum/tgui_language_picker/ui_static_data(mob/user) +/datum/tgui_language_picker/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/built = list() var/list/categories = list("General") @@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(language_picker_active) data["categories"] = categories return data -/datum/tgui_language_picker/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_language_picker/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(!QDELING(src)) qdel(src) diff --git a/code/modules/preferences/preference_setup/helpers/species_pick.dm b/code/modules/preferences/preference_setup/helpers/species_pick.dm index 46c240433a..06786ee347 100644 --- a/code/modules/preferences/preference_setup/helpers/species_pick.dm +++ b/code/modules/preferences/preference_setup/helpers/species_pick.dm @@ -113,10 +113,10 @@ GLOBAL_LIST_EMPTY(species_picker_active) ui.autoupdate = FALSE // why the fuck are you updating species data?? ui.open() -/datum/tgui_species_picker/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_species_picker/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE -/datum/tgui_species_picker/ui_static_data(mob/user) +/datum/tgui_species_picker/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["whitelisted"] = whitelisted data["species"] = SScharacters.character_species_cache @@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(species_picker_active) data["admin"] = !!admin_datums[user.ckey] return data -/datum/tgui_species_picker/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_species_picker/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() if(!QDELING(src)) qdel(src) diff --git a/code/modules/preferences/preference_setup/loadout/loadout.dm b/code/modules/preferences/preference_setup/loadout/loadout.dm index 3af7b92af1..30e516b560 100644 --- a/code/modules/preferences/preference_setup/loadout/loadout.dm +++ b/code/modules/preferences/preference_setup/loadout/loadout.dm @@ -98,7 +98,7 @@ . = FALSE current_cost += entry.cost -/datum/category_item/player_setup_item/loadout/gear/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/category_item/player_setup_item/loadout/gear/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["gearContext"] = tgui_loadout_context() var/list/allowed_ids = list() @@ -114,7 +114,7 @@ ui = new(user, src, "CharacterLoadoutStandalone") ui.open() -/datum/category_item/player_setup_item/loadout/gear/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/category_item/player_setup_item/loadout/gear/ui_status(mob/user, datum/ui_state/state) return UI_INTERACTIVE /datum/category_item/player_setup_item/loadout/gear/proc/tgui_loadout_selected(list/loadout_slot) diff --git a/code/modules/preferences/preference_setup/vore/08_traits.dm b/code/modules/preferences/preference_setup/vore/08_traits.dm index 20e790067e..3c79793893 100644 --- a/code/modules/preferences/preference_setup/vore/08_traits.dm +++ b/code/modules/preferences/preference_setup/vore/08_traits.dm @@ -1,6 +1,7 @@ #define POSITIVE_MODE 1 #define NEUTRAL_MODE 2 #define NEGATIVE_MODE 3 +#define ALL_MODE 4 /datum/preferences var/custom_species // Custom species name, can't be changed due to it having been used in savefiles already. @@ -72,7 +73,7 @@ if(pref.real_species_id() != SPECIES_ID_CUSTOM) pref.pos_traits.Cut() - pref.neg_traits.Cut() + // Clean up positive traits for(var/path in pref.pos_traits) if(!(path in positive_traits)) @@ -87,6 +88,8 @@ for(var/path in pref.neg_traits) if(!(path in negative_traits)) pref.neg_traits -= path + if((pref.real_species_id() != SPECIES_ID_CUSTOM) && !(path in everyone_traits)) + pref.neg_traits -= path var/datum/species/selected_species = pref.real_species_datum() if(selected_species.selects_bodytype) @@ -160,12 +163,22 @@ . += "
  • - [trait.name] ([trait.cost])
    • " . += "" - . += "Neutral Trait +
    " - . += "" + . += "Neutral Trait +
    " + . += "" + else + . += "Trait +
    " + . += "
      " + for(var/T in pref.neu_traits) + var/datum/trait/trait = neutral_traits[T] + . += "
    • - [trait.name]
      • " + for(var/T in pref.neg_traits) + var/datum/trait/trait = negative_traits[T] + . += "
    • - [trait.name]
      • " + . += "
    " . += "Blood Color: " //People that want to use a certain species to have that species traits (xenochimera/promethean/spider) should be able to set their own blood color. . += "Set Color" @@ -282,7 +295,9 @@ if(NEGATIVE_MODE) picklist = negative_traits.Copy() - pref.neg_traits mylist = pref.neg_traits - else + if(ALL_MODE) + picklist = everyone_traits.Copy() - pref.neu_traits - pref.neg_traits + mylist = pref.neg_traits.Copy() + pref.neu_traits.Copy() if(isnull(picklist)) return PREFERENCES_REFRESH @@ -291,8 +306,12 @@ return PREFERENCES_REFRESH var/list/nicelist = list() + var/species = pref.real_species_name() for(var/P in picklist) var/datum/trait/T = picklist[P] + if(LAZYLEN(T.allowed_species) && !(species in T.allowed_species)) + picklist -= P + continue nicelist[T.name] = P var/points_left = pref.starting_trait_points @@ -351,6 +370,12 @@ Please remove that trait, or pick another trait to add.","Error") return PREFERENCES_REFRESH + if(mode == ALL_MODE) + if(instance.cost < 0) + mylist = pref.neg_traits + else + mylist = pref.neu_traits + mylist += path return PREFERENCES_REFRESH @@ -359,3 +384,4 @@ #undef POSITIVE_MODE #undef NEUTRAL_MODE #undef NEGATIVE_MODE +#undef ALL_MODE diff --git a/code/modules/reagents/Drink-Recipes.dm b/code/modules/reagents/Drink-Recipes.dm index bcbf20e529..26e25d2d81 100644 --- a/code/modules/reagents/Drink-Recipes.dm +++ b/code/modules/reagents/Drink-Recipes.dm @@ -191,7 +191,7 @@ /datum/chemical_reaction/drinks/kahlua name = "Kahlua" id = "kahlua" - result = "kahlua" + result = /datum/reagent/ethanol/coffee/kahlua required_reagents = list("coffee" = 5, "sugar" = 5) catalysts = list("enzyme" = 5) result_amount = 5 @@ -1339,13 +1339,6 @@ required_reagents = list("gin" = 1, "limejuice" = 1, "sodawater" = 1) result_amount = 3 -/datum/chemical_reaction/drinks/firepunch - name = "Fire Punch" - id = "firepunch" - result = "firepunch" - required_reagents = list("sugar" = 2, "rum" = 1) - result_amount = 3 - /datum/chemical_reaction/drinks/newsheriff name = "New Sheriff" id = "newsheriff" @@ -1882,6 +1875,13 @@ required_reagents = list("vodka" = 1, "kyocola" = 1, "ice" = 1) result_amount = 3 +/datum/chemical_reaction/drinks/mimosa + name = "Mimosa" + id = "mimosa" + result = "mimosa" + required_reagents = list("orangejuice" = 1, "champagne" = 1) + result_amount = 3 + // Unathi drinks /datum/chemical_reaction/drinks/skrianhi diff --git a/code/modules/reagents/chemistry/colors.dm b/code/modules/reagents/chemistry/colors.dm index ace030e3bf..2380c5348c 100644 --- a/code/modules/reagents/chemistry/colors.dm +++ b/code/modules/reagents/chemistry/colors.dm @@ -21,6 +21,7 @@ return mixcolor /datum/reagents/proc/get_color() + // todo: cache this shit if(!reagent_list || !reagent_list.len) return "#ffffffff" if(reagent_list.len == 1) // It's pretty common and saves a lot of work diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 6290a7efed..4eaaec6b49 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -4,6 +4,7 @@ var/reagent_holder_flags = NONE ///? legacy / unsorted + // todo: 3 lists, for volume, data, flags; data should always be a list. var/list/datum/reagent/reagent_list = list() var/total_volume = 0 var/maximum_volume = 100 @@ -179,6 +180,9 @@ update_total() /datum/reagents/proc/remove_reagent(id, amount, safety = 0) + if(ispath(id)) + var/datum/reagent/path = id + id = initial(path.id) if(!isnum(amount)) return 0 for(var/datum/reagent/current in reagent_list) @@ -203,6 +207,9 @@ return 0 /datum/reagents/proc/has_reagent(id, amount = 0) + if(ispath(id)) + var/datum/reagent/path = id + id = initial(path.id) for(var/datum/reagent/current in reagent_list) if(current.id == id) if(current.volume >= amount) @@ -229,22 +236,6 @@ missing-- return !missing -/** - * returns lowest multiple of what we have compared to reagents list. - * - * both typepaths and ids are acceptable. - */ -/datum/reagents/proc/has_multiple(list/reagents, multiplier = 1) - . = INFINITY - // *sigh* - var/list/legacy_translating = list() - for(var/datum/reagent/R in reagent_list) - legacy_translating[R.id] = R.volume - for(var/datum/reagent/reagent as anything in reagents) - . = min(., legacy_translating[ispath(reagent)? initial(reagent.id) : reagent] / reagents[reagent]) - if(!.) - return - /datum/reagents/proc/clear_reagents() for(var/datum/reagent/current in reagent_list) del_reagent(current.id) @@ -256,6 +247,9 @@ return current /datum/reagents/proc/get_reagent_amount(id) + if(ispath(id)) + var/datum/reagent/path = id + id = initial(path.id) for(var/datum/reagent/current in reagent_list) if(current.id == id) return current.volume @@ -536,7 +530,7 @@ do_happen = TRUE return do_happen -//? Queries - Whole +//? Queries /** * returns volume remaining @@ -544,6 +538,80 @@ /datum/reagents/proc/available_volume() return maximum_volume - total_volume +/** + * returns lowest multiple of what we have compared to reagents list. + * + * both typepaths and ids are acceptable. + */ +/datum/reagents/proc/has_multiple(list/reagents, multiplier = 1) + . = INFINITY + // *sigh* + var/list/legacy_translating = list() + for(var/datum/reagent/R in reagent_list) + legacy_translating[R.id] = R.volume + for(var/datum/reagent/reagent as anything in reagents) + . = min(., legacy_translating[ispath(reagent)? initial(reagent.id) : reagent] / reagents[reagent]) + if(!.) + return + +//? Transfers + +/** + * @params + * * target - target holder + * * reagents - list of paths or ids to filter by + * * amount - limit of how much + * * copy - do not remove the reagent from source + * * multiplier - magically multiply the transferred reagent volumes by this much; does not affect return value. + * * defer_reactions - should we + the recipient handle reactions? + * + * @return reagents transferred + */ +/datum/reagents/proc/transfer_to_holder(datum/reagents/target, list/reagents, amount = INFINITY, copy, multiplier = 1, defer_reactions) + . = 0 + if(!total_volume) + return + if(!reagents) + var/ratio = min(1, (target.maximum_volume - target.total_volume) / total_volume) + . = total_volume * ratio + if(!copy) + for(var/datum/reagent/R as anything in reagent_list) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + remove_reagent(R.id, transferred, safety = TRUE) + else + for(var/datum/reagent/R as anything in reagent_list) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + else + var/total_transferable = 0 + var/list/reagents_transferring = list() + // preprocess + for(var/i in 1 to length(reagents)) + reagents[i] = SSchemistry.fetch_reagent(reagents[i]) + // filter & gather + for(var/datum/reagent/R as anything in reagent_list) + if(!(R.id in reagents)) + continue + total_transferable += R.volume + reagents_transferring += R + var/ratio = min(1, (target.maximum_volume - target.total_volume) / total_transferable) + . = total_transferable * ratio + if(!copy) + for(var/datum/reagent/R as anything in reagents_transferring) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + remove_reagent(R.id, transferred, safety = TRUE) + else + for(var/datum/reagent/R as anything in reagents_transferring) + var/transferred = R.volume * ratio + target.add_reagent(R.id, transferred * multiplier, R.get_data(), safety = TRUE) + + if(!defer_reactions) + if(!copy) + handle_reactions() + target.handle_reactions() + //? UI /** diff --git a/code/modules/reagents/chemistry/reaction.dm b/code/modules/reagents/chemistry/reaction.dm index a0a05f3265..1c2d3a9daa 100644 --- a/code/modules/reagents/chemistry/reaction.dm +++ b/code/modules/reagents/chemistry/reaction.dm @@ -93,7 +93,7 @@ result = initial(result_initial.id) /datum/chemical_reaction/proc/generate() - var/datum/reagent/resolved = SSchemistry.get_reagent(result) + var/datum/reagent/resolved = SSchemistry.fetch_reagent(result) if(isnull(name)) name = resolved?.name || "???" if(isnull(display_name) && !isnull(resolved)) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm index 1ea7bfec45..2f7c603636 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm @@ -100,12 +100,13 @@ if(is_vampire) handle_vampire(M, alien, removed, is_vampire) - var/effective_dose = strength_mod * dose // this was being recalculated a bunch before--why? if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - if(prob(effective_dose/10)) + var/intolerant_dose = 50*strength_mod*removed/strength + if(prob((intolerant_dose))) M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(effective_dose/10) + M.adjustToxLoss(intolerant_dose) // 10 strength = 5 tox per u, so 10u deathbell = 50, 10u vodka = 3.3333..., 10u beer = 10 return 0 + var/effective_dose = strength_mod * dose // this was being recalculated a bunch before--why? M.add_chemical_effect(CE_ALCOHOL, 1) if(effective_dose >= strength) // Early warning M.make_dizzy(6) // It is decreased at the speed of 3 per tick @@ -167,7 +168,7 @@ /datum/reagent/acid/affect_blood(mob/living/carbon/M, alien, removed) if(issmall(M)) removed *= 2 - M.take_organ_damage(0, removed * power * 2) + M.take_random_targeted_damage(brute = 0, brute = removed * power * 2) /datum/reagent/acid/affect_touch(mob/living/carbon/M, alien, removed) // This is the most interesting if(ishuman(M)) @@ -213,20 +214,21 @@ return if(volume < meltdose) // Not enough to melt anything - M.take_organ_damage(0, removed * power * 0.2) //burn damage, since it causes chemical burns. Acid doesn't make bones shatter, like brute trauma would. + M.take_random_targeted_damage(brute = 0, brute = removed * power * 0.2) //burn damage, since it causes chemical burns. Acid doesn't make bones shatter, like brute trauma would. return if(!M.unacidable && removed > 0) if(istype(M, /mob/living/carbon/human) && volume >= meltdose) var/mob/living/carbon/human/H = M var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD) if(affecting) - if(affecting.take_damage(0, removed * power * 0.1)) - H.UpdateDamageIcon() + affecting.inflict_bodypart_damage( + burn = removed * power * 0.1, + ) if(prob(100 * removed / meltdose)) // Applies disfigurement if (affecting.organ_can_feel_pain()) H.emote("scream") else - M.take_organ_damage(0, removed * power * 0.1) // Balance. The damage is instant, so it's weaker. 10 units -> 5 damage, double for pacid. 120 units beaker could deal 60, but a) it's burn, which is not as dangerous, b) it's a one-use weapon, c) missing with it will splash it over the ground and d) clothes give some protection, so not everything will hit + M.take_random_targeted_damage(brute = 0, brute = removed * power * 0.1) // Balance. The damage is instant, so it's weaker. 10 units -> 5 damage, double for pacid. 120 units beaker could deal 60, but a) it's burn, which is not as dangerous, b) it's a one-use weapon, c) missing with it will splash it over the ground and d) clothes give some protection, so not everything will hit /datum/reagent/acid/touch_obj(obj/O) if(O.integrity_flags & INTEGRITY_INDESTRUCTIBLE) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm index 974e3fcbf5..a081c35e37 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm @@ -138,7 +138,7 @@ /datum/reagent/nutriment/mayo name = "mayonnaise" id = "mayo" - description = "A thick, bitter sauce." + description = "A thick, savory sauce." taste_description = "unmistakably mayonnaise" nutriment_factor = 10 color = "#FFFFFF" @@ -191,8 +191,6 @@ nutriment_factor = 5 color = "#302000" -/datum/reagent/nutriment/coco/affect_ingest(mob/living/carbon/M, alien, removed) - M.nutrition += removed * 5 /datum/reagent/nutriment/instantjuice name = "Juice Powder" id = "instantjuice" @@ -775,6 +773,8 @@ id = "grapejuice" description = "It's grrrrrape!" taste_description = "grapes" + nutrition=1 // also applies to all of the other juices + color = "#863333" glass_name = "Grape Juice" @@ -873,6 +873,7 @@ description = "Juice of the potato. Bleh." taste_description = "potatoes" nutrition = 2 + color = "#302000" glass_name = "Potato Juice" @@ -924,6 +925,7 @@ taste_description = "milk" color = "#DFDFDF" var/contains_lactose = TRUE + nutrition=5 glass_name = "Milk" glass_desc = "White and nutritious goodness!" @@ -938,7 +940,6 @@ description = "A delicious mixture of perfectly healthy mix and terrible chocolate." taste_description = "chocolate milk" color = "#74533b" - cup_icon_state = "cup_brown" cup_name = "Cup of Chocolate Milk" cup_desc = "Deliciously fattening!" @@ -974,6 +975,7 @@ description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" taste_description = "thick milk" color = "#DFD7AF" + nutrition=10 glass_name = "Cream" glass_desc = "Ewwww..." @@ -1087,6 +1089,7 @@ description = "A tasty mixture of lemon and tea. It's apparently good for you!" color = "#FC6A00" taste_description = "black tea with tones of lemon" + nutrition=1 glass_name = "Lemon Tea" glass_desc = "A tasty mixture of lemon and tea. It's apparently good for you!" @@ -1100,6 +1103,7 @@ description = "A tasty mixture of lime and tea. It's apparently good for you!" color = "#DE4300" taste_description = "black tea with tones of lime" + nutrition=1 glass_name = "Lime Tea" glass_desc = "A tasty mixture of lime and tea. It's apparently good for you!" @@ -1113,6 +1117,7 @@ description = "A tasty mixture of orange and tea. It's apparently good for you!" color = "#FB4F06" taste_description = "black tea with tones of orange" + nutrition=1 glass_name = "Orange Tea" glass_desc = "A tasty mixture of orange and tea. It's apparently good for you!" @@ -1126,6 +1131,7 @@ description = "A tasty mixture of berries and tea. It's apparently good for you!" color = "#A60735" taste_description = "black tea with tones of berries" + nutrition=1 glass_name = "Berry Tea" glass_desc = "A tasty mixture of berries and tea. It's apparently good for you!" @@ -1139,6 +1145,7 @@ description = "Sweet iced tea cut with milk." taste_description = "sweet, silky smooth tea" color = "#ffffff" + nutrition=3 glass_name = "Milk Tea" glass_desc = "Sweet iced tea cut with milk." @@ -1162,6 +1169,7 @@ description = "Chilled milk tea with chewy tapioca pearls and a spoonful of honey." taste_description = "sweet, silky smooth tea and notes of honey" color = "#ffffff" + nutrition=5 glass_name = "Honey Bubble Tea" glass_desc = "Chilled milk tea with chewy tapioca pearls and a spoonful of honey." @@ -1176,6 +1184,7 @@ description = "Chilled milk and green tea with chewy tapioca pearls." taste_description = "sweet, silky smooth green tea" color = "#1db883" + nutrition=5 glass_name = "Matcha Bubble Tea" glass_desc = "Chilled milk and green tea with chewy tapioca pearls. It's GREEN!" @@ -1190,6 +1199,7 @@ description = "Chilled milk tea with chewy tapioca pearls and taro." taste_description = "incredibly sweet, silky smooth tea" color = "#b87098" + nutrition=5 glass_name = "Taro Bubble Tea" glass_desc = "Chilled milk tea with chewy tapioca pearls and taro. It's PURPLE!" @@ -1204,6 +1214,7 @@ description = "Chilled milk tea with chewy tapioca pearls and a spoonful of chocolate mixed in." taste_description = "sweet, silky smooth tea and notes of chocolate" color = "#754a2e" + nutrition=5 glass_name = "Chocolate Bubble Tea" glass_desc = "Chilled milk tea with chewy tapioca pearls and a spoonful of chocolate mixed in." @@ -1218,6 +1229,7 @@ description = "Super sweet mix of milk, tea, coffee, and chocolate, topped off with a generous helping of whipped cream." taste_description = "barista's ire and sugarmilk overload" color = "#5c2c0c" + nutrition=5 glass_name = "Mocha Bubble Tea" glass_desc = "Super sweet mix of milk, tea, coffee, and chocolate, topped off with a generous helping of whipped cream. That seems like a lot of sugar. You're going to put that in you?" @@ -1232,7 +1244,8 @@ description = "A fresh clear liquid found within coconuts." taste_description = "tropical, somewhat buttery water" color = "#fafafa70" - + nutrition=1 + glass_name = "Coconut Water" glass_desc = "A fresh clear liquid found within coconuts." @@ -1306,6 +1319,7 @@ taste_description = "creamy coffee" color = "#C65905" adj_temp = 5 + nutrition=1 glass_desc = "A nice and refreshing beverage while you are reading." glass_name = "Soy Latte" @@ -1326,6 +1340,7 @@ taste_description = "bitter cream" color = "#C65905" adj_temp = 5 + nutrition=1 glass_name = "Cafe Latte" glass_desc = "A nice, strong and refreshing beverage while you are reading." @@ -1381,6 +1396,7 @@ taste_description = "grape soda" color = "#421C52" adj_drowsy = -3 + nutrition=5 glass_name = "Grape Soda" glass_desc = "Looks like a delicious drink!" @@ -1392,6 +1408,7 @@ description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." taste_description = "tart and fresh" color = "#619494" + nutrition=1 adj_dizzy = -5 adj_drowsy = -3 @@ -1408,6 +1425,7 @@ taste_description = "lemonade" color = "#FFFF00" adj_temp = -5 + nutrition=3 glass_name = "Lemonade" glass_desc = "Oh the nostalgia..." @@ -1420,6 +1438,7 @@ taste_description = "watermelon" color = "#FFB3BB" adj_temp = -5 + nutrition=3 glass_name = "Melonade" glass_desc = "Oh the.. nostalgia?" @@ -1432,6 +1451,7 @@ taste_description = "sparkling apples" color = "#FFD1B3" adj_temp = -5 + nutrition=3 glass_name = "Appleade" glass_desc = "Applejuice, improved." @@ -1444,6 +1464,7 @@ taste_description = "sweet`n`sour pineapples" color = "#FFFF00" adj_temp = -5 + nutrition=3 glass_name = "Pineappleade" glass_desc = "Spineapple, juiced up." @@ -1456,6 +1477,7 @@ taste_description = "fruity sweetness" color = "#CCCC99" adj_temp = -5 + nutrition=2 glass_name = "Kira Special" glass_desc = "Long live the guy who everyone had mistaken for a girl. Baka!" @@ -1468,6 +1490,7 @@ taste_description = "orange and cola soda" color = "#9F3400" adj_temp = -2 + nutrition=3 glass_name = "Brown Star" glass_desc = "It's not what it sounds like..." @@ -1478,6 +1501,7 @@ description = "Delicious appleade with a touch of mint." taste_description = "minty apples" color = "#FDDA98" + nutrition=3 glass_name = "Mint Apple Sparkle" glass_desc = "Delicious appleade with a touch of mint." @@ -1490,6 +1514,7 @@ taste_description = "sparkling orange juice in overdrive" color = "#e88e06" adj_temp = -2 + nutrition=3 glass_name = "Orange Ale" glass_desc = "an overwhelmingly fizzy combination of orange juice and ginger ale." @@ -1503,6 +1528,7 @@ color = "#AEE5E4" adj_temp = -9 var/contains_lactose = TRUE //in place in case someone makes adds milkshakes with soymilk or coconut milk + nutrition=10 glass_name = "Milkshake" glass_desc = "Glorious brainfreezing mixture." @@ -1544,6 +1570,7 @@ taste_description = "cold refreshing chocolate and cream" color = "#8e6f44" // rgb(142, 111, 68) adj_temp = -9 + nutrition=10 glass_name = "Chocolate Milkshake" glass_desc = "A refreshing chocolate milkshake, just like mom used to make." @@ -1559,6 +1586,7 @@ taste_description = "cold refreshing berries and cream" color = "#ffb2b2" // rgb(255, 178, 178) adj_temp = -9 + nutrition=10 glass_name = "Berry Milkshake" glass_desc = "A refreshing berry milkshake, just like mom used to make." @@ -1573,7 +1601,7 @@ adj_dizzy = -5 adj_drowsy = -3 adj_sleepy = -2 - + nutrition=8 glass_name = "Coffee Milkshake" glass_desc = "An energizing coffee milkshake, perfect for hot days at work.." @@ -1587,6 +1615,7 @@ description = "Savory cream in an ice-cold stature." taste_description = "cold peanuts and cream" color = "#8e6f44" + nutrition=10 glass_name = "Peanut Milkshake" glass_desc = "Savory cream in an ice-cold stature." @@ -1598,6 +1627,7 @@ taste_description = "citrus and coffee" color = "#485000" adj_temp = -5 + nutrition=2 glass_name = "Rewriter" glass_desc = "The secret of the sanctuary of the Libarian..." @@ -1614,6 +1644,7 @@ color = "#100800" adj_temp = -5 adj_sleepy = -2 + nutrition=1 glass_name = "Nuka-Cola" glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland" @@ -1634,6 +1665,7 @@ taste_description = "100% pure pomegranate" color = "#FF004F" water_based = FALSE + nutrition=1 glass_name = "Grenadine Syrup" glass_desc = "Sweet and tangy, a bar syrup used to add color and flavor to drinks." @@ -1647,6 +1679,7 @@ color = "#100800" adj_drowsy = -3 adj_temp = -5 + nutrition=3 // Also applies to other sodas, unless otherwise specified glass_name = "Space Cola" glass_desc = "A glass of refreshing Space Cola." @@ -1833,6 +1866,7 @@ taste_description = "sweet tonic cherries" color = "#EF304F" adj_temp = -8 + nutrition=2 glass_name = "Shirley Temple" glass_desc = "A sweet concotion hated even by its namesake." @@ -1845,6 +1879,7 @@ taste_description = "cola and fruit" color = "#4F1811" adj_temp = -8 + nutrition=2 glass_name = "Roy Rogers" glass_desc = "I'm a cowboy, on a steel horse I ride" @@ -1854,9 +1889,10 @@ name = "Collins Mix" id = "collins_mix" description = "Best hope it isn't a hoax." - taste_description = "gin and lemonade" + taste_description = "Particularly fizzy lemon-lime soda" color = "#D7D0B3" adj_temp = -8 + nutrition=3 glass_name = "Collins Mix" glass_desc = "Best hope it isn't a hoax." @@ -1869,6 +1905,7 @@ taste_description = "lemon and sweet tea" color = "#AF5517" adj_temp = -8 + nutrition=1 glass_name = "Arnold Palmer" glass_desc = "Tastes just like the old man." @@ -1904,7 +1941,7 @@ description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." taste_description = "dry cheap noodles" reagent_state = REAGENT_SOLID - nutrition = 1 + nutrition = 5 color = "#302000" glass_name = "Dry Ramen" @@ -1917,7 +1954,7 @@ taste_description = "noodles and salt" reagent_state = REAGENT_LIQUID color = "#302000" - nutrition = 5 + nutrition = 10 adj_temp = 5 glass_name = "Hot Ramen" @@ -1931,7 +1968,7 @@ taste_mult = 1.7 reagent_state = REAGENT_LIQUID color = "#302000" - nutrition = 5 + nutrition = 10 glass_name = "Hell Ramen" glass_desc = "A glass of extremely spicy noodles. Wait, why did you put this into a glass?" @@ -1948,7 +1985,7 @@ description = "How many things can you add to a cup of ramen before it begins to question its existance?" taste_description = "unbearable sweetness" color = "#4444FF" - nutrition = 5 + nutrition = 15 glass_name = "Sweet Sundae Ramen" glass_desc = "How many things can you add to a cup of ramen before it begins to question its existance?" @@ -1997,6 +2034,7 @@ description = "A smoothy, silky mix of honey and dairy." taste_description = "sweet, soothing dairy" color = "#fcfcc9" // rgb(252, 252, 201) + nutrition=10 glass_name = "Dream Cream" glass_desc = "A smoothy, silky mix of honey and dairy." @@ -2007,6 +2045,7 @@ description = "A fizzy, sour lemonade mix." taste_description = "fizzy, sour lemon" color = "#c6c603" // rgb(198, 198, 3) + nutrition=2 glass_name = "Vile Lemon" glass_desc = "A sour, fizzy drink with lemonade and lemonlime." @@ -2018,6 +2057,7 @@ description = "A natural, earthy combination of all things peaceful." taste_description = "fresh rain and sweet memories" color = "#3a6617" // rgb(58, 102, 23) + nutrition=2 glass_name = "Ent's Draught" glass_desc = "You can almost smell the tranquility emanating from this." @@ -2028,6 +2068,7 @@ description = "Creamy strawberries and sugar, simple and sweet." taste_description = "strawberries and cream" color = "#fc8a8a" // rgb(252, 138, 138) + nutrition=5 glass_name = "Love Potion" glass_desc = "Love me tender, love me sweet." @@ -2039,6 +2080,7 @@ taste_description = "honey" color = "#FDF5E6" // rgb(253,245,230) water_based = FALSE + nutrition=10 glass_name = "Oil Slick" glass_desc = "A concoction that should probably be in an engine, rather than your stomach." @@ -2051,6 +2093,7 @@ taste_description = "peanuts`n`slime" color = "#93604D" water_based = FALSE + nutrition=10 glass_name = "Slick Slime Slammer" glass_desc = "A concoction that should probably be in an engine, rather than your stomach. Still." @@ -2062,6 +2105,7 @@ description = "A creamy, rich beverage made out of whisked eggs, milk and sugar, for when you feel like celebrating the winter holidays." taste_description = "thick cream and vanilla" color = "#fff3c1" // rgb(255, 243, 193) + nutrition=8 glass_name = "Eggnog" glass_desc = "You can't egg-nore the holiday cheer all around you" @@ -2073,6 +2117,7 @@ taste_description = "sour honey drops" color = "#7FFF00" // rgb(127,255,0) water_based = FALSE + nutrition=2 glass_name = "Nuclear Waste" glass_desc = "Sadly, no super powers." @@ -2098,6 +2143,7 @@ taste_description = "chewy water" color = "#F0FFF0" // rgb(245,255,250) water_based = FALSE + nutrition=3 glass_name = "Soda Oil" glass_desc = "A pitiful sludge that looks vaguely like a soda.. if you look at it a certain way." @@ -2128,6 +2174,7 @@ description = "Mint, bubbly water, and citrus, made for sailing." taste_description = "mint and lime" color = "#FFF7B3" + nutrition=2 glass_name = "Mojito" glass_desc = "Mint, bubbly water, and citrus, made for sailing." @@ -2139,6 +2186,7 @@ description = "A secret combination of orange juice and pomegranate." taste_description = "a sexy, sandy sunset" color = "#FF0033" + nutrition=2 glass_name = "Sex on the Beach" glass_desc = "A secret combination of orange juice and pomegranate." @@ -2149,6 +2197,7 @@ description = "A fruity punch!" taste_description = "sharp, sour apples" color = "#D2BA6E" + nutrition=2 glass_name = "Driver`s Punch" glass_desc = "A fruity punch!" @@ -2160,6 +2209,7 @@ description = "A favorite drink amongst poor bartenders living in Neo Detroit." taste_description = "sweet bubblegum fizz." color = "#d3785d" + nutrition=5 glass_name = "Sweet Rush" glass_desc = "This looks like it might rot your teeth out." @@ -2171,6 +2221,7 @@ description = "How berry cordial of you." taste_description = "sweet chivalry" color = "#D26EB8" + nutrition=4 glass_name = "Berry Cordial" glass_desc = "How berry cordial of you." @@ -2183,6 +2234,7 @@ taste_description = "an odd blend of metals and sugar" color = "#993c49" blood_content = 1 + nutrition=1 glass_name = "Blud" glass_desc = "A sweet mix of blood-like additives. Vampiric." @@ -2206,6 +2258,7 @@ description = "One sip and you're in the bahamas." taste_description = "tropical" color = "#69375C" + nutrition=3 glass_name = "Tropical Fizz" glass_desc = "One sip and you're in the bahamas." @@ -2218,6 +2271,7 @@ description = "One sip and you're in the bahamas... maybe." taste_description = "slightly tropical" color = "#69375C" + nutrition=3 glass_name = "Tropical Fizz" glass_desc = "One sip and you're in the bahamas... maybe." @@ -2256,6 +2310,7 @@ description = "A classic from Humanity's early days. Soothing, cool, and nostalgic." taste_description = "creamy ice cream with a bubbly and bitter kick" adj_temp = -5 + nutrition=10 glass_name = "Root Beer Float" glass_desc = "A classic from Humanity's early days. Soothing, cool, and nostalgic." @@ -2268,6 +2323,7 @@ color = "#c9ab84" //usually most pilk mixtures have the milk presence dominate. adj_drowsy = -3 //space cola effects adj_temp = -3 + nutrition=5 glass_name = "Pilk" glass_desc = "Milk and Space Cola mixed together. Burenyuu~. While the soda ingredient isn't exactly the one based on the original \ @@ -2358,24 +2414,13 @@ if(.) M.dizziness += 5 -/datum/reagent/ethanol/firepunch - name = "Fire Punch" - id = "firepunch" - description = "Yo ho ho and a jar of honey." - taste_description = "sharp butterscotch" - color = "#ECB633" - strength = 7 - - glass_name = "Fire Punch" - glass_desc = "Yo ho ho and a jar of honey." - /datum/reagent/ethanol/gin name = "Gin" id = "gin" description = "It's gin. In space. I say, good sir." taste_description = "an alcoholic christmas tree" color = "#0064C6" - strength = 50 + strength = 15 glass_name = "Gin" glass_desc = "A crystal clear glass of Griffeater gin." @@ -2386,7 +2431,7 @@ description = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." taste_description = "oily gin" color = "#0064C6" - strength = 30 + strength = 20 glass_name = "Victory Gin" glass_desc = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." @@ -2489,7 +2534,7 @@ description = "A concoction of vodka and a secret combination of orange juice and pomegranate." taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" color = "#FF0033" - strength = 15 + strength = 90 // it is one SIXTH vodka glass_name = "Sex on the Beach" glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." @@ -2548,7 +2593,7 @@ description = "A superb and well-aged single-malt whiskey. Damn." taste_description = "molasses" color = "#4C3100" - strength = 25 + strength = 15 glass_name = "Whiskey" glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." @@ -2559,7 +2604,7 @@ description = "A premium alchoholic beverage made from distilled grape juice. This one's red!" taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 - strength = 15 + strength = 30 glass_name = "Wine" glass_desc = "A very classy looking drink." @@ -2570,7 +2615,7 @@ description = "A premium alchoholic beverage made from distilled grape juice. This one's white!" taste_description = "bitter sweetness" color = "#FCF1D2" - strength = 13 + strength = 30 glass_name = "White Wine" glass_desc = "A very classy looking drink. Now in white!" @@ -2618,10 +2663,10 @@ /datum/reagent/ethanol/cider name = "Cider" id = "cider" - description = "Hard? Soft? No-one knows but it'll get you drunk." + description = "An alcoholic drink made from apple juice. Erratum on earlier recipe books: this is definitely hard." taste_description = "tartness" color = "#CE9C00" // rgb: 206, 156, 0 - strength = 10 + strength = 40 glass_name = "Cider" glass_desc = "The second most Irish drink." @@ -2648,7 +2693,7 @@ description = "A drink made from your allies, not as sweet as when made from your enemies." taste_description = "bitter sweetness" color = "#D8AC45" - strength = 25 + strength = 20 // bit of vodka makes it stronger glass_name = "Allies cocktail" glass_desc = "A drink made from your allies." @@ -2659,7 +2704,7 @@ description = "So very, very, very good." taste_description = "sweet and creamy" color = "#B7EA75" - strength = 15 + strength = 45 // it is 1/3 whiskey, come on glass_name = "Aloe" glass_desc = "Very, very, very good." @@ -2693,7 +2738,7 @@ description = "Ultimate refreshment." taste_description = "ice cold vodka" color = "#56DEEA" - strength = 12 + strength = 45 // i'm sorry, it's 1/3 vodka, it should not be stronger than it somehow adj_temp = 20 targ_temp = 330 @@ -2707,7 +2752,7 @@ taste_description = "coffee, almonds, and whiskey, with a kick" reagent_state = REAGENT_LIQUID color = "#666300" - strength = 10 + strength = 10 // it's sweet sciency magic, i'll allow it druggy = 50 glass_name = "Atomic Bomb" @@ -2731,7 +2776,7 @@ description = "Tropical cocktail." taste_description = "lime and orange" color = "#FF7F3B" - strength = 25 + strength = 90 // 1/6th rum glass_name = "Bahama Mama" glass_desc = "Tropical cocktail." @@ -2753,7 +2798,7 @@ description = "Barefoot and pregnant." taste_description = "creamy berries" color = "#FFCDEA" - strength = 30 + strength = 45 // 1/3 vermouth glass_name = "Barefoot" glass_desc = "Barefoot and pregnant." @@ -2778,10 +2823,10 @@ /datum/reagent/ethanol/bilk name = "Bilk" id = "bilk" - description = "This appears to be beer mixed with milk. Disgusting." + description = "This appears to be beer mixed with milk. Odd." taste_description = "sour milk" color = "#895C4C" - strength = 50 + strength = 100 // 50% beer nutriment_factor = 2 glass_name = "Bilk" @@ -2804,7 +2849,7 @@ description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." taste_description = "tomatoes with a hint of lime" color = "#B40000" - strength = 15 + strength = 90 // 1/6 vodka glass_name = "Bloody Mary" glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." @@ -2815,7 +2860,7 @@ description = "Ewww..." taste_description = "sweet 'n creamy" color = "#8CFF8C" - strength = 30 + strength = 75 // 1/5 rum glass_name = "Booger" glass_desc = "Ewww..." @@ -2838,7 +2883,7 @@ description = "You take a tiny sip and feel a burning sensation..." taste_description = "constantly changing flavors" color = "#2E6671" - strength = 10 + strength = 90 // 1/9 vodka (this used to be 10! 10!! why so strong!) glass_name = "Changeling Sting" glass_desc = "A stingy drink." @@ -2883,7 +2928,7 @@ description = "Refreshingly lemony, deliciously dry." taste_description = "dry, tart lemons" color = "#FFFFAE" - strength = 30 + strength = 45 // 1/3 gin glass_name = "Gin Fizz" glass_desc = "Refreshingly lemony, deliciously dry." @@ -2905,7 +2950,7 @@ taste_description = "a poor excuse for alcohol" reagent_state = REAGENT_LIQUID color = "#FFBB00" - strength = 100 + strength = 30 glass_name = "Grog" @@ -2917,7 +2962,7 @@ description = "The surprise is, it's green!" taste_description = "tartness and bananas" color = "#2E6671" - strength = 15 + strength = 50 // should be ~96, but probably not glass_name = "Erika Surprise" glass_desc = "The surprise is, it's green!" @@ -2930,7 +2975,7 @@ taste_mult = 5 reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 10 + strength = 8 // 10 seems week for the joke druggy = 15 glass_name = "Pan-Galactic Gargle Blaster" @@ -2978,7 +3023,7 @@ description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" taste_description = "pure alcohol" color = "#4C3100" - strength = 25 + strength = 20 toxicity = 2 glass_name = "Hooch" @@ -3004,7 +3049,7 @@ description = "Mmm, tastes like chocolate cake..." taste_description = "delicious anger" color = "#2E6671" - strength = 15 + strength = 30 glass_name = "Irish Car Bomb" glass_desc = "An irish car bomb." @@ -3015,7 +3060,7 @@ description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." taste_description = "giving up on the day" color = "#4C3100" - strength = 15 + strength = 50 glass_name = "Irish coffee" glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." @@ -3037,7 +3082,7 @@ description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." taste_description = "sweet tea, with a kick" color = "#895B1F" - strength = 12 + strength = 20 glass_name = "Long Island iced tea" glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." @@ -3094,7 +3139,7 @@ taste_description = "sweet yet alcoholic" reagent_state = REAGENT_LIQUID color = "#FFBB00" - strength = 30 + strength = 50 nutriment_factor = 1 glass_name = "Mead" @@ -3175,9 +3220,9 @@ var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART] if (L && istype(L)) if(. < 120) - L.take_damage(10 * removed, 0) + L.take_damage(10 * removed) else - L.take_damage(100, 0) + L.take_damage(100) /datum/reagent/ethanol/red_mead name = "Red Mead" @@ -3185,7 +3230,7 @@ description = "The true Viking's drink! Even though it has a strange red color." taste_description = "sweet and salty alcohol" color = "#C73C00" - strength = 30 + strength = 50 blood_content = 0.5 glass_name = "Red Mead" @@ -3210,7 +3255,7 @@ description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." taste_description = "oranges" color = "#A68310" - strength = 15 + strength = 45 // 1/3 vodka glass_name = "Screwdriver" glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." @@ -3244,7 +3289,7 @@ description = "A cold refreshment" taste_description = "refreshing cold" color = "#FFFFFF" - strength = 30 + strength = 100 //50% beer glass_name = "Snow White" glass_desc = "A cold refreshment." @@ -3266,7 +3311,7 @@ description = "Tastes like terrorism!" taste_description = "strong alcohol" color = "#2E6671" - strength = 10 + strength = 30 glass_name = "Syndicate Bomb" glass_desc = "Tastes like terrorism!" @@ -3325,7 +3370,7 @@ description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." taste_description = "shaken, not stirred" color = "#0064C8" - strength = 12 + strength = 15 glass_name = "Vodka Martini" glass_desc ="A bastardization of the classic martini. Still great." @@ -3337,7 +3382,7 @@ description = "For when a gin and tonic isn't russian enough." taste_description = "tart bitterness" color = "#0064C8" // rgb: 0, 100, 200 - strength = 15 + strength = 30 glass_name = "Vodka and Tonic" glass_desc = "For when a gin and tonic isn't Russian enough." @@ -3349,7 +3394,7 @@ description = "That's just, like, your opinion, man..." taste_description = "coffee icecream" color = "#A68340" - strength = 15 + strength = 20 glass_name = "White Russian" glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." @@ -3361,7 +3406,7 @@ description = "Whiskey, mixed with cola. Surprisingly refreshing." taste_description = "cola with an alcoholic undertone" color = "#3E1B00" - strength = 25 + strength = 45 glass_name = "Whiskey Cola" glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." @@ -3373,7 +3418,7 @@ description = "Ultimate refreshment." taste_description = "carbonated whiskey" color = "#EAB300" - strength = 15 + strength = 45 glass_name = "Whiskey Soda" glass_desc = "Ultimate refreshment." @@ -3384,7 +3429,7 @@ description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils." taste_description = "unspeakable whiskey bliss" color = "#523600" - strength = 7 + strength = 10 glass_name = "special blend whiskey" glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." @@ -3480,7 +3525,7 @@ description = "For when you're too weeb for a real martini." taste_description = "dry alcohol" color = "#0064C8" - strength = 15 + strength = 30 glass_name = "Saketini" glass_desc = "What are you doing drinking this outside of New Kyoto?" @@ -3488,13 +3533,13 @@ /datum/reagent/ethanol/coffee/elysiumfacepunch name = "Elysium Facepunch" id = "elysiumfacepunch" - description = "A lothesome cocktail favored by Heaven's skeleton shift workers." + description = "A loathsome cocktail favored by Heaven's skeleton shift workers." taste_description = "sour coffee" color = "#8f7729" strength = 20 glass_name = "Elysium Facepunch" - glass_desc = "A lothesome cocktail favored by Heaven's skeleton shift workers." + glass_desc = "A loathsome cocktail favored by Heaven's skeleton shift workers." /datum/reagent/ethanol/erebusmoonrise name = "Erebus Moonrise" @@ -3536,7 +3581,7 @@ description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." taste_description = "impossibly rich alcohol" color = "#614126" - strength = 9 + strength = 15 glass_name = "Euphoria" glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." @@ -3547,7 +3592,7 @@ description = "Common in the entertainment districts of Titan." taste_description = "sweet alcohol" color = "#614126" - strength = 50 + strength = 100 glass_name = "Xanadu Cannon" glass_desc = "Common in the entertainment districts of Titan." @@ -3602,7 +3647,7 @@ description = "A blend of fermented fruits and herbs, commonly used in cocktails." taste_description = "sharp bitterness" color = "#9b6241" // rgb(155, 98, 65) - strength = 50 + strength = 100 glass_name = "Bitters" glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." @@ -3789,7 +3834,7 @@ description = "A classic mix of whiskey and sugar... simple and direct." taste_description = "smokey, divine whiskey" color = "#774410" // rgb(119, 68, 16) - strength = 15 + strength = 40 glass_name = "Old Fashioned" glass_desc = "A classic mix of whiskey and sugar... simple and direct." @@ -3800,7 +3845,7 @@ description = "Refeshing rum and citrus. Time for a tropical get away." taste_description = "refreshing citrus and rum" color = "#d1ff49" // rgb(209, 255, 73 - strength = 25 + strength = 40 glass_name = "Daiquiri" glass_desc = "Refeshing rum and citrus. Time for a tropical get away." @@ -3811,7 +3856,7 @@ description = "Minty rum and citrus, made for sailing." taste_description = "minty rum and lime" color = "#d1ff49" // rgb(209, 255, 73 - strength = 30 + strength = 75 // 1/5 rum glass_name = "Mojito" glass_desc = "Minty rum and citrus, made for sailing." @@ -3823,7 +3868,7 @@ description = "Tequila and citrus, iced just right..." taste_description = "grapefruit and cold fire" color = "#ffb070" // rgb(255, 176, 112) - strength = 20 + strength = 75 // 1/3 tequila glass_name = "Paloma" glass_desc = "Tequila and citrus, iced just right..." @@ -3835,7 +3880,7 @@ description = "Wine Brandy, Lemon, and a dream. A South American classic" taste_description = "light sweetness" color = "#f9f96b" // rgb(249, 249, 107) - strength = 30 + strength = 60 // 1/3 brandy glass_name = "Pisco Sour" glass_desc = "South American bliss, served ice cold." @@ -3846,7 +3891,7 @@ description = "Minty, rich, and painfully cold. It's a blizzard in a cup." taste_description = "biting cold" color = "#ffe8c4" // rgb(255, 232, 196) - strength = 30 + strength = 45 // 1/3 whiskey adj_temp = -20 targ_temp = 220 //Dangerous to certain races. Drink in moderation. @@ -3859,7 +3904,7 @@ description = "Minty and refreshing, perfect for a hot day." taste_description = "refreshing mint" color = "#bbfc8a" // rgb(187, 252, 138) - strength = 25 + strength = 45 adj_temp = -5 glass_name = "Mint Julep" @@ -3882,7 +3927,7 @@ description = "Number one drink AND fueling choice for Russians multiverse-wide." taste_description = "russian steel and a hint of grain" color = "#0064C8" - strength = 50 + strength = 10 glass_name = "Godka" glass_desc = "The glass is barely able to contain the wodka. Xynta." @@ -3972,16 +4017,6 @@ glass_name = "Gibbfloat" glass_desc = "A tasty, frothy drink" -/datum/reagent/ethanol/mintjulep - name = "Mint Julep" - id = "mintjulep" - description = "Really not just watery whiskey.. I think." - taste_description = "mint infused whiskey" - strength = 80 - - glass_name = "Mint Julep" - glass_desc = "Really not just watery whiskey.. I think." - /datum/reagent/ethanol/planterspunch name = "Planters Punch" id = "planterspunch" @@ -3998,7 +4033,7 @@ id = "olympusmons" description = "For those that need the extra kick." taste_description = "stronge coffee infused booze" - strength = 35 + strength = 25 glass_name = "Olympus Mons" glass_desc = "For those that need the extra kick." @@ -4018,7 +4053,7 @@ id = "junglejuice" description = "An overload of sweetness and sugary goodness." taste_description = "fruits and bad decisions" - strength = 55 + strength = 40 glass_name = "Jungle Juice" glass_desc = "An overload of sweetness and sugary goodness." @@ -4028,7 +4063,7 @@ id = "gimlet" description = "For those who want to look fancy with their gin." taste_description = "lime infused tree" - strength = 20 + strength = 45 // 1/3 gin glass_name = "Gimlet" glass_desc = "For those who want to look fancy with their gin." @@ -4038,7 +4073,7 @@ id = "firepunch" description = "A spicy take on a summer classic." taste_description = "rum and sugar" - strength = 70 + strength = 45 targ_temp = 300 glass_name = "Fire Punch" @@ -4169,7 +4204,7 @@ id = "bigiron" description = "Have this one, partner. Then have nineteen more." taste_description = "a mysterious visit and the red Texas sky" - strength = 45 + strength = 30 // 2/3 rum, rounded up to 30 (was 45) glass_name = "Big Iron" glass_desc = "Have this one, partner. Then have nineteen more." @@ -4201,7 +4236,7 @@ id = "phobos" description = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." taste_description = "grain alcohol" - strength = 70 + strength = 15 glass_name = "Phobos" glass_desc = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." @@ -4211,7 +4246,7 @@ id = "greenstuff" description = "Tyrmalin grog aggressively blended with unfiltered absinthe." taste_description = "black licorice and thick malt" - strength = 70 + strength = 5 glass_name = "Green Stuff" glass_desc = "Tyrmalin grog aggressively blended with unfiltered absinthe." @@ -4246,7 +4281,7 @@ description = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." taste_description = "honey and royalty" color = "#f0d76b" - strength = 20 + strength = 50 glass_name = "Royal Jelly" glass_desc = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." @@ -4257,7 +4292,7 @@ description = "A holiday beverage akin to eggnog, made with coconut milk." taste_description = "creamy spiced coconut" color = "#ffffff" - strength = 20 + strength = 50 glass_name = "Coquito" glass_desc = "It's a little coconut!" @@ -4268,11 +4303,22 @@ description = "Rum, pineapple, and coconut plended up with ice." taste_description = "coconuts and pineapple soaked in rum" color = "#fdf49e" - strength = 20 + strength = 45 // 1/3 rum glass_name = "Piña Colada" glass_desc = "For those not into yoga." +/datum/reagent/ethanol/mimosa + name = "Mimosa" + id = "mimosa" + description = "An airy blend of champagne and orange juice, often drunk as a morning refreshment." + taste_description = "orange juice and a dry, bubbly wine" + color = "#daa411" + strength = 60 // 1/2 champagne + + glass_name = "Mimosa" + glass_desc = "A bubbly and tangy refreshment." + //Never Fade Away /datum/reagent/ethanol/silverhand name = "Johnny Silverhand" @@ -4580,7 +4626,7 @@ /datum/reagent/nutriment/triglyceride/oil/affect_touch(mob/living/carbon/M, alien, removed) var/dfactor = heatdamage(M) if (dfactor) - M.take_organ_damage(0, removed * 1.5 * dfactor) + M.take_random_targeted_damage(brute = 0, brute = removed * 1.5 * dfactor) data["temperature"] -= (6 * removed) / (1 + volume*0.1)//Cools off as it burns you if (lastburnmessage+100 < world.time ) to_chat(M, SPAN_DANGER("Searing hot oil burns you, wash it off quick!")) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm index 3ae6b830e5..168a979eef 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm @@ -1097,7 +1097,7 @@ M.cure_radiation(RAD_MOB_CURE_STRENGTH_ARITHRAZINE(removed)) M.adjustToxLoss(-10 * removed) if(prob(60)) - M.take_organ_damage(4 * removed, 0) + M.take_random_targeted_damage(brute = 4 * removed, brute = 0) /datum/reagent/spaceacillin name = "Spaceacillin" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm index 78f9374e8a..1ead6ce13e 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm @@ -495,7 +495,7 @@ scannable = 1 /datum/reagent/defective_nanites/affect_blood(mob/living/carbon/M, alien, removed) - M.take_organ_damage(2 * removed, 2 * removed) + M.take_random_targeted_damage(brute = 2 * removed, brute = 2 * removed) M.adjustOxyLoss(4 * removed) M.adjustToxLoss(2 * removed) M.adjustCloneLoss(2 * removed) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm index 2250a18fc8..af7c59e6b2 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm @@ -88,7 +88,7 @@ L.adjust_fire_stacks(amount / fire_mult) /datum/reagent/toxin/hydrophoron/affect_touch(mob/living/carbon/M, alien, removed) - M.take_organ_damage(0, removed * 0.1) //being splashed directly with hydrophoron causes minor chemical burns + M.take_random_targeted_damage(brute = 0, brute = removed * 0.1) //being splashed directly with hydrophoron causes minor chemical burns if(prob(10 * fire_mult)) M.pl_effects() @@ -137,7 +137,7 @@ M.adjust_fire_stacks(removed / 5) if(alien == IS_VOX || alien == IS_XENOHYBRID) return - M.take_organ_damage(0, removed * 0.1) //being splashed directly with phoron causes minor chemical burns + M.take_random_targeted_damage(brute = 0, brute = removed * 0.1) //being splashed directly with phoron causes minor chemical burns if(prob(50)) M.pl_effects() @@ -233,7 +233,7 @@ M.emote(pick("twitch", "blink_r", "shiver")) if(prob(15)) M.visible_message("[M] shudders violently.", "You shudder uncontrollably, it hurts.") - M.take_organ_damage(6 * removed, 0) + M.take_random_targeted_damage(brute = 6 * removed, brute = 0) M.add_chemical_effect(CE_SPEEDBOOST, 1) /datum/reagent/toxin/potassium_chloride @@ -548,11 +548,11 @@ M.afflict_stun(20 * 6) return if(alien == IS_SKRELL) - M.take_organ_damage(2.4 * removed, 0) + M.take_random_targeted_damage(brute = 2.4 * removed, brute = 0) if(M.losebreath < 10) M.AdjustLosebreath(1) else - M.take_organ_damage(3 * removed, 0) + M.take_random_targeted_damage(brute = 3 * removed, brute = 0) if(M.losebreath < 15) M.AdjustLosebreath(1) @@ -1154,4 +1154,4 @@ affects_robots = TRUE /datum/reagent/grubshock/affect_blood(mob/living/carbon/M, alien, removed) - M.take_organ_damage(0, removed * power * 0.2) + M.take_random_targeted_damage(brute = 0, brute = removed * power * 0.2) diff --git a/code/modules/reagents/chemistry/reagents/core/elements.dm b/code/modules/reagents/chemistry/reagents/core/elements.dm index 0a453e4e84..afcd425c11 100644 --- a/code/modules/reagents/chemistry/reagents/core/elements.dm +++ b/code/modules/reagents/chemistry/reagents/core/elements.dm @@ -54,10 +54,10 @@ color = "#d1db77" /datum/reagent/chlorine/affect_blood(mob/living/carbon/M, alien, removed) - M.take_organ_damage(1*REM, 0) + M.take_random_targeted_damage(brute = 1*REM, brute = 0) /datum/reagent/chlorine/affect_touch(mob/living/carbon/M, alien, removed) - M.take_organ_damage(1*REM, 0) + M.take_random_targeted_damage(brute = 1*REM, brute = 0) /datum/reagent/copper name = "Copper" diff --git a/code/modules/reagents/items/hypospray.dm b/code/modules/reagents/items/hypospray.dm index 2a79cd0d55..af5633b3c8 100644 --- a/code/modules/reagents/items/hypospray.dm +++ b/code/modules/reagents/items/hypospray.dm @@ -76,6 +76,9 @@ /obj/item/hypospray/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) if(istype(I, /obj/item/reagent_containers/glass/hypovial)) var/obj/item/reagent_containers/glass/hypovial/vial = I + if(istype(vial, /obj/item/reagent_containers/glass/hypovial/large) && !allow_large) + user.action_feedback(SPAN_WARNING("[vial] requires an advanced hypospray to use!"), src) + return CLICKCHAIN_DO_NOT_PROPAGATE if(!user.transfer_item_to_loc(vial, src)) user.action_feedback(SPAN_WARNING("[vial] is stuck to your hand!"), src) return CLICKCHAIN_DO_NOT_PROPAGATE diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index bf6379db1b..7e3150abd0 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -217,7 +217,7 @@ ui = new(user, src, "ChemMaster", name) ui.open() -/obj/machinery/chem_master/ui_data(mob/user) +/obj/machinery/chem_master/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["mode"] = mode @@ -265,7 +265,7 @@ return data -/obj/machinery/chem_master/ui_static_data(mob/user) +/obj/machinery/chem_master/ui_static_data(mob/user, datum/tgui/ui) var/list/static_data = list() //Calculated once since it'll never change if(!pill_styles || !bottle_styles || !chosen_patch_style || !patch_styles) @@ -277,7 +277,7 @@ return static_data -/obj/machinery/chem_master/ui_act(action, params) +/obj/machinery/chem_master/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/reagents/machinery/dispenser/dispenser.dm b/code/modules/reagents/machinery/dispenser/dispenser.dm index df36bf6607..cb9703c76e 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser.dm @@ -155,7 +155,7 @@ macros_built[++macros_built.len] = L | list("index" = ++index) return macros_built -/obj/machinery/chemical_dispenser/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/chemical_dispenser/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["cartridges"] = ui_cartridge_data() var/list/chems_built = list() @@ -164,7 +164,7 @@ for(var/id in synth.reagents_provided) if(chems_built[id]) continue - var/datum/reagent/R = SSchemistry.get_reagent(id) + var/datum/reagent/R = SSchemistry.fetch_reagent(id) if(!R) continue chems_built[id] = list( @@ -180,7 +180,7 @@ .["macros_full"] = length(macros) >= MAX_MACROS .["macros_max_steps"] = MAX_MACRO_STEPS -/obj/machinery/chemical_dispenser/ui_data(mob/user) +/obj/machinery/chemical_dispenser/ui_data(mob/user, datum/tgui/ui) . = ..() .["amount"] = dispense_amount .["amount_max"] = dispense_amount_max @@ -198,7 +198,7 @@ .["recharging"] = charging .["recharge_rate"] = recharge_rate -/obj/machinery/chemical_dispenser/ui_act(action, params) +/obj/machinery/chemical_dispenser/ui_act(action, list/params, datum/tgui/ui) . = ..() if(.) return diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index f7b9297eb7..d6ad78fc19 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -257,13 +257,14 @@ return user.visible_message("[user] stabs [target] in \the [hit_area] with [src.name]!") - - if(affecting.take_damage(3)) - H.UpdateDamageIcon() - + affecting.inflict_bodypart_damage( + brute = 3, + damage_mode = DAMAGE_MODE_SHARP, + weapon_descriptor = "a needle", + ) else user.visible_message("[user] stabs [target] with [src.name]!") - target.take_organ_damage(3)// 7 is the same as crowbar punch + target.take_random_targeted_damage(brute = 3)// 7 is the same as crowbar punch var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand var/contained = reagents.get_reagents() diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 8c50706afa..fb9373ecc1 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -29,6 +29,8 @@ /obj/machinery/conveyor/centcom_auto id = "round_end_belt" + + // create a conveyor /obj/machinery/conveyor/Initialize(mapload, newdir, on = 0) . = ..() @@ -218,6 +220,8 @@ var/list/conveyors // the list of converyors that are controlled by this switch anchored = 1 +/obj/machinery/conveyor_switch/two_way_on + position = 1 /obj/machinery/conveyor_switch/Initialize(mapload) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index d41c9d9fa2..75dc74bfb1 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -134,7 +134,7 @@ GM.forceMove(src) GM.update_perspective() for (var/mob/C in viewers(src)) - C.show_message("[GM.name] has been placed in the [src] by [user].", 3) + C.show_message("[GM.name] has been placed in \the [src] by [user].", 3) qdel(G) add_attack_logs(user,GM,"Disposals dunked") @@ -143,11 +143,11 @@ if(!user.attempt_insert_item_for_installation(I, src)) return - to_chat(user, "You place \the [I] into the [src].") + to_chat(user, "You place \the [I] into \the [src].") for(var/mob/M in viewers(src)) if(M == user) continue - M.show_message("[user.name] places \the [I] into the [src].", 3) + M.show_message("[user.name] places \the [I] into \the [src].", 3) update() @@ -178,11 +178,11 @@ return if(target == user && !user.stat && CHECK_ALL_MOBILITY(user, MOBILITY_CAN_MOVE | MOBILITY_CAN_USE)) // if drop self, then climbed in // must be awake, not stunned or whatever - msg = "[user.name] climbs into the [src]." - to_chat(user, "You climb into the [src].") + msg = "[user.name] climbs into \the [src]." + to_chat(user, "You climb into \the [src].") else if(target != user && !user.restrained() && !user.stat && CHECK_ALL_MOBILITY(user, MOBILITY_CAN_MOVE | MOBILITY_CAN_USE)) - msg = "[user.name] stuffs [target.name] into the [src]!" - to_chat(user, "You stuff [target.name] into the [src]!") + msg = "[user.name] stuffs [target.name] into \the [src]!" + to_chat(user, "You stuff [target.name] into \the [src]!") add_attack_logs(user,target,"Disposals dunked") else @@ -493,6 +493,38 @@ else return ..(mover, target) + + +/obj/machinery/disposal/wall + name = "inset disposal unit" + icon_state = "wall" + + density = FALSE + +/obj/machinery/disposal/wall/Initialize() + . = ..() + + spawn(1 SECOND) // Fixfix for weird interaction with buildmode or other late-spawning. + update() + +/obj/machinery/disposal/wall/update() + ..() + + switch(dir) + if(1) + pixel_x = 0 + pixel_y = -32 + if(2) + pixel_x = 0 + pixel_y = 32 + if(4) + pixel_x = -32 + pixel_y = 0 + if(8) + pixel_x = 32 + pixel_y = 0 + + // virtual disposal object // travels through pipes in lieu of actual items // contents will be items flushed by the disposal @@ -563,6 +595,7 @@ // movement process, persists while holder is moving through pipes /obj/structure/disposalholder/proc/move() var/obj/structure/disposalpipe/last + // todo: while this is fucking awful? while(active) sleep(1) // was 1 if(!loc) return // check if we got GC'd @@ -570,7 +603,7 @@ if(hasmob && prob(3)) for(var/mob/living/H in src) if(!istype(H,/mob/living/silicon/robot/drone)) //Drones use the mailing code to move through the disposal system, - H.take_overall_damage(20, 0, "Blunt Trauma")//horribly maim any living creature jumping down disposals. c'est la vie + H.take_overall_damage(20, 0, weapon_descriptor = "blunt trauma")//horribly maim any living creature jumping down disposals. c'est la vie var/obj/structure/disposalpipe/curr = loc last = curr diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index c624b7ddff..d2627e04d2 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -329,7 +329,7 @@ item_state = "electronic" slot_flags = SLOT_BELT -/obj/item/destTagger/ui_state(mob/user, datum/tgui_module/module) +/obj/item/destTagger/ui_state() return GLOB.inventory_state /obj/item/destTagger/ui_interact(mob/user, datum/tgui/ui) @@ -352,7 +352,7 @@ return ui_interact(user) -/obj/item/destTagger/ui_act(action, params) +/obj/item/destTagger/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE add_fingerprint(usr) diff --git a/code/modules/research/designs/mining_toys.dm b/code/modules/research/designs/mining_toys.dm index 867a2ecee8..95d35fa35f 100644 --- a/code/modules/research/designs/mining_toys.dm +++ b/code/modules/research/designs/mining_toys.dm @@ -82,3 +82,10 @@ req_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 4) materials_base = list(MAT_STEEL = 2000, MAT_GLASS = 1000) build_path = /obj/item/mining_scanner/advanced + +/datum/design/science/mining/bs_mining_satchel + design_name = "Mining Satchel of Holding" + id = "bs_mining_satchel" + req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6, TECH_PHORON = 4) + materials_base = list(MAT_GOLD = 1500, MAT_DIAMOND = 750, MAT_URANIUM = 150, MAT_PHORON = 100, MAT_VERDANTIUM = 100) + build_path = /obj/item/storage/bag/ore/bluespace diff --git a/code/modules/research/designs/prosfab_designs.dm b/code/modules/research/designs/prosfab_designs.dm index 7adc93ae44..262d4513dc 100644 --- a/code/modules/research/designs/prosfab_designs.dm +++ b/code/modules/research/designs/prosfab_designs.dm @@ -497,6 +497,14 @@ materials_base = list(MAT_STEEL = 60000, MAT_GLASS = 4500, MAT_GOLD = 1500, MAT_DIAMOND = 375) build_path = /obj/item/borg/upgrade/tasercooler +/datum/design/science/prosfab/robot_upgrade/bluespaceoresatchel + design_name = "Bluespace Ore Satchel Module" + desc = "Improves the ore satchels of mining units to hold a lot more ores." + id = "borg_bsorebag_module" + req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6, TECH_PHORON = 4) + materials_base = list(MAT_STEEL = 7500, MAT_GOLD = 1500, MAT_DIAMOND = 750, MAT_URANIUM = 150, MAT_PHORON = 1000) + build_path = /obj/item/borg/upgrade/bluespaceorebag + /datum/design/science/prosfab/robot_upgrade/jetpack design_name = "Jetpack Module" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." diff --git a/code/modules/research/machinery/rdconsole_tgui.dm b/code/modules/research/machinery/rdconsole_tgui.dm index 95a256cf3d..78b658178a 100644 --- a/code/modules/research/machinery/rdconsole_tgui.dm +++ b/code/modules/research/machinery/rdconsole_tgui.dm @@ -19,12 +19,12 @@ ui = new(user, src, "ResearchConsole", name) ui.open() -/obj/machinery/computer/rdconsole/ui_status(mob/user) +/obj/machinery/computer/rdconsole/ui_status(mob/user, datum/ui_state/state) . = ..() if(locked && !allowed(user) && !emagged) . = min(., UI_UPDATE) -/obj/machinery/computer/rdconsole/ui_static_data(mob/user) +/obj/machinery/computer/rdconsole/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["tech"] = tgui_GetResearchLevelsInfo() @@ -35,7 +35,7 @@ return data -/obj/machinery/computer/rdconsole/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/rdconsole/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["locked"] = locked diff --git a/code/modules/research/machinery/server.dm b/code/modules/research/machinery/server.dm index b55ba68b2c..933962807f 100644 --- a/code/modules/research/machinery/server.dm +++ b/code/modules/research/machinery/server.dm @@ -156,7 +156,7 @@ var/list/consoles = list() var/badmin = 0 -/obj/machinery/computer/rdservercontrol/ui_status(mob/user) +/obj/machinery/computer/rdservercontrol/ui_status(mob/user, datum/ui_state/state) . = ..() if(!allowed(user) && !emagged) . = min(., UI_UPDATE) @@ -167,7 +167,7 @@ ui = new(user, src, "ResearchServerController", name) ui.open() -/obj/machinery/computer/rdservercontrol/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/computer/rdservercontrol/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["badmin"] = badmin diff --git a/code/modules/resleeving/infomorph.dm b/code/modules/resleeving/infomorph.dm index 95f05fc7a3..8813bb8c11 100644 --- a/code/modules/resleeving/infomorph.dm +++ b/code/modules/resleeving/infomorph.dm @@ -235,7 +235,10 @@ var/list/infomorph_emotions = list( var/mob/living/carbon/human/H = holder for(var/obj/item/organ/external/affecting in H.organs) if(card in affecting.implants) - affecting.take_damage(rand(30,50)) + affecting.inflict_bodypart_damage( + brute = rand(30, 50), + weapon_descriptor = "bursting", + ) affecting.implants -= card H.visible_message("\The [src] explodes out of \the [H]'s [affecting.name] in shower of gore!") break diff --git a/code/modules/sculpting/sculpting_block.dm b/code/modules/sculpting/sculpting_block.dm index c759b5e100..7ebba835e7 100644 --- a/code/modules/sculpting/sculpting_block.dm +++ b/code/modules/sculpting/sculpting_block.dm @@ -165,7 +165,7 @@ otherwise_self = SPAN_NOTICE("You start slicing [src] apart."), ) log_construction(e_args, src, "started deconstructing") - if(!use_welder(I, e_args, flags, 7 SECONDS, 3)) + if(!use_welder(I, e_args, flags, 7 SECONDS)) return TRUE e_args.visible_feedback( target = src, diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index d8e29e4ce5..8f519ca3af 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -69,7 +69,7 @@ GLOBAL_VAR_INIT(security_level, SEC_LEVEL_GREEN) GLOB.security_level = SEC_LEVEL_DELTA var/newlevel = get_security_level() - for(var/obj/machinery/firealarm/FA in GLOB.machines) + for(var/obj/machinery/fire_alarm/FA in GLOB.machines) if(FA.z in (LEGACY_MAP_DATUM).contact_levels) FA.set_security_level(newlevel) for(var/obj/machinery/status_display/FA in GLOB.machines) diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index 169fcecce1..65caacedfc 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -402,7 +402,7 @@ ui = new(user, src, "OvermapShieldGenerator", name) // 500, 800 ui.open() -/obj/machinery/power/shield_generator/ui_data(mob/user) +/obj/machinery/power/shield_generator/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["running"] = running @@ -439,7 +439,7 @@ return ui_interact(user) -/obj/machinery/power/shield_generator/ui_status(mob/user) +/obj/machinery/power/shield_generator/ui_status(mob/user, datum/ui_state/state) if(issilicon(user) && !Adjacent(user) && ai_control_disabled) return UI_UPDATE if(panel_open) diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index 1752386de6..d1452c4c70 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -47,7 +47,7 @@ program = /datum/computer/file/embedded_program/docking/simple var/datum/shuttle/autodock/ferry/escape_pod/pod -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/simple/docking_program = program // Cast to proper type . = list( @@ -59,7 +59,7 @@ "internalTemplateName" = "EscapePodConsole", ) -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_act(action, params) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -81,7 +81,7 @@ program = /datum/computer/file/embedded_program/docking/simple/escape_pod_berth valid_actions = list("toggle_override", "force_door") -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_data(mob/user) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_data(mob/user, datum/tgui/ui) var/datum/computer/file/embedded_program/docking/simple/docking_program = program // Cast to proper type var/armed = null diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index a4314251b0..9459cc25fb 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -72,7 +72,7 @@ return FALSE return TRUE -/obj/machinery/computer/shuttle_control/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if(skip_act) @@ -113,7 +113,7 @@ ui.open() // We delegate populating data to another proc to make it easier for overriding types to add their data. -/obj/machinery/computer/shuttle_control/ui_data(mob/user) +/obj/machinery/computer/shuttle_control/ui_data(mob/user, datum/tgui/ui) var/datum/shuttle/autodock/shuttle = SSshuttle.shuttles[shuttle_tag] if(!istype(shuttle)) to_chat(user, "Unable to establish link with the shuttle.") diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm index 5850d8ca65..7e15717798 100644 --- a/code/modules/shuttles/shuttle_console_multi.dm +++ b/code/modules/shuttles/shuttle_console_multi.dm @@ -14,7 +14,7 @@ // "engines_charging" = ((shuttle.last_move + (shuttle.cooldown SECONDS)) > world.time), // Replaced by longer warmup_time ) -/obj/machinery/computer/shuttle_control/multi/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/multi/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index a72fc239b5..9e490e5247 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -205,7 +205,7 @@ return ..() -/obj/machinery/computer/shuttle_control/web/ui_data(mob/user) +/obj/machinery/computer/shuttle_control/web/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/routes[0] @@ -289,7 +289,7 @@ return data -/obj/machinery/computer/shuttle_control/web/ui_act(action, list/params) +/obj/machinery/computer/shuttle_control/web/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/species/promethean/promethean.dm b/code/modules/species/promethean/promethean.dm index cedc762cc3..fa199a27a6 100644 --- a/code/modules/species/promethean/promethean.dm +++ b/code/modules/species/promethean/promethean.dm @@ -74,7 +74,7 @@ var/datum/species/shapeshifter/promethean/prometheans cold_level_2 = 220 cold_level_3 = 130 - heat_level_1 = 320 + heat_level_1 = 340 heat_level_2 = 370 heat_level_3 = 600 diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm index f20b7b9826..b01fdcd25f 100644 --- a/code/modules/species/protean/protean.dm +++ b/code/modules/species/protean/protean.dm @@ -210,7 +210,7 @@ var/obj/item/organ/external/E = H.get_organ(BP_TORSO) return E.brute_dam + E.burn_dam -/datum/species/protean/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/protean/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if((getActualDamage(H) > damage_to_blob) && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever). H.nano_intoblob() return ..() //Any instakill shot runtimes since there are no organs after this. No point to not skip these checks, going to nullspace anyway. diff --git a/code/modules/species/protean/protean_blob.dm b/code/modules/species/protean/protean_blob.dm index f93379a308..70bd8bae23 100644 --- a/code/modules/species/protean/protean_blob.dm +++ b/code/modules/species/protean/protean_blob.dm @@ -73,6 +73,9 @@ add_verb(src, /mob/living/simple_mob/protean_blob/proc/appearanceswitch) add_verb(src, /mob/living/simple_mob/protean_blob/proc/rig_transform) add_verb(src, /mob/living/simple_mob/protean_blob/proc/leap_attack) + add_verb(src, /mob/living/simple_mob/protean_blob/proc/chameleon_apperance) + add_verb(src, /mob/living/simple_mob/protean_blob/proc/chameleon_color) + add_verb(src, /mob/living/simple_mob/protean_blob/proc/chameleon_apperance_rig) add_verb(src, /mob/living/proc/usehardsuit) INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, update_health)) else @@ -145,16 +148,10 @@ return FALSE //ok so tasers hurt protean blobs what the fuck /mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount,var/include_robo) - if(humanform) - humanform.adjustBruteLossByPart(amount, BP_TORSO) - else - ..() + return humanform? humanform.take_targeted_damage(brute = amount, body_zone = BP_TORSO) : ..() /mob/living/simple_mob/protean_blob/adjustFireLoss(var/amount,var/include_robo) - if(humanform) - humanform.adjustFireLossByPart(amount, BP_TORSO) - else - ..() + return humanform? humanform.take_targeted_damage(burn = amount, body_zone = BP_TORSO) : ..() // citadel hack - FUCK YOU DIE CORRECTLY THIS ENTIRE FETISH RACE IS A SORRY MISTAKE /mob/living/simple_mob/protean_blob/death(gibbed, deathmessage = "dissolves away, leaving only a few spare parts!") @@ -530,6 +527,11 @@ icon_living = "puddle0" update_icon() + if(istype(loc, /obj/item/holder)) + var/obj/item/holder/H = loc + H.sync() + + /mob/living/simple_mob/protean_blob/proc/leap_attack() set name = "Pounce" set desc = "Allows a protean blob to launch itself at people." @@ -560,7 +562,7 @@ return visible_message("[src] coils itself up like a spring, preparing to leap at [target]!") - if(do_after(src, 7.5 SECONDS, target)) //7.5 seconds. + if(do_after(src, 1 SECOND, target)) //1 second if(buckled || pinned.len) return @@ -569,7 +571,10 @@ src.forceMove(H) switch(src.zone_sel.selecting) - if(BP_GROIN) + if(BP_L_LEG) + targeted_area = SLOT_ID_UNIFORM //fetish_code.rtf + target_displayname = "body" + if(BP_R_LEG) targeted_area = SLOT_ID_UNIFORM //fetish_code.rtf target_displayname = "body" if(BP_TORSO) @@ -581,6 +586,24 @@ if(O_MOUTH) targeted_area = SLOT_ID_MASK target_displayname = "face" + if(BP_R_HAND) + targeted_area = SLOT_ID_GLOVES + target_displayname = "body" + if(BP_L_HAND) + targeted_area = SLOT_ID_GLOVES + target_displayname = "body" + if(BP_GROIN) + targeted_area = SLOT_ID_BACK + target_displayname = "back" + if(BP_L_FOOT) + targeted_area = SLOT_ID_SHOES + target_displayname = "feet" + if(BP_R_FOOT) + targeted_area = SLOT_ID_SHOES + target_displayname = "feet" + if(O_EYES) + targeted_area = SLOT_ID_GLASSES + target_displayname = "eyes" if(target.equip_to_slot_if_possible(H, targeted_area, INV_OP_IGNORE_DELAY | INV_OP_SILENT)) visible_message("[src] leaps at [target]'s [target_displayname]!") @@ -589,6 +612,140 @@ H.sync(src) return +/mob/living/simple_mob/protean_blob/proc/chameleon_apperance() + set name = "Chameleon Change" + set desc = "Allows a protean blob to change or reset its apperance when worn." + set category = "Abilities" + + if(!istype(loc, /obj/item/holder)) + to_chat(src, "You can't do that while not being held or worn.") + return + + var/obj/item/holder/H = loc + var/chosen_list + var/icon_file + switch(input(src,"What type of clothing would you like to mimic or reset appearance?","Mimic Clothes") as null|anything in list("under", "suit", "hat", "gloves", "shoes", "back", "mask", "glasses", "belt", "ears", "headsets", "reset")) + if("reset") + H.color = initial(H.color) + H.icon_override = null + H.sync(src) + return + if("under") + chosen_list = GLOB.clothing_under + icon_file = 'icons/mob/clothing/uniform.dmi' + if("suit") + chosen_list = GLOB.clothing_suit + icon_file = 'icons/mob/clothing/suits.dmi' + if("hat") + chosen_list = GLOB.clothing_head + icon_file = 'icons/mob/clothing/head.dmi' + if("gloves") + chosen_list = GLOB.clothing_gloves + icon_file = 'icons/mob/clothing/hands.dmi' + if("shoes") + chosen_list = GLOB.clothing_shoes + icon_file = 'icons/mob/clothing/feet.dmi' + if("back") + chosen_list = GLOB.clothing_backpack + icon_file = 'icons/mob/clothing/back.dmi' + if("mask") + chosen_list = GLOB.clothing_mask + icon_file = 'icons/mob/clothing/mask.dmi' + if("glasses") + chosen_list = GLOB.clothing_glasses + icon_file = 'icons/mob/clothing/eyes.dmi' + if("belt") + chosen_list = GLOB.clothing_belt + icon_file = 'icons/mob/clothing/belt.dmi' + if("ears") + chosen_list = GLOB.clothing_ears + icon_file = 'icons/mob/clothing/ears.dmi' + if("headsets") + chosen_list = GLOB.clothing_headsets + icon_file = 'icons/mob/clothing/ears.dmi' + + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list + + if(!ispath(chosen_list[picked])) + return + + H.disguise(chosen_list[picked]) + if(isnull(H.icon_override)) + H.icon_override = icon_file + H.update_worn_icon() //so our overlays update. + + if (ismob(H.loc)) + var/mob/M = H.loc + M.update_inv_belt() //so our overlays + M.update_inv_back() + + +/mob/living/simple_mob/protean_blob/proc/chameleon_apperance_rig() + set name = "Chameleon Hardsuit Change" + set desc = "Allows a protean blob to change or reset its apperance when worn." + set category = "Abilities" + + if(!istype(loc, /obj/item/hardsuit/protean)) + to_chat(src, "You can't do that while not being held or worn as a hardsuit.") + return + + var/obj/item/hardsuit/protean/H = loc + var/chosen_list + var/obj/item/clothing/chosenpart + + switch(input(src,"What type of clothing would you like to mimic or reset appearance?","Mimic Clothes") as null|anything in list("suit", "helmet", "gloves", "boots", "reset")) + if("reset") + H.boots.disguise(H.boots.type) //disguising it as itself just sets its vars back to initial which is what we want + H.chest.disguise(H.chest.type) + H.helmet.disguise(H.helmet.type) + H.gloves.disguise(H.gloves.type) + H.boots.update_worn_icon() + H.chest.update_worn_icon() + H.helmet.update_worn_icon() + H.gloves.update_worn_icon() + return + if("suit") + chosenpart = H.chest + chosen_list = GLOB.clothing_suit + if("helmet") + chosenpart = H.helmet + chosen_list = GLOB.clothing_head + if("gloves") + chosenpart = H.gloves + chosen_list = GLOB.clothing_gloves + if("boots") + chosenpart = H.boots + chosen_list = GLOB.clothing_shoes + + + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list + + if(!ispath(chosen_list[picked])) + return + + chosenpart.disguise(chosen_list[picked]) + chosenpart.update_worn_icon() + + +/mob/living/simple_mob/protean_blob/proc/chameleon_color() + set name = "Chameleon Color" + set desc = "Allows a protean blob to change or reset its color when worn." + set category = "Abilities" + + if(!istype(loc, /obj/item/holder)) + to_chat(src, "You can't do that while not being held or worn.") + return + + var/obj/item/holder/H = loc + var/color_in = input("Pick a color. Cancelling sets it to default.","Color", H.color) as null|color + + if(color_in) + H.color = color_in + else + H.color = initial(H.color) + H.update_worn_icon() //so our overlays update. + + /mob/living/simple_mob/protean_blob/make_perspective() . = ..() self_perspective.set_plane_visible(/atom/movable/screen/plane_master/augmented, INNATE_TRAIT) diff --git a/code/modules/species/shadekin/shadekin.dm b/code/modules/species/shadekin/shadekin.dm index 582f2ef6e1..bcfc62668b 100644 --- a/code/modules/species/shadekin/shadekin.dm +++ b/code/modules/species/shadekin/shadekin.dm @@ -146,7 +146,7 @@ /datum/species/shadekin/get_random_name() return "shadekin" -/datum/species/shadekin/handle_environment_special(mob/living/carbon/human/H) +/datum/species/shadekin/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) handle_shade(H) /datum/species/shadekin/can_breathe_water() diff --git a/code/modules/species/shadekin/shadekin_blackeyed.dm b/code/modules/species/shadekin/shadekin_blackeyed.dm index 76f1425096..4509b9199a 100644 --- a/code/modules/species/shadekin/shadekin_blackeyed.dm +++ b/code/modules/species/shadekin/shadekin_blackeyed.dm @@ -139,7 +139,7 @@ /datum/species/crew_shadekin/can_breathe_water() return TRUE //they dont quite breathe -/datum/species/crew_shadekin/handle_environment_special(mob/living/carbon/human/H) +/datum/species/crew_shadekin/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) handle_shade(H) /datum/species/crew_shadekin/add_inherent_verbs(mob/living/carbon/human/H) diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index f9b9107e87..aae67534a7 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -355,8 +355,11 @@ var/exhale_type = GAS_ID_CARBON_DIOXIDE /// Species will try to stabilize at this temperature. (also affects temperature processing) + /// Null to disable natural stabilization. + // todo: shoo, needs to be organ/biology based var/body_temperature = 310.15 /// Species will gain this much temperature every second + // todo: shoo, needs to be organ/biology based var/passive_temp_gain = 0 //? Cold Air @@ -436,6 +439,7 @@ var/show_ssd = "fast asleep" /// This allows you to pick up crew var/holder_type = /obj/item/holder/micro + var/custom_ability_handler //? on death drops /// The color of the species flesh. @@ -776,7 +780,7 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( return // Only used for alien plasma weeds atm, but could be used for Dionaea later. -/datum/species/proc/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/proc/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) return // Used to update alien icons for aliens. diff --git a/code/modules/species/species_attack.dm b/code/modules/species/species_attack.dm index 04fefaadf0..55d4e4955d 100644 --- a/code/modules/species/species_attack.dm +++ b/code/modules/species/species_attack.dm @@ -157,3 +157,26 @@ /datum/unarmed_attack/bite/sharp/shadekin/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) ..() user.shadekin_adjust_energy(energy_gain) + +//Traits attack +/datum/unarmed_attack/bite/sharp/good + damage = 10 + damage_tier = MELEE_TIER_LIGHT + +/datum/unarmed_attack/claws/good + damage = 10 + damage_tier = MELEE_TIER_LIGHT + +/datum/unarmed_attack/bite/sharp/good/venom + +/datum/unarmed_attack/bite/sharp/good/venom/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) + ..() + if(target.can_inject(null,FALSE,zone,FALSE)) + target.bloodstr.add_reagent("toxin",2) //8 extra damage per hit over time + +/datum/unarmed_attack/claws/good/venom + +/datum/unarmed_attack/claws/good/venom/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) + ..() + if(target.can_inject(null,FALSE,zone,FALSE)) + target.bloodstr.add_reagent("toxin",2) diff --git a/code/modules/species/species_shapeshift.dm b/code/modules/species/species_shapeshift.dm index c33b36fc4a..418338c7b3 100644 --- a/code/modules/species/species_shapeshift.dm +++ b/code/modules/species/species_shapeshift.dm @@ -543,7 +543,7 @@ var/list/wrapped_species_by_ref = list() visible_message(SPAN_NOTICE("\The [src]'s \"hair\" composition seems to change.")) update_hair() -/datum/species/shapeshifter/handle_environment_special(mob/living/carbon/human/H) +/datum/species/shapeshifter/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) // Heal remaining damage. if(H.fire_stacks >= 0 && heal_rate > 0) if(H.getBruteLoss() || H.getFireLoss() || H.getOxyLoss() || H.getToxLoss()) diff --git a/code/modules/species/station/adherent.dm b/code/modules/species/station/adherent.dm index ed199fde30..e7f226da24 100644 --- a/code/modules/species/station/adherent.dm +++ b/code/modules/species/station/adherent.dm @@ -163,7 +163,7 @@ /datum/species/adherent/get_slowdown(var/mob/living/carbon/human/H) return slowdown */ -/datum/species/adherent/handle_environment_special(mob/living/carbon/human/H) +/datum/species/adherent/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) for(var/i in H.overlays_standing) H.cut_overlay(i) //Todo: find a better way to adjust clothing, than to wipe all overlays diff --git a/code/modules/species/station/alraune.dm b/code/modules/species/station/alraune.dm index d58dda7b6a..827ecaba87 100644 --- a/code/modules/species/station/alraune.dm +++ b/code/modules/species/station/alraune.dm @@ -124,7 +124,7 @@ return TRUE //eh, why not? Aquatic plants are a thing. -/datum/species/alraune/handle_environment_special(mob/living/carbon/human/H) +/datum/species/alraune/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.inStasisNow()) // if they're in stasis, they won't need this stuff. return @@ -332,7 +332,7 @@ else temp_adj /= (BODYTEMP_HEAT_DIVISOR * 5) //don't raise temperature as much as if we were directly exposed - var/relative_density = 8 * breath.total_moles / (MOLES_CELLSTANDARD * BREATH_PERCENTAGE) + var/relative_density = 8 * breath.total_moles / (CELL_MOLES * BREATH_PERCENTAGE) temp_adj *= relative_density if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX diff --git a/code/modules/species/station/custom_species.dm b/code/modules/species/station/custom_species.dm index f0e8b53930..9f8b5d83a4 100644 --- a/code/modules/species/station/custom_species.dm +++ b/code/modules/species/station/custom_species.dm @@ -75,7 +75,7 @@ //Called during handle_environment in Life() ticks. // Return: Not used. -/datum/species/custom/handle_environment_special(mob/living/carbon/human/H) +/datum/species/custom/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) return ..() //Called when spawning to equip them with special things. diff --git a/code/modules/species/station/diona.dm b/code/modules/species/station/diona.dm index 182e16b8e1..8439b7435c 100644 --- a/code/modules/species/station/diona.dm +++ b/code/modules/species/station/diona.dm @@ -154,7 +154,7 @@ SPAN_HEAR("You hear a wet slithering noise!"), ) -/datum/species/diona/handle_environment_special(mob/living/carbon/human/H) +/datum/species/diona/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.inStasisNow()) return diff --git a/code/modules/species/station/phoronoids.dm b/code/modules/species/station/phoronoids.dm index 063610f61a..188db8ddeb 100644 --- a/code/modules/species/station/phoronoids.dm +++ b/code/modules/species/station/phoronoids.dm @@ -79,11 +79,7 @@ body_temperature = T20C -/datum/species/phoronoid/handle_environment_special(mob/living/carbon/human/H) - var/turf/T = H.loc - if(!T) - return - var/datum/gas_mixture/environment = T.copy_cell_volume() +/datum/species/phoronoid/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(!environment) return diff --git a/code/modules/species/station/standard/tajaran.dm b/code/modules/species/station/standard/tajaran.dm index f87fa59449..288b1ab0a0 100644 --- a/code/modules/species/station/standard/tajaran.dm +++ b/code/modules/species/station/standard/tajaran.dm @@ -68,7 +68,7 @@ breath_cold_level_2 = 100 breath_cold_level_3 = 60 - heat_level_1 = 330 + heat_level_1 = 340 heat_level_2 = 380 heat_level_3 = 800 diff --git a/code/modules/species/station/standard/teshari.dm b/code/modules/species/station/standard/teshari.dm index 27a319c4b0..2ba15cae12 100644 --- a/code/modules/species/station/standard/teshari.dm +++ b/code/modules/species/station/standard/teshari.dm @@ -91,7 +91,7 @@ breath_cold_level_2 = 100 breath_cold_level_3 = 60 - heat_level_1 = 320 + heat_level_1 = 330 heat_level_2 = 370 heat_level_3 = 600 diff --git a/code/modules/species/station/standard/zaddat.dm b/code/modules/species/station/standard/zaddat.dm index 71cebbea25..14cfb58db9 100644 --- a/code/modules/species/station/standard/zaddat.dm +++ b/code/modules/species/station/standard/zaddat.dm @@ -120,7 +120,7 @@ else H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/put_in_backpack) -/datum/species/zaddat/handle_environment_special(mob/living/carbon/human/H) +/datum/species/zaddat/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.inStasisNow()) return diff --git a/code/modules/species/station/vasilissan.dm b/code/modules/species/station/vasilissan.dm index 8891368966..1d511efa73 100644 --- a/code/modules/species/station/vasilissan.dm +++ b/code/modules/species/station/vasilissan.dm @@ -82,7 +82,7 @@ /datum/unarmed_attack/bite/sharp/numbing, ) -/datum/species/vasilissan/handle_environment_special(mob/living/carbon/human/H) +/datum/species/vasilissan/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) if(H.stat == DEAD) // If they're dead they won't need anything. return diff --git a/code/modules/species/station/xenochimera.dm b/code/modules/species/station/xenochimera.dm index 70c42b5e68..16b54032d5 100644 --- a/code/modules/species/station/xenochimera.dm +++ b/code/modules/species/station/xenochimera.dm @@ -109,6 +109,7 @@ /mob/living/carbon/human/proc/hide_horns, /mob/living/carbon/human/proc/hide_wings, /mob/living/carbon/human/proc/hide_tail, + /mob/living/proc/set_size, /mob/living/proc/shred_limb, /mob/living/proc/eat_trash, /mob/living/proc/glow_toggle, @@ -131,7 +132,7 @@ var/has_feral_abilities = FALSE -/datum/species/shapeshifter/xenochimera/handle_environment_special(mob/living/carbon/human/H) +/datum/species/shapeshifter/xenochimera/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) //If they're KO'd/dead, they're probably not thinking a lot about much of anything. if(!H.stat) handle_feralness(H) @@ -142,13 +143,6 @@ //Cold/pressure effects when not regenerating else - var/pressure2 = H.loc.return_pressure() - var/adjusted_pressure2 = H.calculate_affecting_pressure(pressure2) - - //Very low pressure damage - if(adjusted_pressure2 <= 20) - H.take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") - //Cold hurts and gives them pain messages, eventually weakening and paralysing, but doesn't damage or trigger feral. //NB: 'body_temperature' used here is the 'setpoint' species var var/temp_diff = body_temperature - H.bodytemperature @@ -731,7 +725,7 @@ name = "Dissonant Shriek" desc = "We shift our vocal cords to release a high-frequency sound that overloads nearby electronics." action_state = "ling_resonant_shriek" - var/range = 8 + range = 8 //Slightly more potent than an EMP grenade var/emp_heavy = 3 var/emp_med = 6 @@ -887,9 +881,16 @@ var/target = null var/text = null - for(var/datum/mind/possible_target in SSticker.minds) //not us, on the station and not a synthetic - if (istype(possible_target.current, /mob/living) && possible_target != owner.mind && isStationLevel(get_z(possible_target.current)) && !possible_target.current.isSynthetic()) - LAZYADD(targets,possible_target.current) +//If the target is not a synth, not us, and a valid mob + for(var/datum/mind/possible_target in SSticker.minds) + if (istype(possible_target.current, /mob/living)) + if(possible_target != owner.mind) + if(!possible_target.current.isSynthetic()) + if(isStationLevel(get_z(owner))) //If we're on station, go through the station + if(isStationLevel(get_z(possible_target.current))) + LAZYADD(targets,possible_target.current) + else if (get_z(owner) == get_z(possible_target.current)) //Otherwise, go through the z level we're on + LAZYADD(targets,possible_target.current) target = input("Select a creature!", "Speak to creature", null, null) as null|anything in targets if(!target) diff --git a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm index 7f4a9fc8e6..e9b3287f24 100644 --- a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm +++ b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm @@ -133,7 +133,7 @@ return healing_factor // highest value is 6,336 -/datum/species/xenohybrid/handle_environment_special(mob/living/carbon/human/H) +/datum/species/xenohybrid/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) var/heal_amount = heal_rate * handle_healing_conditions(H) var/nutrition_debt = (H.getFireLoss() ? heal_rate : 0)//Heal rate and not heal_amount, since we want to reward taking the modifiers diff --git a/code/modules/species/virtual_reality/avatar.dm b/code/modules/species/virtual_reality/avatar.dm index d5c53b530c..2a3ed9c6af 100644 --- a/code/modules/species/virtual_reality/avatar.dm +++ b/code/modules/species/virtual_reality/avatar.dm @@ -44,7 +44,7 @@ /datum/species/shapeshifter/promethean/avatar/handle_death(var/mob/living/carbon/human/H) return -/datum/species/shapeshifter/promethean/avatar/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/shapeshifter/promethean/avatar/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) return /* NO. YOU CAN HAVE THIS BACK WHEN THIS DOESNT SWAP SPECIES TO CHANGE OPACITY diff --git a/code/modules/species/xenomorphs/alien_embryo.dm b/code/modules/species/xenomorphs/alien_embryo.dm index 7ea507ef6e..bb95dc59a7 100644 --- a/code/modules/species/xenomorphs/alien_embryo.dm +++ b/code/modules/species/xenomorphs/alien_embryo.dm @@ -58,7 +58,7 @@ if(prob(2)) to_chat(affected_mob, " Your muscles ache.") if(prob(20)) - affected_mob.take_organ_damage(1) + affected_mob.take_random_targeted_damage(brute = 1) if(prob(2)) to_chat(affected_mob, "Your stomach hurts.") if(prob(20)) diff --git a/code/modules/species/xenomorphs/alien_facehugger.dm b/code/modules/species/xenomorphs/alien_facehugger.dm index 48ad67058d..266abb2574 100644 --- a/code/modules/species/xenomorphs/alien_facehugger.dm +++ b/code/modules/species/xenomorphs/alien_facehugger.dm @@ -133,7 +133,7 @@ var/const/MAX_ACTIVE_TIME = 400 if(stat != CONSCIOUS) return if(!sterile) - L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage + L.take_random_targeted_damage(brute = strength, brute = 0) //done here so that even borgs and humans in helmets take damage L.visible_message(" [src] leaps at [L]'s face!") @@ -412,7 +412,7 @@ var/const/MAX_ACTIVE_TIME = 400 if(loc == L) return if(stat != CONSCIOUS) return - if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage + if(!sterile) L.take_random_targeted_damage(brute = strength, brute = 0) //done here so that even borgs and humans in helmets take damage L.visible_message(" [src] leaps at [L]'s face!") diff --git a/code/modules/species/xenomorphs/alien_species.dm b/code/modules/species/xenomorphs/alien_species.dm index b07b3c3796..dea33584e2 100644 --- a/code/modules/species/xenomorphs/alien_species.dm +++ b/code/modules/species/xenomorphs/alien_species.dm @@ -113,19 +113,15 @@ ..() -/datum/species/xenos/handle_environment_special(var/mob/living/carbon/human/H) +/datum/species/xenos/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) + if(!environment) + return - var/turf/T = H.loc - if(!T) return - var/datum/gas_mixture/environment = T.return_air() - if(!environment) return - - if(environment.gas[GAS_ID_PHORON] > 0 || locate(/obj/structure/alien/weeds) in T) + if(environment.gas[GAS_ID_PHORON] > 0 || locate(/obj/structure/alien/weeds) in get_turf(H)) if(!regenerate(H)) var/obj/item/organ/internal/xenos/plasmavessel/P = H.internal_organs_by_name[O_PLASMA] P.stored_plasma += weeds_plasma_rate P.stored_plasma = min(max(P.stored_plasma,0),P.max_plasma) - ..() /datum/species/xenos/proc/regenerate(var/mob/living/carbon/human/H) var/heal_rate = weeds_heal_rate diff --git a/code/modules/sprite_accessories/markings/tattoo.dm b/code/modules/sprite_accessories/markings/tattoo.dm index 13043a0614..0ba88a85da 100644 --- a/code/modules/sprite_accessories/markings/tattoo.dm +++ b/code/modules/sprite_accessories/markings/tattoo.dm @@ -65,6 +65,56 @@ icon_state = "tat_tiger" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN) +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_foot + name = "Tattoo (Tiger Stripes, Left Foot)" + id = "tat_tiger-l_foot" + body_parts = list(BP_L_FOOT) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_foot + name = "Tattoo (Tiger Stripes, Right Foot)" + id = "tat_tiger-r_foot" + body_parts = list(BP_R_FOOT) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_leg + name = "Tattoo (Tiger Stripes, Left Leg)" + id = "tat_tiger-l_leg" + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_leg + name = "Tattoo (Tiger Stripes, Right Leg)" + id = "tat_tiger-r_leg" + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/groin + name = "Tattoo (Tiger Stripes, Groin)" + id = "tat_tiger-groin" + body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/torso + name = "Tattoo (Tiger Stripes, Torso)" + id = "tat_tiger-torso" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_arm + name = "Tattoo (Tiger Stripes, Left Arm)" + id = "tat_tiger-l_arm" + body_parts = list(BP_L_ARM) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_arm + name = "Tattoo (Tiger Stripes, Right Arm)" + id = "tat_tiger-r_arm" + body_parts = list(BP_R_ARM) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/r_hand + name = "Tattoo (Tiger Stripes, Right Hand)" + id = "tat_tiger-r_hand" + body_parts = list(BP_R_HAND) + +/datum/sprite_accessory/marking/tatoo/tat_tiger/l_hand + name = "Tattoo (Tiger Stripes, Left Hand)" + id = "tat_tiger-l_hand" + body_parts = list(BP_L_HAND) + /datum/sprite_accessory/marking/tatoo/tat_inmon1 name = "Tattoo (Inmon, Variant 1)" id = "marking_tattoo_groin_inmon" @@ -82,3 +132,313 @@ id = "marking_tattoo_groin_inmon3" icon_state = "tat_inmon3" body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/spelunker + name = "Tattoo (Spelunker, Body)" + id = "marking_tattoo_body_spelunker" + icon_state = "tat_spelunker" + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/spelunker/l_leg + name = "Tattoo (Spelunker, Left Leg)" + id = "marking_tattoo_body_spelunker-l_leg" + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/tatoo/spelunker/r_leg + name = "Tattoo (Spelunker, Right Leg)" + id = "marking_tattoo_body_spelunker-r_leg" + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/tatoo/spelunker/head + name = "Tattoo (Spelunker, Head)" + id = "marking_tattoo_body_spelunker-head" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/spelunker/torso + name = "Tattoo (Spelunker, Torso)" + id = "marking_tattoo_body_spelunker-torso" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/spelunker/r_arm + name = "Tattoo (Spelunker, Right Arm)" + id = "marking_tattoo_body_spelunker-r_arm" + body_parts = list(BP_R_ARM) + +/datum/sprite_accessory/marking/tatoo/spelunker/l_arm + name = "Tattoo (Spelunker, Left Arm)" + id = "marking_tattoo_body_spelunker-l_arm" + body_parts = list(BP_L_ARM) + +/datum/sprite_accessory/marking/tatoo/spelunker/groin + name = "Tattoo (Spelunker, Groin)" + id = "marking_tattoo_body_spelunker-groin" + body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/delver + name = "Tattoo (Delver, Body)" + id = "marking_tattoo_body_delver" + icon_state = "tat_delver" + body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/delver/l_leg + name = "Tattoo (Delver, Left Leg)" + id = "marking_tattoo_body_delver-l_leg" + body_parts = list(BP_L_LEG) + +/datum/sprite_accessory/marking/tatoo/delver/r_leg + name = "Tattoo (Delver, Right Leg)" + id = "marking_tattoo_body_delver-r_leg" + body_parts = list(BP_R_LEG) + +/datum/sprite_accessory/marking/tatoo/delver/r_arm + name = "Tattoo (Delver, Right Arm)" + id = "marking_tattoo_body_delver-r_arm" + body_parts = list(BP_R_ARM) + +/datum/sprite_accessory/marking/tatoo/delver/l_arm + name = "Tattoo (Delver, Left Arm)" + id = "marking_tattoo_body_delver-l_arm" + body_parts = list(BP_L_ARM) + +/datum/sprite_accessory/marking/tatoo/delver/groin + name = "Tattoo (Delver, Groin)" + id = "marking_tattoo_body_delver-groin" + body_parts = list(BP_GROIN) + +/datum/sprite_accessory/marking/tatoo/delver/torso + name = "Tattoo (Delver, Torso)" + id = "marking_tattoo_body_delver-torso" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/delver/head + name = "Tattoo (Delver, Head)" + id = "marking_tattoo_body_delver-head" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye_mark + name = "Tattoo (Mark, Left Eye)" + id = "marking_tattoo_eye_mark_left" + icon_state = "tat_eye_tattoo_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye_mark/right + name = "Tattoo (Mark, Right Eye)" + id = "marking_tattoo_eye_mark_right" + icon_state = "tat_eye_tattoo_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/jaeger + name = "Tattoo (Jaeger, Right Head)" + id = "marking_tattoo_jaeger_r" + icon_state = "tat_jaeger_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/jaeger/left + name = "Tattoo (Jaeger, Left Head)" + id = "marking_tattoo_jaeger_l" + icon_state = "tat_jaeger_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/lujan + name = "Tattoo (Lujan, Right Head)" + id = "marking_tattoo_lujan_r" + icon_state = "tat_lujan_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/lujan/left + name = "Tattoo (Lujan, Left Head)" + id = "marking_tattoo_lujan_l" + icon_state = "tat_lujan_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/natasha + name = "Tattoo (Natasha, Left Head)" + id = "marking_tattoo_natasha_l" + icon_state = "tat_natasha_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/natasha/right + name = "Tattoo (Natasha, Right Head)" + id = "marking_tattoo_natasha_r" + icon_state = "tat_natasha_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/forrest + name = "Tattoo (Forrest, Right Head)" + id = "marking_tattoo_forrest_r" + icon_state = "tat_forrest_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/forrest/left + name = "Tattoo (Forrest, Left Head)" + id = "marking_tattoo_forrest_l" + icon_state = "tat_forrest_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/toshi + name = "Tattoo (Toshi, Left Head)" + id = "marking_tattoo_toshi_l" + icon_state = "tat_toshi_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/toshi/right + name = "Tattoo (Toshi, Right Head)" + id = "marking_tattoo_toshi_r" + icon_state = "tat_toshi_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheshire + name = "Tattoo (Cheshire, Right Head)" + id = "marking_tattoo_cheshire_r" + icon_state = "tat_cheshire_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheshire/left + name = "Tattoo (Cheshire, Left Head)" + id = "marking_tattoo_cheshire_l" + icon_state = "tat_cheshire_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/bindi + name = "Tattoo (Bindi, Head)" + id = "marking_tattoo_bindi" + icon_state = "tat_bindi" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eyestripe + name = "Tattoo (Eyestripe, Head)" + id = "marking_tattoo_eyestripe" + icon_state = "tat_eyestripe" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/kater + name = "Tattoo (Kater, Right Head)" + id = "marking_tattoo_kater_r" + icon_state = "tat_kater_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/kater/left + name = "Tattoo (Kater, Left Head)" + id = "marking_tattoo_kater_l" + icon_state = "tat_kater_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/hunter + name = "Tattoo (Hunter, Right Head)" + id = "marking_tattoo_hunter_r" + icon_state = "tat_hunter_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/hunter/left + name = "Tattoo (Hunter, Left Head)" + id = "marking_tattoo_hunter_l" + icon_state = "tat_hunter_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/nosetripe + name = "Tattoo (Nosestripe, Head)" + id = "marking_tattoo_nosetripe" + icon_state = "tat_nosetripe" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/wingsback + name = "Tattoo (Wings Back, Torso)" + id = "marking_tattoo_wings_back" + icon_state = "tat_wingsback" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/heartback + name = "Tattoo (Heart Back, Torso)" + id = "marking_tattoo_heart_back" + icon_state = "tat_heartback" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/belly + name = "Tattoo (Belly, Torso)" + id = "marking_tattoo_belly" + icon_state = "tat_belly" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tatoo/neck + name = "Tattoo (Thick Neck, Head)" + id = "marking_tattoo_thickneck" + icon_state = "tat_neckthickk" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/ear + name = "Tattoo (Ear Right, Head)" + id = "marking_tattoo_ear_r" + icon_state = "tat_ear_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/ear/left + name = "Tattoo (Ear Left, Head)" + id = "marking_tattoo_ear_l" + icon_state = "tat_ear_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheekspot + name = "Tattoo (Cheekspot Left, Head)" + id = "marking_tattoo_cheekspot_l" + icon_state = "tat_cheekspot_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/cheekspot/right + name = "Tattoo (Cheekspot Right, Head)" + id = "marking_tattoo_cheekspot_r" + icon_state = "tat_cheekspot_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/crow + name = "Tattoo (Crow Right, Head)" + id = "marking_tattoo_crow_r" + icon_state = "tat_crow_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/crow/left + name = "Tattoo (Crow Left, Head)" + id = "marking_tattoo_crow_l" + icon_state = "tat_crow_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/nosetape + name = "Tattoo (Nose, Head)" + id = "marking_tattoo_nose" + icon_state = "tat_nosetape" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/mouth + name = "Tattoo (Mouth Left, Head)" + id = "marking_tattoo_mouth_l" + icon_state = "tat_lipcorner_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/mouth/right + name = "Tattoo (Mouth Right, Head)" + id = "marking_tattoo_mouth_r" + icon_state = "tat_lipcorner_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye + name = "Tattoo (Eye Corner Right, Head)" + id = "marking_tattoo_eyecorner_r" + icon_state = "tat_eyecorner_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eye/left + name = "Tattoo (Eye Corner Left, Head)" + id = "marking_tattoo_eyecorner_l" + icon_state = "tat_eyecorner_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eyelash + name = "Tattoo (Eyelash Left, Head)" + id = "marking_tattoo_eyelash_l" + icon_state = "tat_eyelash_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tatoo/eyelash/right + name = "Tattoo (Eyelash Right, Head)" + id = "marking_tattoo_eyelash_r" + icon_state = "tat_eyelash_r" + body_parts = list(BP_HEAD) diff --git a/code/modules/stockmarket/computer.dm b/code/modules/stockmarket/computer.dm index 6d16aa4ee9..666891005f 100644 --- a/code/modules/stockmarket/computer.dm +++ b/code/modules/stockmarket/computer.dm @@ -30,7 +30,7 @@ //! ## MAIN TGUI SCREEN ## !// -/obj/machinery/computer/stockexchange/ui_act(action, params, datum/tgui/ui) +/obj/machinery/computer/stockexchange/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -104,7 +104,7 @@ if(vmode > 1) vmode = 0 -/obj/machinery/computer/stockexchange/ui_data(mob/user) +/obj/machinery/computer/stockexchange/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["stationName"] = (LEGACY_MAP_DATUM).station_name @@ -207,12 +207,12 @@ ui = new(user, src, "StockExchangeHistory") ui.open() -/obj/machinery/computer/stockexchange/history/ui_data(mob/user) +/obj/machinery/computer/stockexchange/history/ui_data(mob/user, datum/tgui/ui) var/list/data = list() //data["var"] = var return data -/obj/machinery/computer/stockexchange/history/ui_act(action, params) +/obj/machinery/computer/stockexchange/history/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) @@ -230,12 +230,12 @@ ui = new(user, src, "StockExchangeArchive") ui.open() -/obj/machinery/computer/stockexchange/archive/ui_data(mob/user) +/obj/machinery/computer/stockexchange/archive/ui_data(mob/user, datum/tgui/ui) var/list/data = list() //data["var"] = var return data -/obj/machinery/computer/stockexchange/archive/ui_act(action, params) +/obj/machinery/computer/stockexchange/archive/ui_act(action, list/params, datum/tgui/ui) if(..()) return diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 97a01af469..66e366fb1e 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -62,7 +62,9 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") - affected.take_damage(5, 0) + affected.inflict_bodypart_damage( + brute = 5, + ) /////////////////////////////////////////////////////////////// // Necrosis Surgery Step 1 diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index f60cd02957..1225027510 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -294,7 +294,7 @@ target.adjustToxLoss(5) affected.create_wound(CUT, 5) - for(var/obj/item/organ/I in affected.internal_organs) + for(var/obj/item/organ/internal/I in affected.internal_organs) if(I) I.take_damage(rand(3,5),0) diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm index b9a9f27a28..8be96f2740 100644 --- a/code/modules/tgs/core/core.dm +++ b/code/modules/tgs/core/core.dm @@ -42,11 +42,11 @@ var/datum/tgs_version/max_api_version = TgsMaximumApiVersion(); if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter) - TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.") + TGS_ERROR_LOG("Detected unknown Interop API version! Defaulting to latest. Update the DMAPI to fix this problem.") api_datum = /datum/tgs_api/latest if(!api_datum) - TGS_ERROR_LOG("Found unsupported API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") + TGS_ERROR_LOG("Found unsupported Interop API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") return TGS_INFO_LOG("Activating API for version [version.deprefixed_parameter]") @@ -107,6 +107,13 @@ if(api) return api.ApiVersion() +/world/TgsEngine() +#ifdef OPENDREAM + return TGS_ENGINE_TYPE_OPENDREAM +#else + return TGS_ENGINE_TYPE_BYOND +#endif + /world/TgsInstanceName() var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 83420d130a..616263098f 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.7.0" +"5.8.0" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index 48969c0c7d..1c7d67d20c 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -8,7 +8,6 @@ #define DMAPI5_TOPIC_REQUEST_LIMIT 65528 #define DMAPI5_TOPIC_RESPONSE_LIMIT 65529 -#define DMAPI5_BRIDGE_COMMAND_PORT_UPDATE 0 #define DMAPI5_BRIDGE_COMMAND_STARTUP 1 #define DMAPI5_BRIDGE_COMMAND_PRIME 2 #define DMAPI5_BRIDGE_COMMAND_REBOOT 3 @@ -18,6 +17,7 @@ #define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier" #define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands" +#define DMAPI5_PARAMETER_TOPIC_PORT "topicPort" #define DMAPI5_CHUNK "chunk" #define DMAPI5_CHUNK_PAYLOAD "payload" diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 7226f29bba..a5c064a8ea 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -8,8 +8,12 @@ var/reboot_mode = TGS_REBOOT_MODE_NORMAL + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call var/list/intercepted_message_queue + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call + var/list/offline_message_queue + var/list/custom_commands var/list/test_merges @@ -17,6 +21,8 @@ var/list/chat_channels var/initialized = FALSE + var/initial_bridge_request_received = FALSE + var/datum/tgs_version/interop_version var/chunked_requests = 0 var/list/chunked_topics = list() @@ -25,7 +31,8 @@ /datum/tgs_api/v5/New() . = ..() - TGS_DEBUG_LOG("V5 API created") + interop_version = version + TGS_DEBUG_LOG("V5 API created: [json_encode(args)]") /datum/tgs_api/v5/ApiVersion() return new /datum/tgs_version( @@ -38,8 +45,8 @@ access_identifier = world.params[DMAPI5_PARAM_ACCESS_IDENTIFIER] var/datum/tgs_version/api_version = ApiVersion() - version = null - var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands())) + version = null // we want this to be the TGS version, not the interop version + var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort())) if(!istype(bridge_response)) TGS_ERROR_LOG("Failed initial bridge request!") return FALSE @@ -53,7 +60,8 @@ TGS_INFO_LOG("DMAPI validation, exiting...") TerminateWorld() - version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) + initial_bridge_request_received = TRUE + version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) // reassigning this because it can change if TGS updates security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL] visibility = runtime_information[DMAPI5_RUNTIME_INFORMATION_VISIBILITY] instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME] @@ -102,10 +110,17 @@ initialized = TRUE return TRUE +/datum/tgs_api/v5/proc/GetTopicPort() +#if defined(OPENDREAM) && defined(OPENDREAM_TOPIC_PORT_EXISTS) + return "[world.opendream_topic_port]" +#else + return null +#endif + /datum/tgs_api/v5/proc/RequireInitialBridgeResponse() TGS_DEBUG_LOG("RequireInitialBridgeResponse()") var/logged = FALSE - while(!version) + while(!initial_bridge_request_received) if(!logged) TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep") logged = TRUE @@ -183,17 +198,7 @@ var/datum/tgs_chat_channel/channel = I ids += channel.id - message2 = UpgradeDeprecatedChatMessage(message2) - - if (!length(channels)) - return - - var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids - if(intercepted_message_queue) - intercepted_message_queue += list(data) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + SendChatMessageRaw(message2, ids) /datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message2, admin_only) var/list/channels = list() @@ -202,26 +207,42 @@ if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) channels += channel.id + SendChatMessageRaw(message2, channels) + +/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) + SendChatMessageRaw(message2, list(user.channel.id)) + +/datum/tgs_api/v5/proc/SendChatMessageRaw(datum/tgs_message_content/message2, list/channel_ids) message2 = UpgradeDeprecatedChatMessage(message2) - if (!length(channels)) + if (!length(channel_ids)) return var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels + data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channel_ids if(intercepted_message_queue) intercepted_message_queue += list(data) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + return -/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) - message2 = UpgradeDeprecatedChatMessage(message2) - var/list/data = message2._interop_serialize() - data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id) - if(intercepted_message_queue) - intercepted_message_queue += list(data) + if(offline_message_queue) + offline_message_queue += list(data) + return + + if(detached) + offline_message_queue = list(data) + + WaitForReattach(FALSE) + + data = offline_message_queue + offline_message_queue = null + + for(var/queued_message in data) + SendChatDataRaw(queued_message) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) + SendChatDataRaw(data) + +/datum/tgs_api/v5/proc/SendChatDataRaw(list/data) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) /datum/tgs_api/v5/ChatChannelInfo() RequireInitialBridgeResponse() diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm index 37f58bcdf6..a0ab359876 100644 --- a/code/modules/tgs/v5/bridge.dm +++ b/code/modules/tgs/v5/bridge.dm @@ -48,7 +48,9 @@ var/json = CreateBridgeData(command, data, TRUE) var/encoded_json = url_encode(json) - var/url = "http://127.0.0.1:[server_port]/Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" + var/api_prefix = interop_version.minor >= 8 ? "api/" : "" + + var/url = "http://127.0.0.1:[server_port]/[api_prefix]Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" return url /datum/tgs_api/v5/proc/CreateBridgeData(command, list/data, needs_auth) @@ -81,11 +83,16 @@ TGS_ERROR_LOG("Failed bridge request: [bridge_request]") return - var/response_json = file2text(export_response["CONTENT"]) - if(!response_json) + var/content = export_response["CONTENT"] + if(!content) TGS_ERROR_LOG("Failed bridge request, missing content!") return + var/response_json = file2text(content) + if(!response_json) + TGS_ERROR_LOG("Failed bridge request, failed to load content!") + return + var/list/bridge_response = json_decode(response_json) if(!bridge_response) TGS_ERROR_LOG("Failed bridge request, bad json: [response_json]") diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index 2ef0c70a97..05e6c4e1b2 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -175,6 +175,7 @@ var/list/reattach_response = TopicResponse(error_message) reattach_response[DMAPI5_PARAMETER_CUSTOM_COMMANDS] = ListCustomCommands() + reattach_response[DMAPI5_PARAMETER_TOPIC_PORT] = GetTopicPort() return reattach_response if(DMAPI5_TOPIC_COMMAND_SEND_CHUNK) diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index fd1ed7e4cf..d531d4b7b9 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -8,7 +8,6 @@ #undef DMAPI5_TOPIC_REQUEST_LIMIT #undef DMAPI5_TOPIC_RESPONSE_LIMIT -#undef DMAPI5_BRIDGE_COMMAND_PORT_UPDATE #undef DMAPI5_BRIDGE_COMMAND_STARTUP #undef DMAPI5_BRIDGE_COMMAND_PRIME #undef DMAPI5_BRIDGE_COMMAND_REBOOT @@ -18,6 +17,7 @@ #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS +#undef DMAPI5_PARAMETER_TOPIC_PORT #undef DMAPI5_CHUNK #undef DMAPI5_CHUNK_PAYLOAD diff --git a/code/modules/tgui/client.dm b/code/modules/tgui/client.dm new file mode 100644 index 0000000000..75b5a9b15c --- /dev/null +++ b/code/modules/tgui/client.dm @@ -0,0 +1,88 @@ +/** + * External tgui definitions, such as src_object APIs. + * + *! Copyright (c) 2020 Aleksej Komarov + *! SPDX-License-Identifier: MIT + */ + + +/** + * global + * + * Tracks open windows for a user. + */ +/client/var/list/tgui_windows = list() + +/** + * global + * + * TRUE if cache was reloaded by tgui dev server at least once. + */ +/client/var/tgui_cache_reloaded = FALSE + +/** + * verb + * + * Called by UIs when they are closed. + * Must be a verb so winset() can call it. + * + * required uiref ref The UI that was closed. + */ +/client/verb/uiclose(window_id as text) + // Name the verb, and hide it from the user panel. + set name = "uiclose" + set hidden = TRUE + var/mob/user = src?.mob + if(!user) + return + // Close all tgui datums based on window_id. + SStgui.force_close_window(user, window_id) + +/** + * Middleware for /client/Topic. + * + * return bool If TRUE, prevents propagation of the topic call. + */ +/client/proc/tgui_topic(list/href_list) + // Skip non-tgui topics + if(!href_list["tgui"]) + return FALSE + var/type = href_list["type"] + // Unconditionally collect tgui logs + if(type == "log") + var/context = href_list["window_id"] + if (href_list["ns"]) + context += " ([href_list["ns"]])" + log_tgui(usr, href_list["message"], + context = context) + // Reload all tgui windows + if(type == "cacheReloaded") + log_tgui(usr, context = "debug/reload") + // Mark as reloaded + usr.client.tgui_cache_reloaded = TRUE + // Notify windows + var/list/windows = usr.client.tgui_windows + for(var/window_id in windows) + var/datum/tgui_window/window = windows[window_id] + if (window.status == TGUI_WINDOW_READY) + window.on_message(type, null, href_list) + return TRUE + // Locate window + var/window_id = href_list["window_id"] + var/datum/tgui_window/window + if(window_id) + window = usr.client.tgui_windows[window_id] + if(!window) + log_tgui(usr, + "Error: Couldn't find the window datum, force closing.", + context = window_id) + SStgui.force_close_window(usr, window_id) + return TRUE + // Decode payload + var/payload + if(href_list["payload"]) + payload = json_decode(href_list["payload"]) + // Pass message to window + if(window) + window.on_message(type, payload, href_list) + return TRUE diff --git a/code/modules/tgui/datum.dm b/code/modules/tgui/datum.dm new file mode 100644 index 0000000000..e5ff133698 --- /dev/null +++ b/code/modules/tgui/datum.dm @@ -0,0 +1,331 @@ +/** + * External tgui definitions, such as src_object APIs. + * + *! Copyright (c) 2020 Aleksej Komarov + *! SPDX-License-Identifier: MIT + */ + +/** + * global + * + * Associative list of JSON-encoded shared states that were set by + * tgui clients. + */ +/datum/var/list/tgui_shared_states + +//* API - Main - UI devs, look here! *// + +/** + * public + * + * Called on an object when a tgui object is being created, allowing you to + * push various assets to tgui, for examples spritesheets. + * + * todo: support typepaths + * todo: support file paths + * todo: this should be sent to embedding interfaces + * + * return list List of asset datum instances (must be /datum/asset instance, not path) + */ +/datum/proc/ui_assets(mob/user) + return list() + +/** + * public + * + * Called on a UI when the UI receieves a href. + * Think of this as Topic(). + * + * @params + * * action - the string of the TGUI-side act() that was invoked by the user + * * params - the list of key-value parameters of the act() invocation. This is always strings for both key and value! + * * ui - the TGUI instance invoking this (host window) + * + * @return bool If the user's input has been handled and the UI should update. + */ +/datum/proc/ui_act(action, list/params, datum/tgui/ui) + SHOULD_CALL_PARENT(TRUE) + // If UI is not interactive or usr calling Topic is not the UI user, bail. + if(!ui || ui.status != UI_INTERACTIVE) + return TRUE + +/** + * public + * + * Data to be sent to the UI. + * This must be implemented for a UI to work. + * + * @params + * * user - (optional) the mob using the UI + * * ui - (optional) the host tgui + * + * return list Data to be sent to the UI. + */ +/datum/proc/ui_data(mob/user, datum/tgui/ui) + return list() // Not implemented. + +/** + * public + * + * Static Data to be sent to the UI. + * + * Static data differs from normal data in that it's large data that should be + * sent infrequently. This is implemented optionally for heavy uis that would + * be sending a lot of redundant data frequently. Gets squished into one + * object on the frontend side, but the static part is cached. + * + * + * @params + * * user - (optional) the mob using the UI + * * ui - (optional) the host tgui + * + * return list Static Data to be sent to the UI. + */ +/datum/proc/ui_static_data(mob/user, datum/tgui/ui) + return list() + +/** + * public + * + * Used to open and update UIs. + * If this proc is not implemented properly, the UI will not update correctly. + * + * todo: how should i ruin this proc? i don't really like update being twined with opening, but it makes sense..? ~silicons + * + * required user mob The mob who opened/is using the UI. + * optional ui datum/tgui The UI to be updated, if it exists. + * + *! ## To-Be-Deprecated. + * optional parent_ui datum/tgui A parent UI that, when closed, closes this UI as well. + */ +/datum/proc/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + return FALSE // Not implemented. + +/** + * private + * + * todo: this is just completely ignored for modules/embedding. is this a good thing? ~silicons + * + * The UI's host object (usually src_object). + * This allows modules/datums to have the UI attached to them, + * and be a part of another object. + */ +/datum/proc/ui_host() + return src // Default src. + +/** + * private + * + * todo: this is just completely ignored for modules/embedding. is this a good thing? ~silicons + * + * The UI's state controller to be used for created uis + * This is a proc over a var for memory reasons + */ +/datum/proc/ui_state() + return GLOB.default_state + +/** + * Called to route UI act calls to modules. + * + * This is a proc so you can override yourself - very useful if you're doing your own module system + * rather than copy-pasting module code. + * + * @params + * * action - the action string of the ui_act + * * params - list of string key-values; this is always strings, text2num your number args if needed! + * * ui - the host window ui datum + * * id - the module ID of the route request + * + * @return TRUE if it was handled by modules. + */ +/datum/proc/ui_route(action, list/params, datum/tgui/ui, id) + SHOULD_CALL_PARENT(TRUE) + // todo: the fact this is here is probably a bad thing, as it's very poorly documented. + // this basically matches the useModule<>() hook used on the UI side, because id is null if + // we're a host window, and not an act call from an embedded component. + if(!id) + return ui_act(action, params, ui) + return FALSE + +/** + * public + * + * Checks the overall UI state for a mob. + * + * todo: this is just completely ignored for modules/embedding. is this a good thing? ~silicons + * + * @params + * * user - The mob who opened/is using the UI. + * * state - The state to check. + * + * return UI_state The state of the UI. + */ +/datum/proc/ui_status(mob/user, datum/ui_state/state) + var/src_object = ui_host(user) + . = UI_CLOSE + if(!state) + return + + if(isobserver(user)) + // If they turn on ghost AI control, admins can always interact. + if(IsAdminGhost(user)) + . = max(., UI_INTERACTIVE) + + // Regular ghosts can always at least view if in range. + if(user.client) + // todo: in view range for zooming + if(get_dist(src_object, user) < max(CEILING(user.client.current_viewport_width / 2, 1), CEILING(user.client.current_viewport_height / 2, 1))) + . = max(., UI_UPDATE) + + // Check if the state allows interaction + var/result = state.can_use_topic(src_object, user) + . = max(., result) + +//* API - Update - Optimizers, look here! *// + +/** + * public + * + * Forces an update to regular UI data. + * + * If no user is provided, every user will be updated. + * + * todo: this does not update embedders + * + * @params + * * user - (optional) the mob to update + * * ui - (optional) the /datum/tgui to update + */ +/datum/proc/update_ui_data(mob/user, datum/tgui/ui) + if(isnull(user)) + SStgui.update_uis(src) + else + SStgui.try_update_ui(user, src, ui) + +/** + * public + * + * Forces an update on static data. Should be done manually whenever something + * happens to change static data. + * + * If no user is provided, every user will be updated. + * + * todo: this does not update embedders + * + * optional user the mob currently interacting with the ui + * optional ui tgui to be updated + * optional hard_refreshion use if you need to block the ui from showing if the refresh queues + */ +/datum/proc/update_static_data(mob/user, datum/tgui/ui, hard_refresh) + if(!user) + for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + window.send_full_update(hard_refresh = hard_refresh) + return + if(!ui) + ui = SStgui.get_open_ui(user, src) + if(ui) + ui.send_full_update(hard_refresh = hard_refresh) + +/** + * immediately shunts this data to either an user, an ui, or all users. + * + * prefer to use this instead of update_static_data or update_ui_data, because this supports embedding + * and is generally faster. + * + * @params + * * user - when specified, only pushes this user. else, pushes to all windows. + * * ui - when specified, only pushes this ui for a given user. + * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. + */ +/datum/proc/push_ui_data(mob/user, datum/tgui/ui, list/data) + // todo: the way this works is so jank; this should be COMSIG_DATUM_HOOK_UI_PUSH instead? + // todo: this is because user, ui, data needs to go to the signal before being auto-resolved, as modules + // todo: won't necessarily match the values! + // FUCK + // ~silicons + SEND_SIGNAL(src, COMSIG_DATUM_PUSH_UI_DATA, user, ui, data) + if(!user) + for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + window.push_data(data) + return + if(!ui) + ui = SStgui.get_open_ui(user, src) + if(ui) + // todo: this is force because otherwise static data can be desynced. should static data be on another proc instead? + ui.push_data(data, TRUE) + +/** + * immediately pushes module updates to user, an ui, or all users + * + * @params + * * user - when specified, only pushes this user. else, pushes to all windows. + * * ui - when specified, only pushes this ui for a given user. + * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. + */ +/datum/proc/push_ui_modules(mob/user, datum/tgui/ui, list/updates) + if(!user) + for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + window.push_modules(updates) + return + if(!ui) + ui = SStgui.get_open_ui(user, src) + if(ui) + ui.push_modules(updates) + +//* Checks *// + +/** + * public + * + * checks if UIs are open + */ +/datum/proc/has_open_ui() + return length(SStgui.open_uis_by_src[REF(src)]) + +//* Hooks *// + +/** + * Called when a new UI is opened with this datum as the host, or when this datum is embedded into another UI. + * + * Called once per embed, if multiple windows embedding this datum is transferred. Handle this accordingly! + * + * When overriding this, be sure to cast embed_context to the right type for your datum. + * + * @params + * * user - opening mob + * * ui - the tgui instance + * * embedded - this was an embedded ui / the datum is being embedded + */ +/datum/proc/on_ui_open(mob/user, datum/tgui/ui, embedded) + SIGNAL_HANDLER + +/** + * Called when an UI with this datum as the host is closed, or when an UI is no longer embedding this datum. + * + * Called once per embed, if multiple windows embedding this datum is transferred. Handle this accordingly! + * + * When overriding this, be sure to cast embed_context to the right type for your datum. + * + * @params + * * user - opening mob + * * ui - the tgui instance + * * embedded - this was an embedded ui / the datum is being un-embedded + */ +/datum/proc/on_ui_close(mob/user, datum/tgui/ui, embedded) + SIGNAL_HANDLER + +/** + * Called on a UI's object when the UI is transferred from one mob to another. + * + * Called once per embed, if multiple windows embedding this datum is transferred. Handle this accordingly! + * + * When overriding this, be sure to cast embed_context to the right type for your datum. + * + * @params + * * old_mob - the old mob + * * new_mob - the new mob + * * ui - the tgui instance + * * embedded - this was an embedded transfer + */ +/datum/proc/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui, embedded) + return diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm deleted file mode 100644 index 72429d4a77..0000000000 --- a/code/modules/tgui/external.dm +++ /dev/null @@ -1,300 +0,0 @@ -/** - * External tgui definitions, such as src_object APIs. - * - *! Copyright (c) 2020 Aleksej Komarov - *! SPDX-License-Identifier: MIT - */ - -/** - * public - * - * Used to open and update UIs. - * If this proc is not implemented properly, the UI will not update correctly. - * - * required user mob The mob who opened/is using the UI. - * optional ui datum/tgui The UI to be updated, if it exists. - * - *! ## To-Be-Deprecated. - * optional parent_ui datum/tgui A parent UI that, when closed, closes this UI as well. - */ -/datum/proc/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) - return FALSE // Not implemented. - -/** - * public - * - * Data to be sent to the UI. - * This must be implemented for a UI to work. - * - * required user mob The mob interacting with the UI. - * - * return list Data to be sent to the UI. - */ -/datum/proc/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() // Not implemented. - -/** - * public - * - * Static Data to be sent to the UI. - * - * Static data differs from normal data in that it's large data that should be - * sent infrequently. This is implemented optionally for heavy uis that would - * be sending a lot of redundant data frequently. Gets squished into one - * object on the frontend side, but the static part is cached. - * - * required user mob The mob interacting with the UI. - * - * return list Statuic Data to be sent to the UI. - */ -/datum/proc/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() - -/** - * public - * - * Forces an update to regular UI data. - * - * If no user is provided, every user will be updated. - * - * @params - * * user - (optional) the mob to update - * * ui - (optional) the /datum/tgui to update - */ -/datum/proc/update_ui_data(mob/user, datum/tgui/ui) - if(isnull(user)) - SStgui.update_uis(src) - else - SStgui.try_update_ui(user, src, ui) - - -/** - * public - * - * Forces an update on static data. Should be done manually whenever something - * happens to change static data. - * - * If no user is provided, every user will be updated. - * - * optional user the mob currently interacting with the ui - * optional ui tgui to be updated - * optional hard_refreshion use if you need to block the ui from showing if the refresh queues - */ -/datum/proc/update_static_data(mob/user, datum/tgui/ui, hard_refresh) - if(!user) - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) - window.send_full_update(hard_refresh = hard_refresh) - return - if(!ui) - ui = SStgui.get_open_ui(user, src) - if(ui) - ui.send_full_update(hard_refresh = hard_refresh) - -/** - * immediately shunts this data to either an user, an ui, or all users. - * - * @params - * * user - when specified, only pushes this user. else, pushes to all windows. - * * ui - when specified, only pushes this ui for a given user. - * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. - */ -/datum/proc/push_ui_data(mob/user, datum/tgui/ui, list/data) - if(!user) - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) - window.push_data(data) - return - if(!ui) - ui = SStgui.get_open_ui(user, src) - if(ui) - ui.push_data(data) - -/** - * immediately pushes module updates to user, an ui, or all users - * - * @params - * * user - when specified, only pushes this user. else, pushes to all windows. - * * ui - when specified, only pushes this ui for a given user. - * * updates - list(id = list(data...), ...) for modules. the reducer on tgui-side will only overwrite provided data keys. - */ -/datum/proc/push_ui_modules(mob/user, datum/tgui/ui, list/updates) - if(!user) - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) - window.push_modules(updates) - return - if(!ui) - ui = SStgui.get_open_ui(user, src) - if(ui) - ui.push_modules(updates) - -/** - * public - * - * Called on a UI when the UI receieves a href. - * Think of this as Topic(). - * - * required action string The action/button that has been invoked by the user. - * required params list A list of parameters attached to the button. - * - * return bool If the user's input has been handled and the UI should update. - */ -/datum/proc/ui_act(action, list/params, datum/tgui/ui) - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_UI_ACT, usr, action, params, ui) - // If UI is not interactive or usr calling Topic is not the UI user, bail. - if(!ui || ui.status != UI_INTERACTIVE) - return TRUE - -/** - * public - * - * Called on an object when a tgui object is being created, allowing you to - * push various assets to tgui, for examples spritesheets. - * - * return list List of asset datums or file paths. - */ -/datum/proc/ui_assets(mob/user) - return list() - -/** - * private - * - * The UI's host object (usually src_object). - * This allows modules/datums to have the UI attached to them, - * and be a part of another object. - */ -/datum/proc/ui_host(mob/user, datum/tgui_module/module) - return src // Default src. - -/** - * private - * - * The UI's state controller to be used for created uis - * This is a proc over a var for memory reasons - */ -/datum/proc/ui_state(mob/user, datum/tgui_module/module) - return GLOB.default_state - -/** - * public - * - * checks if UIs are open - */ -/datum/proc/has_open_ui() - return length(SStgui.open_uis_by_src[REF(src)]) - -/** - * global - * - * Associative list of JSON-encoded shared states that were set by - * tgui clients. - */ -/datum/var/list/tgui_shared_states - -/** - * global - * - * Tracks open UIs for a user. - */ -/mob/var/list/tgui_open_uis = list() - -/** - * global - * - * Tracks open windows for a user. - */ -/client/var/list/tgui_windows = list() - -/** - * global - * - * TRUE if cache was reloaded by tgui dev server at least once. - */ -/client/var/tgui_cache_reloaded = FALSE - -/** - * public - * - * Called on a UI's object when the UI is closed, not to be confused with - * client/verb/uiclose(), which closes the ui window - * - * @params - * * user - closing mob - * * module - (optional) the module it came from, if any - */ -/datum/proc/ui_close(mob/user, datum/tgui_module/module) - SIGNAL_HANDLER - -/** - * public - * - * Called on a UI's object when the UI is transferred from one mob to another. - */ -/datum/proc/on_ui_transfer(mob/old_mob, mob/new_mob, datum/tgui/ui) - return - -/** - * verb - * - * Called by UIs when they are closed. - * Must be a verb so winset() can call it. - * - * required uiref ref The UI that was closed. - */ -/client/verb/uiclose(window_id as text) - // Name the verb, and hide it from the user panel. - set name = "uiclose" - set hidden = TRUE - var/mob/user = src?.mob - if(!user) - return - // Close all tgui datums based on window_id. - SStgui.force_close_window(user, window_id) - -/** - * Middleware for /client/Topic. - * - * return bool If TRUE, prevents propagation of the topic call. - */ -/proc/tgui_Topic(href_list) - // Skip non-tgui topics - if(!href_list["tgui"]) - return FALSE - var/type = href_list["type"] - // Unconditionally collect tgui logs - if(type == "log") - var/context = href_list["window_id"] - if (href_list["ns"]) - context += " ([href_list["ns"]])" - log_tgui(usr, href_list["message"], - context = context) - // Reload all tgui windows - if(type == "cacheReloaded") - log_tgui(usr, context = "debug/reload") - // Mark as reloaded - usr.client.tgui_cache_reloaded = TRUE - // Notify windows - var/list/windows = usr.client.tgui_windows - for(var/window_id in windows) - var/datum/tgui_window/window = windows[window_id] - if (window.status == TGUI_WINDOW_READY) - window.on_message(type, null, href_list) - return TRUE - // Locate window - var/window_id = href_list["window_id"] - var/datum/tgui_window/window - if(window_id) - window = usr.client.tgui_windows[window_id] - if(!window) - log_tgui(usr, - "Error: Couldn't find the window datum, force closing.", - context = window_id) - SStgui.force_close_window(usr, window_id) - return TRUE - // Decode payload - var/payload - if(href_list["payload"]) - payload = json_decode(href_list["payload"]) - // Pass message to window - if(window) - window.on_message(type, payload, href_list) - return TRUE diff --git a/code/modules/tgui/modal_vr_legacy.dm b/code/modules/tgui/legacy/modal_vr_legacy.dm similarity index 100% rename from code/modules/tgui/modal_vr_legacy.dm rename to code/modules/tgui/legacy/modal_vr_legacy.dm diff --git a/code/modules/tgui/mob.dm b/code/modules/tgui/mob.dm new file mode 100644 index 0000000000..9e4113f2b2 --- /dev/null +++ b/code/modules/tgui/mob.dm @@ -0,0 +1,15 @@ +/** + * External tgui definitions, such as src_object APIs. + * + *! Copyright (c) 2020 Aleksej Komarov + *! SPDX-License-Identifier: MIT + */ + +/** + * global + * + * Tracks open UIs for a user. + */ +/mob/var/list/tgui_open_uis = list() + + diff --git a/code/modules/tgui/modals/tgui_alert.dm b/code/modules/tgui/modals/tgui_alert.dm index 449f678045..c39ed6c8a4 100644 --- a/code/modules/tgui/modals/tgui_alert.dm +++ b/code/modules/tgui/modals/tgui_alert.dm @@ -116,14 +116,14 @@ ui = new(user, src, "AlertModal") ui.open() -/datum/tgui_modal/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_modal/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_modal/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_modal/ui_state() return GLOB.always_state -/datum/tgui_modal/ui_static_data(mob/user) +/datum/tgui_modal/ui_static_data(mob/user, datum/tgui/ui) . = list() .["autofocus"] = autofocus .["buttons"] = buttons @@ -132,12 +132,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_modal/ui_data(mob/user) +/datum/tgui_modal/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) -/datum/tgui_modal/ui_act(action, list/params) +/datum/tgui_modal/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/modals/tgui_dynamic_input.dm b/code/modules/tgui/modals/tgui_dynamic_input.dm index 8fc7338ccc..e58b1b0e7b 100644 --- a/code/modules/tgui/modals/tgui_dynamic_input.dm +++ b/code/modules/tgui/modals/tgui_dynamic_input.dm @@ -173,7 +173,7 @@ closed = TRUE return ..() -/datum/tgui_dynamic_input/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_dynamic_input/ui_static_data(mob/user, datum/tgui/ui) . = ..() .["query"] = query.get_query() .["title"] = title @@ -202,7 +202,7 @@ finish(null) return TRUE -/datum/tgui_dynamic_input/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_dynamic_input/ui_state() return GLOB.always_state /datum/tgui_dynamic_input/proc/block_on_finished() diff --git a/code/modules/tgui/modals/tgui_input_list.dm b/code/modules/tgui/modals/tgui_input_list.dm index 55c10203bd..388359e22c 100644 --- a/code/modules/tgui/modals/tgui_input_list.dm +++ b/code/modules/tgui/modals/tgui_input_list.dm @@ -134,14 +134,14 @@ ui = new(user, src, "ListInputModal") ui.open() -/datum/tgui_list_input/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_list_input/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_list_input/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_list_input/ui_state() return GLOB.always_state -/datum/tgui_list_input/ui_static_data(mob/user) +/datum/tgui_list_input/ui_static_data(mob/user, datum/tgui/ui) . = list() .["init_value"] = default || items[1] .["items"] = items @@ -150,12 +150,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_list_input/ui_data(mob/user) +/datum/tgui_list_input/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) -/datum/tgui_list_input/ui_act(action, list/params) +/datum/tgui_list_input/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/modals/tgui_input_number.dm b/code/modules/tgui/modals/tgui_input_number.dm index 7e0f1a308b..6e1a052411 100644 --- a/code/modules/tgui/modals/tgui_input_number.dm +++ b/code/modules/tgui/modals/tgui_input_number.dm @@ -136,14 +136,14 @@ ui = new(user, src, "NumberInputModal") ui.open() -/datum/tgui_input_number/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_input_number/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_input_number/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_input_number/ui_state() return GLOB.always_state -/datum/tgui_input_number/ui_static_data(mob/user) +/datum/tgui_input_number/ui_static_data(mob/user, datum/tgui/ui) . = list() .["init_value"] = default // Default is a reserved keyword .["large_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_large) @@ -153,12 +153,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_input_number/ui_data(mob/user) +/datum/tgui_input_number/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) -/datum/tgui_input_number/ui_act(action, list/params) +/datum/tgui_input_number/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/modals/tgui_input_text.dm b/code/modules/tgui/modals/tgui_input_text.dm index acadc7124b..6e5dc3ef69 100644 --- a/code/modules/tgui/modals/tgui_input_text.dm +++ b/code/modules/tgui/modals/tgui_input_text.dm @@ -158,14 +158,14 @@ ui = new(user, src, "TextInputModal") ui.open() -/datum/tgui_input_text/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_input_text/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() closed = TRUE -/datum/tgui_input_text/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_input_text/ui_state() return GLOB.always_state -/datum/tgui_input_text/ui_static_data(mob/user) +/datum/tgui_input_text/ui_static_data(mob/user, datum/tgui/ui) . = list() .["large_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_large) .["max_length"] = max_length @@ -175,12 +175,12 @@ .["swapped_buttons"] = FALSE//user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) .["title"] = title -/datum/tgui_input_text/ui_data(mob/user) +/datum/tgui_input_text/ui_data(mob/user, datum/tgui/ui) . = list() if(timeout) .["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) -/datum/tgui_input_text/ui_act(action, list/params) +/datum/tgui_input_text/ui_act(action, list/params, datum/tgui/ui) . = ..() if (.) return diff --git a/code/modules/tgui/module.dm b/code/modules/tgui/module.dm index 309c79ee2b..6aebc2669e 100644 --- a/code/modules/tgui/module.dm +++ b/code/modules/tgui/module.dm @@ -54,19 +54,18 @@ SIGNAL_HANDLER qdel(src) -/datum/tgui_module/ui_host(mob/user, datum/tgui_module/module) - return isnull(host)? src : host.ui_host(user, src) +/datum/tgui_module/ui_host() + return isnull(host)? src : host.ui_host() -/datum/tgui_module/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() - host?.ui_close(user, src) if(ephemeral) qdel(src) -/datum/tgui_module/ui_state(mob/user, datum/tgui_module/module) - return isnull(host)? ..() : host.ui_state(user, src) +/datum/tgui_module/ui_state() + return isnull(host)? ..() : host.ui_state() -/datum/tgui_module/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_module/ui_status(mob/user, datum/ui_state/state) return isnull(host)? ..() : host.ui_status(user, state, src) /datum/tgui_module/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) @@ -78,21 +77,19 @@ /** * called directly, if operating standalone. routes to static_data(user), with all other args skipped. */ -/datum/tgui_module/ui_static_data(mob/user) +/datum/tgui_module/ui_static_data(mob/user, datum/tgui/ui) return static_data(user) /** * called directly, if operating standalone. routes to data(user), with all other args skipped. */ -/datum/tgui_module/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module/ui_data(mob/user, datum/tgui/ui) return data(user) /** * called directly, if operating standalone. */ /datum/tgui_module/ui_act(action, list/params, datum/tgui/ui) - // we only override this to provide comment - // yes yes proc overhead sue me it's called like 10k times a round, tops. return ..() /** @@ -109,87 +106,3 @@ */ /datum/tgui_module/proc/data(mob/user, ...) return list() - -/** - * route a received ui_act for module handling - * remember that $id, $ref in params corrosponds to module id, module ref. - * - * we use id instead of module to prevent potential security issues down the line. - */ -/datum/proc/ui_module_route(action, list/params, datum/tgui/ui, id) - if(!id) - // no id? - // i know that guy! - // it's me! - return ui_act(action, params, ui) - // it's not us, respect overrides that wish to hook module behavior - if(ui_module_act(action, params, ui, id)) - return TRUE - -/** - * called as a hook for intercepting ui acts from a module - * remember that $id, $ref in params corrosponds to module id, module ref. - * we don't provide $ref directly for security reasons. - * you can use it if you know what you're doing. - * - * this is an advanced proc. - * the module's ui_status() is *not* checked for you in ..()! - * - * return TRUE for ui update + prevent propagation to the module - */ -/datum/proc/ui_module_act(action, list/params, datum/tgui/ui, id) - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_UI_MODULE_ACT, usr, id, action, params, ui) - -/** - * called to inject ui module data. - * they will be handled by a separate reducer to make static data work. - * you can technically use this for things other than tgui_module's - * for example, for RIG/other "modular items-in-items" to hold data. - * - * this will be sent into data.modules.* instead of just data.* - * - * @params - * * user - user - * * ui - root tgui module is in - * * state - ui state - */ -/datum/proc/ui_module_data(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() - -/** - * called to inject ui module static data. - * they will be handled by a separate reducer to make static data work. - * you can technically use this for things other than tgui_module's - * for example, for RIG/other "modular items-in-items" to hold data. - * - * this will be sent into data.modules[id].* instead of just data.* - * - * @params - * * user - user - * * ui - root tgui module is in - * * state - ui state - */ -/datum/proc/ui_module_static(mob/user, datum/tgui/ui, datum/ui_state/state) - return list() - -/** - * public - * - * Send an update to module data. - * As with normal data, this will be combined by a reducer - * to overwrite only where necessary, so partial pushes - * can work fine. - * - * WARNING: Do not use this unless you know what you are doing. - * - * @params - * * updates - list(id = list(data...), ...) of modules to update. - * * force - (optional) send update even if UI is not interactive - */ -/datum/tgui/proc/push_modules(list/updates, force) - if(isnull(user.client) || !initialized || closing) - return - if(!force && status < UI_UPDATE) - return - window.send_message("modules", updates) diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm index b00a53707b..b428b233b9 100644 --- a/code/modules/tgui/modules/_base.dm +++ b/code/modules/tgui/modules/_base.dm @@ -23,9 +23,9 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff /datum/tgui_module_old/ui_host() return host ? host.ui_host() : src -/datum/tgui_module_old/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/on_ui_close(mob/user, datum/tgui/ui, embedded) if(host) - host.ui_close(user) + host.on_ui_close(user, ui, TRUE) /datum/tgui_module_old/proc/check_eye(mob/user) return -1 @@ -55,14 +55,14 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff return 0 -/datum/tgui_module_old/ui_static_data() +/datum/tgui_module_old/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/obj/item/modular_computer/host = ui_host() if(istype(host)) . += host.get_header_data() -/datum/tgui_module_old/ui_act(action, params) +/datum/tgui_module_old/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/admin_shuttle_controller.dm b/code/modules/tgui/modules/admin_shuttle_controller.dm index aaf1c73ec5..1f542ffe80 100644 --- a/code/modules/tgui/modules/admin_shuttle_controller.dm +++ b/code/modules/tgui/modules/admin_shuttle_controller.dm @@ -4,7 +4,7 @@ name = "Admin Shuttle Controller" tgui_id = "AdminShuttleController" -/datum/tgui_module_old/admin_shuttle_controller/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/admin_shuttle_controller/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/list/shuttles = list() @@ -29,7 +29,7 @@ return data -/datum/tgui_module_old/admin_shuttle_controller/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/admin_shuttle_controller/ui_state() return GLOB.tgui_admin_state /datum/tgui_module_old/admin_shuttle_controller/ui_act(action, list/params, datum/tgui/ui) diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm index 7610d9c87c..ca4cf6eb8b 100644 --- a/code/modules/tgui/modules/agentcard.dm +++ b/code/modules/tgui/modules/agentcard.dm @@ -2,7 +2,7 @@ name = "Agent Card" tgui_id = "AgentCard" -/datum/tgui_module_old/agentcard/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/agentcard/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/obj/item/card/id/syndicate/S = ui_host() @@ -26,7 +26,7 @@ return data -/datum/tgui_module_old/agentcard/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_module_old/agentcard/ui_status(mob/user, datum/ui_state/state) var/obj/item/card/id/syndicate/S = ui_host() if(!istype(S)) return UI_CLOSE @@ -46,7 +46,7 @@ . = TRUE if("age") var/new_age = input(usr,"What age would you like to put on this card?","Agent Card Age", S.age) as null|num - if(!isnull(new_age) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_age) && ui?.still_interactive()) if(new_age < 0) S.age = initial(S.age) else @@ -55,14 +55,14 @@ . = TRUE if("appearance") var/datum/card_state/choice = input(usr, "Select the appearance for this card.", "Agent Card Appearance") as null|anything in id_card_states() - if(choice && ui_status(usr, state) == UI_INTERACTIVE) + if(choice && ui?.still_interactive()) S.icon_state = choice.icon_state S.item_state = choice.item_state to_chat(usr, "Appearance changed to [choice].") . = TRUE if("assignment") var/new_job = sanitize(input(usr,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", S.assignment) as null|text) - if(!isnull(new_job) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_job) && ui?.still_interactive()) S.assignment = new_job to_chat(usr, "Occupation changed to '[new_job]'.") S.update_name() @@ -74,7 +74,7 @@ if(H.dna) default = H.dna.b_type var/new_blood_type = sanitize(input(usr,"What blood type would you like to be written on this card?","Agent Card Blood Type",default) as null|text) - if(!isnull(new_blood_type) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_blood_type) && ui?.still_interactive()) S.blood_type = new_blood_type to_chat(usr, "Blood type changed to '[new_blood_type]'.") . = TRUE @@ -85,7 +85,7 @@ if(H.dna) default = H.dna.unique_enzymes var/new_dna_hash = sanitize(input(usr,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default) as null|text) - if(!isnull(new_dna_hash) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_dna_hash) && ui?.still_interactive()) S.dna_hash = new_dna_hash to_chat(usr, "DNA hash changed to '[new_dna_hash]'.") . = TRUE @@ -96,13 +96,13 @@ if(H.dna) default = md5(H.dna.uni_identity) var/new_fingerprint_hash = sanitize(input(usr,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default) as null|text) - if(!isnull(new_fingerprint_hash) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_fingerprint_hash) && ui?.still_interactive()) S.fingerprint_hash = new_fingerprint_hash to_chat(usr, "Fingerprint hash changed to '[new_fingerprint_hash]'.") . = TRUE if("name") var/new_name = sanitizeName(input(usr,"What name would you like to put on this card?","Agent Card Name", S.registered_name) as null|text) - if(!isnull(new_name) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_name) && ui?.still_interactive()) S.registered_name = new_name S.update_name() to_chat(usr, "Name changed to '[new_name]'.") @@ -113,12 +113,12 @@ . = TRUE if("sex") var/new_sex = sanitize(input(usr,"What sex would you like to put on this card?","Agent Card Sex", S.sex) as null|text) - if(!isnull(new_sex) && ui_status(usr, state) == UI_INTERACTIVE) + if(!isnull(new_sex) && ui?.still_interactive()) S.sex = new_sex to_chat(usr, "Sex changed to '[new_sex]'.") . = TRUE if("factoryreset") - if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && ui_status(usr, state) == UI_INTERACTIVE) + if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && ui?.still_interactive()) S.age = initial(S.age) S.access = syndicate_access.Copy() S.assignment = initial(S.assignment) diff --git a/code/modules/tgui/modules/alarm.dm b/code/modules/tgui/modules/alarm.dm index f2d98da5b7..b3f389eb79 100644 --- a/code/modules/tgui/modules/alarm.dm +++ b/code/modules/tgui/modules/alarm.dm @@ -17,11 +17,11 @@ // Subtype for glasses_state /datum/tgui_module_old/alarm_monitor/all/glasses -/datum/tgui_module_old/alarm_monitor/all/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/all/glasses/ui_state() return GLOB.glasses_state /datum/tgui_module_old/alarm_monitor/all/robot -/datum/tgui_module_old/alarm_monitor/all/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/all/robot/ui_state() return GLOB.self_state /datum/tgui_module_old/alarm_monitor/engineering @@ -31,12 +31,12 @@ // Subtype for glasses_state /datum/tgui_module_old/alarm_monitor/engineering/glasses -/datum/tgui_module_old/alarm_monitor/engineering/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/engineering/glasses/ui_state() return GLOB.glasses_state // Subtype for nif_state /datum/tgui_module_old/alarm_monitor/engineering/nif -/datum/tgui_module_old/alarm_monitor/engineering/nif/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/engineering/nif/ui_state() return GLOB.nif_state // Subtype for NTOS @@ -50,7 +50,7 @@ // Subtype for glasses_state /datum/tgui_module_old/alarm_monitor/security/glasses -/datum/tgui_module_old/alarm_monitor/security/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/alarm_monitor/security/glasses/ui_state() return GLOB.glasses_state // Subtype for NTOS @@ -97,7 +97,7 @@ return all_alarms -/datum/tgui_module_old/alarm_monitor/ui_act(action, params) +/datum/tgui_module_old/alarm_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -115,7 +115,7 @@ usr.switch_to_camera(C) return 1 -/datum/tgui_module_old/alarm_monitor/ui_data(mob/user) +/datum/tgui_module_old/alarm_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/categories[0] diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index d0e1ee1aaf..3fe3b57b09 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -299,7 +299,7 @@ if(custom_state) ui.set_state(custom_state) -/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user) +/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() generate_data(usr) @@ -327,7 +327,7 @@ return data -/datum/tgui_module_old/appearance_changer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/appearance_changer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() generate_data(user) @@ -390,7 +390,7 @@ data["facial_hair_color"] = rgb(target.r_facial, target.g_facial, target.b_facial) return data -/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user) +/datum/tgui_module_old/appearance_changer/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["mapRef"] = map_name return data diff --git a/code/modules/tgui/modules/appearance_changer_vr.dm b/code/modules/tgui/modules/appearance_changer_vr.dm index dcfe37cdc9..e6e78817b8 100644 --- a/code/modules/tgui/modules/appearance_changer_vr.dm +++ b/code/modules/tgui/modules/appearance_changer_vr.dm @@ -2,10 +2,10 @@ name = "Appearance Editor (Vore)" flags = APPEARANCE_ALL -/datum/tgui_module_old/appearance_changer/vore/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/appearance_changer/vore/ui_state() return GLOB.tgui_conscious_state -/datum/tgui_module_old/appearance_changer/vore/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) +/datum/tgui_module_old/appearance_changer/vore/ui_status(mob/user, datum/ui_state/state) if(!isbelly(owner.loc)) return UI_CLOSE return ..() @@ -16,7 +16,7 @@ cam_background.fill_rect(1, 1, 1, 1) local_skybox.cut_overlays() -/datum/tgui_module_old/appearance_changer/vore/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/appearance_changer/vore/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() QDEL_IN(src, 1) diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm index 8ad661055a..cb3685a6ea 100644 --- a/code/modules/tgui/modules/atmos_control.dm +++ b/code/modules/tgui/modules/atmos_control.dm @@ -18,7 +18,7 @@ // machines may not yet be ordered at this point monitored_alarms = dd_sortedObjectList(monitored_alarms) -/datum/tgui_module_old/atmos_control/ui_act(action, params, datum/tgui/ui) +/datum/tgui_module_old/atmos_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -45,7 +45,7 @@ ui.open() ui_ref = ui -/datum/tgui_module_old/atmos_control/ui_static_data(mob/user) +/datum/tgui_module_old/atmos_control/ui_static_data(mob/user, datum/tgui/ui) . = ..() var/z = get_z(user) @@ -67,7 +67,7 @@ "z" = alarm.z) .["alarms"] = alarms -/datum/tgui_module_old/atmos_control/ui_data(mob/user) +/datum/tgui_module_old/atmos_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/z = get_z(user) @@ -76,7 +76,7 @@ return data -/datum/tgui_module_old/atmos_control/ui_close() +/datum/tgui_module_old/atmos_control/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() ui_ref = null @@ -110,5 +110,5 @@ ntos = TRUE /datum/tgui_module_old/atmos_control/robot -/datum/tgui_module_old/atmos_control/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/atmos_control/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm index 7ea016037a..0c17cfd2a7 100644 --- a/code/modules/tgui/modules/camera.dm +++ b/code/modules/tgui/modules/camera.dm @@ -102,7 +102,7 @@ ui = new(user, src, tgui_id, name) ui.open() -/datum/tgui_module_old/camera/ui_data() +/datum/tgui_module_old/camera/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["activeCamera"] = null if(active_camera) @@ -112,7 +112,7 @@ ) return data -/datum/tgui_module_old/camera/ui_static_data(mob/user) +/datum/tgui_module_old/camera/ui_static_data(mob/user, datum/tgui/ui) var/list/data = ..() data["mapRef"] = map_name var/list/cameras = get_available_cameras(user) @@ -127,7 +127,7 @@ data["allNetworks"] |= C.network return data -/datum/tgui_module_old/camera/ui_act(action, params) +/datum/tgui_module_old/camera/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -260,7 +260,7 @@ cam_background.icon_state = "scanline2" cam_background.fill_rect(1, 1, default_map_size, default_map_size) -/datum/tgui_module_old/camera/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/camera/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() var/user_ref = REF(user) var/is_living = isliving(user) diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm index 475a72c579..4ccf0ff79f 100644 --- a/code/modules/tgui/modules/communications.dm +++ b/code/modules/tgui/modules/communications.dm @@ -84,7 +84,7 @@ feedback_inc("alert_comms_blue",1) tmp_alertlevel = 0 -/datum/tgui_module_old/communications/ui_data(mob/user) +/datum/tgui_module_old/communications/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["is_ai"] = isAI(user) || isrobot(user) data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state @@ -194,7 +194,7 @@ frequency.post_signal(null, status_signal) -/datum/tgui_module_old/communications/ui_act(action, params) +/datum/tgui_module_old/communications/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE if((LEGACY_MAP_DATUM) && !(get_z(usr) in (LEGACY_MAP_DATUM).contact_levels)) diff --git a/code/modules/tgui/modules/crew_manifest.dm b/code/modules/tgui/modules/crew_manifest.dm index 93c60f980e..311036a3d0 100644 --- a/code/modules/tgui/modules/crew_manifest.dm +++ b/code/modules/tgui/modules/crew_manifest.dm @@ -2,7 +2,7 @@ name = "Crew Manifest" tgui_id = "CrewManifest" -/datum/tgui_module_old/crew_manifest/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/crew_manifest/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(data_core) data_core.get_manifest_list() @@ -10,5 +10,5 @@ return data /datum/tgui_module_old/crew_manifest/robot -/datum/tgui_module_old/crew_manifest/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_manifest/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index 7bdde5185b..c7877af28a 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -7,7 +7,7 @@ get_asset_datum(/datum/asset/simple/nanomaps), ) -/datum/tgui_module_old/crew_monitor/ui_act(action, params, datum/tgui/ui) +/datum/tgui_module_old/crew_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -45,7 +45,7 @@ ui.open() -/datum/tgui_module_old/crew_monitor/ui_data(mob/user) +/datum/tgui_module_old/crew_monitor/ui_data(mob/user, datum/tgui/ui) var/data[0] data["isAI"] = isAI(user) @@ -71,15 +71,15 @@ // Subtype for glasses_state /datum/tgui_module_old/crew_monitor/glasses -/datum/tgui_module_old/crew_monitor/glasses/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_monitor/glasses/ui_state() return GLOB.glasses_state // Subtype for self_state /datum/tgui_module_old/crew_monitor/robot -/datum/tgui_module_old/crew_monitor/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_monitor/robot/ui_state() return GLOB.self_state // Subtype for nif_state /datum/tgui_module_old/crew_monitor/nif -/datum/tgui_module_old/crew_monitor/nif/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/crew_monitor/nif/ui_state() return GLOB.nif_state diff --git a/code/modules/tgui/modules/general/cardmod.dm b/code/modules/tgui/modules/general/cardmod.dm index 8159736558..579cc6a645 100644 --- a/code/modules/tgui/modules/general/cardmod.dm +++ b/code/modules/tgui/modules/general/cardmod.dm @@ -432,7 +432,7 @@ */ /datum/tgui_module/card_mod/admin -/datum/tgui_module/card_mod/admin/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module/card_mod/admin/ui_state() return GLOB.admin_state diff --git a/code/modules/tgui/modules/gyrotron_control.dm b/code/modules/tgui/modules/gyrotron_control.dm index ed6134e02b..8b5fdf5af1 100644 --- a/code/modules/tgui/modules/gyrotron_control.dm +++ b/code/modules/tgui/modules/gyrotron_control.dm @@ -5,7 +5,7 @@ var/gyro_tag = "" var/scan_range = 25 -/datum/tgui_module_old/gyrotron_control/ui_act(action, params) +/datum/tgui_module_old/gyrotron_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -43,7 +43,7 @@ G.rate = new_delay return TRUE -/datum/tgui_module_old/gyrotron_control/ui_data(mob/user) +/datum/tgui_module_old/gyrotron_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/gyros = list() diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm index f191650502..6185b8fb79 100644 --- a/code/modules/tgui/modules/law_manager.dm +++ b/code/modules/tgui/modules/law_manager.dm @@ -145,7 +145,7 @@ owner.lawsync() return ..() // 800, is_malf(user) ? 600 : 400 -/datum/tgui_module_old/law_manager/ui_data(mob/user) +/datum/tgui_module_old/law_manager/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["ion_law_nr"] = ionnum() @@ -216,9 +216,9 @@ log_and_message_admins("has syncronized [AI]'s laws with its borgs.") /datum/tgui_module_old/law_manager/robot -/datum/tgui_module_old/law_manager/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/law_manager/robot/ui_state() return GLOB.tgui_self_state /datum/tgui_module_old/law_manager/admin -/datum/tgui_module_old/law_manager/admin/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/law_manager/admin/ui_state() return GLOB.tgui_admin_state diff --git a/code/modules/tgui/modules/ntos-only/configurator.dm b/code/modules/tgui/modules/ntos-only/configurator.dm index fe977f4cc4..8397c3bde8 100644 --- a/code/modules/tgui/modules/ntos-only/configurator.dm +++ b/code/modules/tgui/modules/ntos-only/configurator.dm @@ -4,7 +4,7 @@ tgui_id = "Configuration" var/obj/item/modular_computer/movable = null -/datum/tgui_module_old/computer_configurator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/computer_configurator/ui_data(mob/user, datum/tgui/ui) movable = ui_host() // No computer connection, we can't get data from that. if(!istype(movable)) @@ -37,7 +37,7 @@ data["hardware"] = all_entries return data -/datum/tgui_module_old/computer_configurator/ui_act(action, params) +/datum/tgui_module_old/computer_configurator/ui_act(action, list/params, datum/tgui/ui) if(..()) return switch(action) diff --git a/code/modules/tgui/modules/ntos-only/email.dm b/code/modules/tgui/modules/ntos-only/email.dm index 9ebabf6e78..ad1f1e14d2 100644 --- a/code/modules/tgui/modules/ntos-only/email.dm +++ b/code/modules/tgui/modules/ntos-only/email.dm @@ -67,7 +67,7 @@ last_message_count = 0 read_message_count = 0 -/datum/tgui_module_old/email_client/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/email_client/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // Password has been changed by other client connected to this email account @@ -228,7 +228,7 @@ return 1 -/datum/tgui_module_old/email_client/ui_act(action, params) +/datum/tgui_module_old/email_client/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm index 469a95e7e4..e216f4cece 100644 --- a/code/modules/tgui/modules/ntos-only/uav.dm +++ b/code/modules/tgui/modules/ntos-only/uav.dm @@ -8,7 +8,7 @@ var/list/viewers //Who's viewing a UAV through us var/adhoc_range = 30 //How far we can operate on a UAV without NTnet -/datum/tgui_module_old/uav/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/uav/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(current_uav) @@ -180,7 +180,7 @@ unlook(M) . = ..() -/datum/tgui_module_old/uav/ui_status(mob/user) +/datum/tgui_module_old/uav/ui_status(mob/user, datum/ui_state/state) . = ..() if(. > UI_DISABLED) if(viewing_uav(user)) @@ -188,7 +188,7 @@ return unlook(user) -/datum/tgui_module_old/uav/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/uav/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() unlook(user) diff --git a/code/modules/tgui/modules/overmap.dm b/code/modules/tgui/modules/overmap.dm index 6b10383615..0797e416d5 100644 --- a/code/modules/tgui/modules/overmap.dm +++ b/code/modules/tgui/modules/overmap.dm @@ -17,7 +17,7 @@ unlook(M) . = ..() -/datum/tgui_module_old/ship/ui_status(mob/user) +/datum/tgui_module_old/ship/ui_status(mob/user, datum/ui_state/state) . = ..() if(. > UI_DISABLED) if(viewing_overmap(user)) @@ -25,7 +25,7 @@ return unlook(user) -/datum/tgui_module_old/ship/ui_close(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/ship/on_ui_close(mob/user, datum/tgui/ui, embedded) . = ..() user.unset_machine() unlook(user) @@ -102,7 +102,7 @@ . = ..() -/datum/tgui_module_old/ship/nav/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/ship/nav/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() var/turf/T = get_turf(linked) @@ -124,7 +124,7 @@ return data -/datum/tgui_module_old/ship/nav/ui_act(action, params) +/datum/tgui_module_old/ship/nav/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -153,7 +153,7 @@ // SENSORS var/obj/machinery/shipsensors/sensors -/datum/tgui_module_old/ship/fullmonty/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/ship/fullmonty/ui_state() return GLOB.admin_state /datum/tgui_module_old/ship/fullmonty/New(host, obj/overmap/entity/visitable/ship/new_linked) @@ -178,7 +178,7 @@ break // Beware ye eyes. This holds all of the data from helm, engine, and sensor control all at once. -/datum/tgui_module_old/ship/fullmonty/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/ship/fullmonty/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() // HELM @@ -294,7 +294,7 @@ return data // Beware ye eyes. This holds all of the ACTIONS from helm, engine, and sensor control all at once. -/datum/tgui_module_old/ship/fullmonty/ui_act(action, params) +/datum/tgui_module_old/ship/fullmonty/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/power_monitor.dm b/code/modules/tgui/modules/power_monitor.dm index 4873addbd5..88f1be5ae0 100644 --- a/code/modules/tgui/modules/power_monitor.dm +++ b/code/modules/tgui/modules/power_monitor.dm @@ -8,7 +8,7 @@ . = ..() refresh_sensors() -/datum/tgui_module_old/power_monitor/ui_data(mob/user) +/datum/tgui_module_old/power_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/sensors = list() @@ -37,7 +37,7 @@ return data -/datum/tgui_module_old/power_monitor/ui_act(action, params) +/datum/tgui_module_old/power_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -81,5 +81,5 @@ // Subtype for self_state /datum/tgui_module_old/power_monitor/robot -/datum/tgui_module_old/power_monitor/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/power_monitor/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/rcon.dm b/code/modules/tgui/modules/rcon.dm index 5e59aec524..319d440a38 100644 --- a/code/modules/tgui/modules/rcon.dm +++ b/code/modules/tgui/modules/rcon.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(tgui_old_rcon_modules) GLOB.tgui_old_rcon_modules -= src -/datum/tgui_module_old/rcon/ui_data(mob/user) +/datum/tgui_module_old/rcon/ui_data(mob/user, datum/tgui/ui) FindDevices() // Update our devices list var/list/data = ..() @@ -40,7 +40,7 @@ GLOBAL_LIST_EMPTY(tgui_old_rcon_modules) return data -/datum/tgui_module_old/rcon/ui_act(action, params) +/datum/tgui_module_old/rcon/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -119,5 +119,5 @@ GLOBAL_LIST_EMPTY(tgui_old_rcon_modules) ntos = TRUE /datum/tgui_module_old/rcon/robot -/datum/tgui_module_old/rcon/robot/ui_state(mob/user, datum/tgui_module/module) +/datum/tgui_module_old/rcon/robot/ui_state() return GLOB.self_state diff --git a/code/modules/tgui/modules/rustcore_monitor.dm b/code/modules/tgui/modules/rustcore_monitor.dm index 0b8ddee4e9..c693b3b567 100644 --- a/code/modules/tgui/modules/rustcore_monitor.dm +++ b/code/modules/tgui/modules/rustcore_monitor.dm @@ -4,7 +4,7 @@ var/core_tag = "" -/datum/tgui_module_old/rustcore_monitor/ui_act(action, params) +/datum/tgui_module_old/rustcore_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -35,7 +35,7 @@ C.target_field_strength = new_strength return TRUE -/datum/tgui_module_old/rustcore_monitor/ui_data(mob/user) +/datum/tgui_module_old/rustcore_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/cores = list() diff --git a/code/modules/tgui/modules/rustfuel_control.dm b/code/modules/tgui/modules/rustfuel_control.dm index 43eb928c47..6caed63dda 100644 --- a/code/modules/tgui/modules/rustfuel_control.dm +++ b/code/modules/tgui/modules/rustfuel_control.dm @@ -4,7 +4,7 @@ var/fuel_tag = "" -/datum/tgui_module_old/rustfuel_control/ui_act(action, params) +/datum/tgui_module_old/rustfuel_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -26,7 +26,7 @@ if(new_ident) fuel_tag = new_ident -/datum/tgui_module_old/rustfuel_control/ui_data(mob/user) +/datum/tgui_module_old/rustfuel_control/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/fuels = list() diff --git a/code/modules/tgui/modules/shutoff_monitor.dm b/code/modules/tgui/modules/shutoff_monitor.dm index 78db2be14d..ca557c0cd3 100644 --- a/code/modules/tgui/modules/shutoff_monitor.dm +++ b/code/modules/tgui/modules/shutoff_monitor.dm @@ -2,7 +2,7 @@ name = "Shutoff Valve Monitoring" tgui_id = "ShutoffMonitor" -/datum/tgui_module_old/shutoff_monitor/ui_act(action, params) +/datum/tgui_module_old/shutoff_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE @@ -24,7 +24,7 @@ S.open() return TRUE -/datum/tgui_module_old/shutoff_monitor/ui_data(mob/user) +/datum/tgui_module_old/shutoff_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = list() var/list/valves = list() diff --git a/code/modules/tgui/modules/supermatter_monitor.dm b/code/modules/tgui/modules/supermatter_monitor.dm index 43df17079f..bc7d11c676 100644 --- a/code/modules/tgui/modules/supermatter_monitor.dm +++ b/code/modules/tgui/modules/supermatter_monitor.dm @@ -35,7 +35,7 @@ for(var/obj/machinery/power/supermatter/S in supermatters) . = max(., S.get_status()) -/datum/tgui_module_old/supermatter_monitor/ui_data(mob/user) +/datum/tgui_module_old/supermatter_monitor/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() if(istype(active)) @@ -88,7 +88,7 @@ return data -/datum/tgui_module_old/supermatter_monitor/ui_act(action, params) +/datum/tgui_module_old/supermatter_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/teleporter.dm b/code/modules/tgui/modules/teleporter.dm index 67e8574dc8..fb25939868 100644 --- a/code/modules/tgui/modules/teleporter.dm +++ b/code/modules/tgui/modules/teleporter.dm @@ -6,7 +6,7 @@ var/obj/machinery/tele_projector/station = null var/obj/machinery/tele_pad/hub = null -/datum/tgui_module_old/teleport_control/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/teleport_control/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["locked_name"] = locked_name || "No Target" @@ -17,7 +17,7 @@ return data -/datum/tgui_module_old/teleport_control/ui_act(action, params, datum/tgui/ui, datum/ui_state/state) +/datum/tgui_module_old/teleport_control/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index 7d927e799f..4bd764aed5 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -6,37 +6,6 @@ *! SPDX-License-Identifier: MIT */ -/** - * public - * - * Checks the UI state for a mob. - * - * required user mob The mob who opened/is using the UI. - * required state datum/ui_state The state to check. - * - * return UI_state The state of the UI. - */ -/datum/proc/ui_status(mob/user, datum/ui_state/state, datum/tgui_module/module) - var/src_object = ui_host(user) - . = UI_CLOSE - if(!state) - return - - if(isobserver(user)) - // If they turn on ghost AI control, admins can always interact. - if(IsAdminGhost(user)) - . = max(., UI_INTERACTIVE) - - // Regular ghosts can always at least view if in range. - if(user.client) - // todo: in view range for zooming - if(get_dist(src_object, user) < max(CEILING(user.client.current_viewport_width / 2, 1), CEILING(user.client.current_viewport_height / 2, 1))) - . = max(., UI_UPDATE) - - // Check if the state allows interaction - var/result = state.can_use_topic(src_object, user) - . = max(., result) - /** * private * diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 19c6f57db7..8e806bb64c 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -38,10 +38,18 @@ /// Are byond mouse events beyond the window passed in to the ui var/mouse_hooked = FALSE /// The Parent UI + //? STOP USING THIS. USE MODULES. ~SILICONS var/datum/tgui/parent_ui /// Children of this UI + //? STOP USING THIS. USE MODULES. ~SILICONS var/list/children = list() + //* Modules *// + /// datums to IDs + var/list/datum/modules_registered + /// processed modules + var/list/datum/modules_processed + /** * public * @@ -73,6 +81,8 @@ /datum/tgui/Destroy() user = null src_object = null + for(var/datum/module in modules_registered) + unregister_module(module) return ..() /** @@ -125,6 +135,10 @@ if(mouse_hooked) window.set_mouse_macro() SStgui.on_open(src) + // todo: should these hooks be here? + src_object.on_ui_open(user, src) + for(var/datum/module as anything in modules_registered) + module.on_ui_open(user, src, TRUE) return TRUE /** @@ -146,12 +160,15 @@ // the error message properly. window.release_lock() window.close(can_be_suspended) - src_object.ui_close(user) SStgui.on_close(src) state = null if(parent_ui) parent_ui.children -= src parent_ui = null + // todo: should these hooks be here? + src_object.on_ui_close(user, src) + for(var/datum/module as anything in modules_registered) + module.on_ui_close(user, src, TRUE) qdel(src) /** @@ -169,6 +186,8 @@ * * Enable/disable passing through byond mouse events to the window * + * todo: this is like the least documented proc in history wtf + * * required value bool Enable/disable hooking. */ /datum/tgui/proc/set_mouse_hook(value) @@ -240,24 +259,6 @@ with_data = should_update_data, )) -/** - * public - * - * Send a partial update to the client of only the provided data lists - * Does not update config at all - * - * WARNING: Do not use this unless you know what you are doing - * - * required data The data to send - * optional force bool Send an update even if UI is not interactive. - */ -/datum/tgui/proc/push_data(data, force) - if(!user.client || !initialized || closing) - return - if(!force && status < UI_UPDATE) - return - window.send_message("data", data) - /** * private * @@ -287,14 +288,18 @@ "observer" = isobserver(user), ), ) - var/list/modules + var/list/modules = list() // static first if(with_static_data) json_data["static"] = src_object.ui_static_data(user, src, state) - modules = src_object.ui_module_static(user, src, state) + for(var/datum/module as anything in modules_registered) + var/id = modules_registered[module] + modules[id] = module.ui_static_data(user, src, TRUE) if(with_data) json_data["data"] = src_object.ui_data(user, src, state) - modules = (modules || list()) | src_object.ui_module_data(user, src, state) + for(var/datum/module as anything in (with_static_data? modules_registered : modules_processed)) + var/id = modules_registered[module] + modules[id] = modules[id] | module.ui_data(user, src, TRUE) if(modules) json_data["modules"] = modules if(src_object.tgui_shared_states) @@ -383,7 +388,7 @@ // we're kind of stuck doing this // maybe in the future we'll just have ui modules list but for now // eh. - if(src_object.ui_module_route(action, payload, src, id)) + if(src_object.ui_route(action, payload, src, id)) SStgui.update_uis(src_object) return FALSE switch(type) @@ -407,3 +412,100 @@ LAZYINITLIST(src_object.tgui_shared_states) src_object.tgui_shared_states[href_list["key"]] = href_list["value"] SStgui.update_uis(src_object) + +//* Advanced API - Updates *// + +/** + * public + * + * Send a partial update to the client of only the provided data lists + * Does not update config at all + * + * WARNING: Do not use this unless you know what you are doing + * + * required data The data to send + * optional force bool Send an update even if UI is not interactive. + */ +/datum/tgui/proc/push_data(data, force) + if(!user.client || !initialized || closing) + return + if(!force && status < UI_UPDATE) + return + window.send_message("data", data) + +/** + * public + * + * Send an update to module data. + * As with normal data, this will be combined by a reducer + * to overwrite only where necessary, so partial pushes + * can work fine. + * + * WARNING: Do not use this unless you know what you are doing. + * + * @params + * * updates - list(id = list(data...), ...) of modules to update. + * * force - (optional) send update even if UI is not interactive + */ +/datum/tgui/proc/push_modules(list/updates, force) + if(isnull(user.client) || !initialized || closing) + return + if(!force && status < UI_UPDATE) + return + window.send_message("modules", updates) + +//* Module System *// + +/** + * Registers a datum as a module into this UI. + * + * @params + * * module - the module in question + * * id - the id to use for the module + * * interface - the interface identifier (e.g. TGUILatheContrrol) + * * process - should this be a processed / auto updated module? + */ +/datum/tgui/proc/register_module(datum/module, id, interface, process = TRUE) + if(isnull(interface) && istype(module, /datum/tgui_module)) + var/datum/tgui_module/actual_module = module + interface = actual_module.tgui_id + LAZYINITLIST(modules_registered) + modules_registered[module] = id + if(process) + LAZYINITLIST(modules_processed) + modules_processed += module + RegisterSignal(module, COMSIG_PARENT_QDELETING, PROC_REF(module_deleted)) + RegisterSignal(module, COMSIG_DATUM_PUSH_UI_DATA, PROC_REF(module_send_data)) + +/datum/tgui/proc/unregister_module(datum/module) + modules_processed -= module + modules_registered -= module + UnregisterSignal(module, list( + COMSIG_PARENT_QDELETING, + COMSIG_DATUM_PUSH_UI_DATA, + )) + +/datum/tgui/proc/module_deleted(datum/source) + SIGNAL_HANDLER + unregister_module(source) + +/datum/tgui/proc/module_send_data(datum/source, mob/user, datum/tgui/ui, list/data) + if(!isnull(user) && user != user) + return + if(!isnull(ui) && ui != src) + return + // todo: this is force because otherwise static data can be desynced. should static data be on another proc instead? + push_modules( + updates = list( + (modules_registered[source]) = data, + ), + force = TRUE, + ) + +//* Helpers - Invoked from ui_act() *// + +/** + * Lazy check to see if the host window is still interactive. + */ +/datum/tgui/proc/still_interactive() + return status == UI_INTERACTIVE diff --git a/code/modules/turbolift/turbolift_door.dm b/code/modules/turbolift/turbolift_door.dm index 31fa7de02f..e012229484 100644 --- a/code/modules/turbolift/turbolift_door.dm +++ b/code/modules/turbolift/turbolift_door.dm @@ -8,10 +8,8 @@ glass = 1 autoset_dir = FALSE icon = 'icons/obj/doors/elevator/door.dmi' - fill_file = 'icons/obj/doors/elevator/fill_steel.dmi' - glass_file = 'icons/obj/doors/elevator/fill_glass.dmi' + fill_file = 'icons/obj/doors/elevator/fill_glass.dmi' bolts_file = 'icons/obj/doors/elevator/lights_bolts.dmi' - deny_file = 'icons/obj/doors/elevator/lights_deny.dmi' lights_file = 'icons/obj/doors/elevator/lights_green.dmi' var/datum/turbolift/lift diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 28dc4a09f6..b9995571d4 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -200,6 +200,7 @@ qdel(thing) if(checking.type == floor_type) // Don't build over empty space on lower levels. var/obj/machinery/door/airlock/lift/newdoor = new door_type(checking) + newdoor.setDir(got_rotated_by_maploader ? got_rotated_by_maploader : dir) if(internal) lift.doors += newdoor newdoor.lift = cfloor diff --git a/code/modules/unit_tests/core/priority_queue.dm b/code/modules/unit_tests/core/priority_queue.dm index 28e0339f0c..83d4a3eca6 100644 --- a/code/modules/unit_tests/core/priority_queue.dm +++ b/code/modules/unit_tests/core/priority_queue.dm @@ -3,9 +3,9 @@ for(var/i in 1 to 1000) queue.enqueue(rand(1, 100000)) var/last = queue.dequeue() - while(length(queue.queue)) + while(length(queue.array)) var/next = queue.dequeue() if(next < last) - TEST_FAIL("Priority queue out of order. next [next] last [last] queue [json_encode(queue.queue)]") + TEST_FAIL("Priority queue out of order. next [next] last [last] queue [json_encode(queue.array)]") return last = next diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 82f17e817c..b4e5a22b77 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -132,13 +132,13 @@ var/list/ventcrawl_machinery = list( if(vent_found.air_contents && !issilicon(src)) switch(vent_found.air_contents.temperature) - if(0 to BODYTEMP_COLD_DAMAGE_LIMIT) + if(0 to LEGACY_BODYTEMP_COLD_DAMAGE_THRESHOLD) to_chat(src, "You feel a painful freeze coming from the vent!") - if(BODYTEMP_COLD_DAMAGE_LIMIT to T0C) + if(LEGACY_BODYTEMP_COLD_DAMAGE_THRESHOLD to T0C) to_chat(src, "You feel an icy chill coming from the vent.") - if(T0C + 40 to BODYTEMP_HEAT_DAMAGE_LIMIT) + if(T0C + 40 to LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD) to_chat(src, "You feel a hot wash coming from the vent.") - if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) + if(LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD to INFINITY) to_chat(src, "You feel a searing heat coming from the vent!") switch(vent_found.air_contents.return_pressure()) diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index a5b13f61c3..ffe41f72a5 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -42,7 +42,7 @@ ui = new(user, src, "IsolationCentrifuge", name) ui.open() -/obj/machinery/computer/centrifuge/ui_data(mob/user) +/obj/machinery/computer/centrifuge/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["antibodies"] = null data["pathogens"] = list() @@ -90,7 +90,7 @@ if(isolating == 0) isolate() -/obj/machinery/computer/centrifuge/ui_act(action, params) +/obj/machinery/computer/centrifuge/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index 4541157455..b2a1e2ef5d 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -49,7 +49,7 @@ ui = new(user, src, "DiseaseSplicer", name) ui.open() -/obj/machinery/computer/diseasesplicer/ui_data(mob/user) +/obj/machinery/computer/diseasesplicer/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["dish_inserted"] = !!dish diff --git a/code/modules/virus2/immunesystem.dm b/code/modules/virus2/immunesystem.dm index d7adc81620..87b7b94882 100644 --- a/code/modules/virus2/immunesystem.dm +++ b/code/modules/virus2/immunesystem.dm @@ -78,7 +78,7 @@ /datum/immune_system/proc/Overload() body.adjustToxLoss(100) body.afflict_radiation(50, 0, 0) //don't check for armor since Overload is only called when someone has taken Radium - body.bodytemperature = max(body.bodytemperature, BODYTEMP_HEAT_DAMAGE_LIMIT) + body.bodytemperature = max(body.bodytemperature, LEGACY_BODYTEMP_HEAT_DAMAGE_THRESHOLD) to_chat(body, "A terrible fever assails your body, you feel ill as your immune system kicks into overdrive to drive away your infections.") if (ishuman(body)) var/mob/living/carbon/human/H = body diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index c4b98f30f3..ea48c01a5e 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -52,7 +52,7 @@ ui = new(user, src, "PathogenicIsolator", name) ui.open() -/obj/machinery/disease2/isolator/ui_data(mob/user) +/obj/machinery/disease2/isolator/ui_data(mob/user, datum/tgui/ui) var/list/data = list() data["syringe_inserted"] = !!sample data["isolating"] = isolating @@ -100,7 +100,7 @@ SStgui.update_uis(src) update_icon() -/obj/machinery/disease2/isolator/ui_act(action, list/params) +/obj/machinery/disease2/isolator/ui_act(action, list/params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 3554bb0eb9..b9ec504884 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -13,13 +13,6 @@ /client var/datum/vore_preferences/prefs_vr -/hook/client_new/proc/add_prefs_vr(client/C) - C.prefs_vr = new/datum/vore_preferences(C) - if(C.prefs_vr) - return TRUE - - return FALSE - /datum/vore_preferences //Actual preferences var/digestable = FALSE diff --git a/code/modules/vore/fluffstuff/custom_clothes.dm b/code/modules/vore/fluffstuff/custom_clothes.dm index 321ffd69f2..16700dbe2c 100644 --- a/code/modules/vore/fluffstuff/custom_clothes.dm +++ b/code/modules/vore/fluffstuff/custom_clothes.dm @@ -90,7 +90,7 @@ permeability_coefficient = 0.01 armor_type = /datum/armor/none inv_hide_flags = HIDEMASK|HIDEEARS - cold_protection = HEAD + cold_protection_cover = HEAD siemens_coefficient = 0.9 //Bonnie Head @@ -128,7 +128,7 @@ allowed = list(/obj/item/flashlight,/obj/item/tank) armor_type = /datum/armor/none inv_hide_flags = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS + cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS siemens_coefficient = 0.9 //Bonnie Suit diff --git a/code/modules/vore/fluffstuff/custom_items.dm b/code/modules/vore/fluffstuff/custom_items.dm index a67b7e5c8a..6472bcba36 100644 --- a/code/modules/vore/fluffstuff/custom_items.dm +++ b/code/modules/vore/fluffstuff/custom_items.dm @@ -1397,7 +1397,7 @@ user.visible_message("\The [user] accidentally cuts \himself with \the [src].",\ "You accidentally cut yourself with \the [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5,5) + H?.take_random_targeted_damage(brute = 5, burn = 5) deactivate(user) else activate(user) diff --git a/code/modules/vore/fluffstuff/guns/gunsword.dm b/code/modules/vore/fluffstuff/guns/gunsword.dm index f6827a7075..ae1b23c184 100644 --- a/code/modules/vore/fluffstuff/guns/gunsword.dm +++ b/code/modules/vore/fluffstuff/guns/gunsword.dm @@ -103,7 +103,7 @@ user.visible_message("\The [user] accidentally cuts [TU.himself] with \the [src].",\ "You accidentally cut yourself with \the [src].") var/mob/living/carbon/human/H = ishuman(user)? user : null - H?.take_organ_damage(5,5) + H?.take_random_targeted_damage(brute = 5, burn = 5) deactivate(user) update_icon() update_held_icon() diff --git a/code/modules/vore/hook-defs_vr.dm b/code/modules/vore/hook-defs_vr.dm index f5aa075a9b..076e1747dc 100644 --- a/code/modules/vore/hook-defs_vr.dm +++ b/code/modules/vore/hook-defs_vr.dm @@ -1,8 +1,6 @@ //The base hooks themselves //New() hooks -/hook/client_new - /hook/mob_new /hook/living_new diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index a8f2486552..f68b066ad1 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -390,7 +390,9 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //If they are a human, do damage (doesn't hurt other mobs...?) if(Ht) for(var/obj/item/organ/external/I in Ht.organs) - I.take_damage(calculated_damage, 0) // 5 damage min, 26.25 damage max, depending on size & RNG. If they're only stepped on once, the damage will (probably not...) heal over time. + I.inflict_bodypart_damage( + brute = calculated_damage, + ) Ht.drip(0.1) add_attack_logs(src,tmob,"Crushed underfoot (run, about [calculated_damage] damage)") @@ -401,8 +403,10 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //If they are a human, do damage (doesn't hurt other mobs...?) if(Ht) - for(var/obj/item/organ/I in Ht.organs) - I.take_damage(calculated_damage, 0) + for(var/obj/item/organ/external/E in Ht.get_damageable_external_organs()) + E.inflict_bodypart_damage( + brute = calculated_damage, + ) Ht.drip(3) add_attack_logs(src,tmob,"Crushed underfoot (walk, about [calculated_damage] damage)") diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index 057630e05b..3e95e22d74 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -147,7 +147,7 @@ ui = new(user, src, "XenoarchReplicator", name) ui.open() -/obj/machinery/replicator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/replicator/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["tgui_construction"] = tgui_construction return data diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm index 86908954ae..1458663748 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -54,7 +54,7 @@ return return ui_interact(user) -/obj/item/anodevice/ui_state(mob/user, datum/tgui_module/module) +/obj/item/anodevice/ui_state() return GLOB.inventory_state /obj/item/anodevice/ui_interact(mob/user, datum/tgui/ui) @@ -63,7 +63,7 @@ ui = new(user, src, "XenoarchHandheldPowerUtilizer", name) ui.open() -/obj/item/anodevice/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/anodevice/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["inserted_battery"] = inserted_battery diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 0c1a9bdd76..b10e28b38b 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -38,7 +38,7 @@ ui = new(user, src, "XenoarchArtifactAnalyzer", name) ui.open() -/obj/machinery/artifact_analyser/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/artifact_analyser/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["owned_scanner"] = owned_scanner diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index ce198e5d84..b036b06a21 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -47,7 +47,7 @@ ui = new(user, src, "XenoarchArtifactHarvester", name) ui.open() -/obj/machinery/artifact_harvester/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/artifact_harvester/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["info"] = list( diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index e97e6c8398..8fa28dece2 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -124,7 +124,7 @@ ui = new(user, src, "XenoarchSpectrometer", name) ui.open() -/obj/machinery/radiocarbon_spectrometer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/radiocarbon_spectrometer/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 489349dc9c..d4b03f6657 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -55,7 +55,7 @@ ui = new(user, src, "XenoarchSuspension", name) ui.open() -/obj/machinery/suspension_gen/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/machinery/suspension_gen/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["cell"] = cell diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index 0913e1bd87..ee7b66a7bc 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -162,7 +162,7 @@ return ui_interact(user) -/obj/item/depth_scanner/ui_state(mob/user, datum/tgui_module/module) +/obj/item/depth_scanner/ui_state() return GLOB.deep_inventory_state /obj/item/depth_scanner/ui_interact(mob/user, datum/tgui/ui) @@ -171,7 +171,7 @@ ui = new(user, src, "XenoarchDepthScanner", name) ui.open() -/obj/item/depth_scanner/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/depth_scanner/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["current"] = list() @@ -289,7 +289,7 @@ return return ui_interact(user) -/obj/item/beacon_locator/ui_state(mob/user, datum/tgui_module/module) +/obj/item/beacon_locator/ui_state() return GLOB.inventory_state /obj/item/beacon_locator/ui_interact(mob/user, datum/tgui/ui) @@ -298,7 +298,7 @@ ui = new(user, src, "BeaconLocator", name) ui.open() -/obj/item/beacon_locator/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state) +/obj/item/beacon_locator/ui_data(mob/user, datum/tgui/ui) var/list/data = ..() data["scan_ticks"] = scan_ticks diff --git a/config/entries/game.txt b/config/entries/game.txt index 0dbc702386..8f155dab9f 100644 --- a/config/entries/game.txt +++ b/config/entries/game.txt @@ -11,9 +11,6 @@ STARLIGHT ## Set to 0 to disable holidays (you monster) ALLOW_HOLIDAYS -## Set to 0 to disable nightshifts (you monster!!) -NIGHTSHIFTS_ENABLED - ## Engine submap probabilities ## Supermatter ENGINE_SUBMAP EngineSubmap_SM 40 @@ -43,3 +40,25 @@ EMOJIS ## Set to 0 to disable everyone on station having maint. ALMOST_EVERYONE_HAS_MAINTENANCE_ACCESS + +### Nightshift ### + +## Set to 0 to disable nightshifts (you monster!!) +NIGHTSHIFTS_ENABLED + +## Nightshift Levels +## Set to 1 or 0 as needed. + +NIGHTSHIFT_LEVELS Unset 0 + +NIGHTSHIFT_LEVELS PublicHalls 1 +NIGHTSHIFT_LEVELS PublicAreas 1 + +NIGHTSHIFT_LEVELS DepartmentHalls 1 +NIGHTSHIFT_LEVELS DepartmentAreas 0 +NIGHTSHIFT_LEVELS DepartmentSecure 0 +NIGHTSHIFT_LEVELS DepartmentLeisure 1 + +NIGHTSHIFT_LEVELS CommandHalls 1 +NIGHTSHIFT_LEVELS CommandAreas 0 +NIGHTSHIFT_LEVELS CommandSecure 0 diff --git a/config_static/jukebox.json b/config_static/jukebox.json index 70ab8251f1..0636d54bf7 100644 --- a/config_static/jukebox.json +++ b/config_static/jukebox.json @@ -10259,5 +10259,15 @@ "jukebox": true, "ost": "Armored Core", "genre": "Arcade" +}, +{ +"url": "https://files.catbox.moe/rzcos7.mp3", +"title": "[ERRRD0NK!@%@!]Hush (ft. Mizz Fish)", +"duration": 1821, +"artist": "kroh", +"genre": "Electronic", +"secret": true, +"lobby": false, +"jukebox": true } ] diff --git a/icons/clothing/head/aureate.dmi b/icons/clothing/head/aureate.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ea9a504b349d1490bbde37763619a9c2158047a3 GIT binary patch literal 1071 zcmeAS@N?(olHy`uVBq!ia0vp^2|(cqt?E;>ptPg#s%w{_vaJ6$$3gJ&>jC zAvLv?ZP}rR#zX~gNRLXO>EPs6OXKjg<^gYpU-@YBVP}p6?WIp%y<+7TJ?`v5a z^zGwCd@fIM;`p-d`iB=!-CGhl?tkZAT>EL>ix)ShrFt@O+}rQ;@}@L{!}i;IxBc+0 z4QF!Lc&qQ-?|t*N(iVv>m}LLvia=Z9ls}2f*)E$b?cctl`R({*!f5>Eodi=+Czb)t8 zpDq3R^4qelN9FI->&!nl-~BpJW4d;9hS}_Ok1b|r9-H$^l!d{G<3au>+2c0@-+rx< z?RDF&+S2g;cjmK+9Tkt%J9qGHQj_=iz!l^lZ}XGkfyKGLD8Y}*P4s;(?=g6{WQqT) z>EixRKHm6x=+N9V$$o#if~4Q4df(Zkv(oIz8ROXk^)vicXbHF%s^92LBmUTSS{6gW|#^vNZ+sz3 zS>j;>6$Tj@nS>B00hXf5N=b%-qM}8)!X`YpNdV5rkTgs^9b_!s+4yLNd=%@1cVoEg@jB`#Bz z#n2$nACqhP>&kQCl8IHU5^aj1k3#qU3A%qZYO#N?bmUaaZV!F`gQ;r!=- zHQSDBElY1bGrM38=0( literal 0 HcmV?d00001 diff --git a/icons/clothing/suit/coats/aureate_kimono.dmi b/icons/clothing/suit/coats/aureate_kimono.dmi new file mode 100644 index 0000000000000000000000000000000000000000..55cd8c56a87a5cb790168d22869ff6bdd866c238 GIT binary patch literal 854 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 h{m&1y-ShduU(LG=WNZR`V diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 3ab87182172c4c55ccb6718e4a37fa90d0162268..0f0a35776adb21f5e9090d12de809c88e914326d 100644 GIT binary patch delta 19877 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 GChvFdFd2sc literal 20372 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 z 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 delta 5239 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 PzdIp%#<~?c|GxMiZp^O& diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 1b1bfb3924f2ec5c68a06403e09157c16b3d66a6..74e6e84257005883da4914bad423fa53fcbc51d9 100644 GIT binary patch delta 7762 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 delta 6860 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 H+h_j;2CfJy diff --git a/icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi b/icons/mob/cyberlimbs/c-tech/c_beast_flat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..93346b5f9258490f095c5dca4a45223771fba876 GIT binary patch literal 448 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

    ss`NTA3mNHJZqlSa9i4AwTmcPcZv3*U~{ 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 literal 100177 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�R^KQTe8q6d}i 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

    uJu>CyR+$`%$? zC`04GasFL3{R*gu1aJy?Mq21jJk2|tmJADQgl=AS=?fmI@pc_o5@O|%Kh|LdFSH-4 zl8QUBB1xnQ?1v@X?h98hR4rH!i8g>de^q;wUwN7B z%&<#iXXkm=Li(P^8nCIdMSPx2*AVDq;{H?32wWP}X;_UF#g;k=8{rM0myw>SHb=1ma zwl<-@`3lMWk3yGc>!4NfXnX z2<8=N3cFQ0`k_mp@_t+T`(BZ`CY`it!f5pws6YD}_ZXo6Fd!ORoL>K>y5 zqJIb^2;}E{ht0nIut2BYJx#v?z@hwgUkE^c@XC}+y|Pk zyOi&l`ikdF$KO@x`fKco`DDm<0R4K8LpUlwJh>#`3H$x*=fQji)0C!>88do#7ngRR zryQv;YjGSbIzP#a{2}9M?nX}cv{Q_@L06F9jJi&zTMYdMiSoQ<5(%`4E?O=ukUoD` z%=y?($sX>oLSF6>`I6J|Y1Y+a*gMi%w_NlxQFBuxX3P^-`N-o=z6IgpbNXxuIMoaV zzqAfIVrgFM2ER}|3c#?~zBRtu37(r(d-$+m9%uMuv<`6OyEH6j7`HlZ-Ox{{F<%UR z)0#`4v``UcHhgDtpV33dg!{x*-RoJFRsLn$EgNt6kc+bnaU1P*TcTHozykdg<+LasKJyl*_P>BHY-TmAng&SE4_pGR13y9%fDOjiY5rSzdfsNl zBjG?@)1?BK0wM8;>V$8pw0)&}ranicR0XU)(CnRKNB7ZRJM_0a)6{jDl+tk78TJ1U z0pLWT($ZgNnnt@x&JHD_efjB#2VjR*O~)E0OH=Oi>4QB0SVf37UO^+*s8N8!;+5~6m)MH0~&k3QxVD+b`#BKmTe!spo^+pGJ zOxqyv%bxf4FvvD90!s{@k7_gjCn)-?Xz=&lh73{00O$!r;%QUz8SC)~EbJ#8Y~HvS zc^vWwT7uoQ=m!kzKZ#*)GTPR#2(E>=fO{z>Pk7#&;k4W!4%XtpfRv2(~LvE zDT~W*_Jj#T1UR{oYGT!(7vBBnV{wQ(a$Sh+&+HN=Pvb1?{kVcx$e%KfLquF|^yopH zOZU{#$8O}sW@14F`4gvdIwvgfo`#hOa<2q{i){LqEs@t^NVi&uCgzWd3NDy&p zu#cdvD^YLI(UCJ*FHb0S?u<+aZhL0;HxhUA6ipgGDNB9rN`?>U+;VCSlesqDI^w^e zwLDL%x5`v+u1m;k$ob*}~9N`bv0Z3^kBX`KJ)uN@fYgeva83UrY`(7lN zlEeB)-vN!@7SZLzXbJl6xa*mbWGCcKi^iR$%gDEHt9$e56Iz=t=_LjxfsL`nW;@8O zxr29Y&YIfYO_!*M^?6d3!1Ne_AJ}RS)~&Offqk+FmOMWeu<1@cch_b2`RGC!?o7OW zR@2Cd4?gGobMv-lZ>(x{(A-uhZpHK#au4IK=)A)B|B-;b8alk$IEnME_Dsm|ryJml zJ`-z={?lp8DWY9OqG-|W-_kxFy`t!)GBji`y8sR?P~NdP>_{75Ho<{#_QJ;Mah3-i zSa6|Co6R#y)p!TZ-XS>9qNLQP?LO{826)dr5{c- z!5XGy9-($-N2w9~Nu4Lq;=3*RM1OvqnD!UreW7tuZwoVHsb)o0TK#cM!Y2 zo(Fe`7EpzK>p1aG6M1y+@!gaEYgY4kS|$0{tMsAl?u zl;~#bYH`7-j&^cA-081>qdi2F5obhQTN@UhW&8$wbdB*xX3?+q;#HhkL8-?w>%ThR z@$*1nj!ahM*SwrOG2mXKb&Q>L;v4+ATFGCf6U}-`_8}#N-!w#kg%#<#(*T1RnG0M{ z1}Gc?2{()Ym`qVk3GlB z7z-kuiXCq9{5Ewn!$Oui=9;h`yW%byLqsf(BYI!xH$-QoTeHp`MAV-9_c{ZVEmF)l zr(@lOUXlBFj;%mz6emn$Y^TfWDFHg@wKnIo5~oco&>FC`S3d8IPtvFpQoUVcp%}ku z#6vms!#_`v9PS_AN{(A0r*Ge9a5*le;TE`SME+3(|4LKrYq{QhAS&n6uF2Yc;IIMY z%brF$h^32v1Bk#7&^`wsIA|qZxgn23_5uB2whw}bzi0h?3CH*C_sMCD9lv$#u6+Mj z3PAYki7J3;Kko`siOpA@e*3NlTi7GG)Orv61Gox9tU%J0^

    yYJ{QDeIBgv_T~vBj$Xs^X##7ag7oYE>3s*y<5M=+E+t!_o&CQ&Vm^;{9hy2 z@4G;I5`M(dS#U<|&93-1FCC4@Gq@d%ex>6YUz)yp{GhizlWA7_8E(2H@{ZH)Mc(o5 z?1M-_-3O7}@X_uXoJa3>duuivHP{rcrjLIKK|5+r8yvrIBbDBVijbw$?w!qPI(2WW zP2!Dj0wy{S0)-@H-F$DYmwdGI@vkv6^ZRc2GU}69>xx6)s8(MU+gxp&EaDrubmSBN z5mB|r8JVq;jScMvA4d#&?GmHod+L=dvS)sM$-O{%l{_$(@LnN?wK{phk3wwIw6N&( zLqm|kJi%KEfF1FpH_ssl^u#rL`4mQhjE>Y;Krw?Pz@7>7V{ zQoMQ|4i6819~rsoMXebh8F{XQMB2KtNO8Ktr3JThf40wC$)E5>bP*0{YiYS~n3Oun zI#%CIBzQE#+eVnJA$t>xF83&z`1UPBLtDFwOid#V4qh&oYko!ZJ6WL54PUN|9Sn;+I>8J~VBQmA~ihrW^;^EDiKxF*vs0!e|mk(#grG$%%mdWp#C-Er40x z<{*3?L%CS$0dqD+I&aH4)#6z7`a#)~f#-?IZAez0^w7=Js_(P2g%|w{9E3VwQ7r6S z=P#4a8EUD~DwXS4)7pc3%V+AiArj}0+Lume4n4Ih^-$1*_DeT7lcimHJLfyb-o8CP zw>&qT=D8rvEF;OZsLdCcyIA2`<1(sFWF{&jC}^XVMV*tob9UX-N@ zuu`%Jg!(}6Ld@`H{KG^)bipb~=>UKBvm=-03fQ$;8Cu3>I5ehU>B40wKRA_=Qxk9o@wl zEqsu14=iN!+v&>aQn zZE~2uMgQl?ds#CaV%^j2aIw5=&TUt>U(#)7^l=vhkov*|{k&@j_~op~%7m4&{8aUi z44Zl#HtPAX3bB>|E3d0VmDfMW%>udP=!`8=whVnM6SnMDrcBT!?rRfRH72l8jl(KQ zV5~;tu#Tm%{#2B)kX~Wv(_m;MufYeFhW94T3D?Un)(m?c1<$|yvdxiJrL3M-om0R; zOwJ`)V_JsASSTao0EgXQWaO+G#0agOqs3#LgBAF?@nUZHjn&ck;cfV_u`#S_=^I(q zn&6c;vO&vA8vqaW^iKY{>iq#vu9P?yKM6kpFMMDMRFrl~NtJ-(1YQpeyqKDv{)jwL zQi0=!%rSq^GV^Ku=_Wc)&L#uNDY-HG?f79rTd~g8K(!QADJiL@s(_hD1a9>@!_;xz zctZBu;zx<*KIqTo6EicJqwZ;~j;$%`o;NqjCwzF`O{G?CuHN+nr6+YZwCK%;t6w_& z&?edB{pU@=1A(rlp53EOh|kH%xtPvOZgn)au&6N(KNwC}3AUZ4)3=h?Z#I%A82ZZ> zrvwKD?R0?n6bUAC2Z#h7u#QrrE+ zZnz|j#+DGL%JhWl>HKoPsDVg?iz50p=I0ja)U>eBMDt=I(XzJ=$2}urVWFCol+?s~ zW5Na(SKfrE4<4frMy7+e(Vjn+W|AUH-RNa0q?h-iW<#!SJ8|!5ZNa;b*FZ1C0dKgEl}+E1=tMG-u6RzHS*)?OG*_=s2d;K!e}Say zxV^-tZ~0>Q@^-(y%l`b%fg2_(#WURb-uZF4?i)jsxV3TkH`P0@QJx)g-%fHRKvr>3 zV~>aRon9vqb@bgbSBgNI|85sbX^DD>&88si9Tj|)0W|ci=Rsmz%*#Ax5Y5VVDhU1U zlJHgc9rSl2$}U#<+1S1m<)s;>8kAf1P(c_T{Saz={m3+j5~F9M&Mb;bm~(%-hhkwC zWf?->wS2&pYE`|0$BR5NS`sX-`6xI+o-4EI~YjR|i*Dt8c8#kAA9qxY*q(&G?F-|MX40Z@eHa zzWb{~S8irQ4C{;Ls-SbF#lYcp)>ogaZqt#x#A#q&Q6W{$_n>u$`88lX1MTR36+1u9FsvV!2S zyn+N(J)pid0`W+yOl3nuLskLDN~gk>xNfX+fc7QlX;z&0eKMKsjU*(|{p&*5m5Py= zTkrF!9#m)QStZqlm1>C)ylkaS0-0z6|GcsiD5Y|=yew>bl$10I>Z9l0TK}hW-tV0Y z&gSH}WP9F;t7&K6P*7IZ@L)X!LY|Xj>tUclXd~t1BsY~6aVO0+#!A2mNu%C zU7MXDNhMWGJFaNj*<0hwU&*`YvI&GGRLbO4{)j5iuM=s=tWaeY6;E~`B^`ycEu&VH zLsbQf)H2DLSlz?~Oe~wAU&0<}3F%8*;(9H$e%=NHzU(l3O^adBpb!u&4Y=6+?)_9rQ{4|@pO|DD54iX5 zdC_sf;wxjD@U9sg)Lf9DR0v2=s}l3;*Y7n!OImf+zEhb~IB0s4EB>U%oVn$~C#Wzv zCc9p8ruq_a+)5GMZk;qn+x-Litcm@rKyar5`q4Vyy(#eeWw+I1%Rr;co{1J<>ZS{y z{}?Inwq$INEeSY4%aR2IE7-SX0E78LypZ|4AC_sQX z!SPj)mC>13E5PVQkw~N=2BRd^B)gT(T8g3+V5I!eNfk6cJ6Ro(^ip8pB`$;DOHgl`Y8 zOzlbdp2a2Z2g+02J#|JKK=>-hWz3!UsG$u&wghf58q$4t!j~z(dSLPPEMMVH1wFT` z06n@y$Hc@nPXz=agn8{cItbh~aA~^F#OQL*B0}fJx$6HZO>!rUEG$|97Lid=QCBEf zh*u_}Kly68@6@?5ds$*+XlSVCT!+yPO}-ZQP%%993EbWx;loJtt1N&d+BEbkwVetc~?WL~|02}E%x zGI;qiy-h5?`cfVbXgZbH3BmI8peqOILZ63(3@j{+F$#L>F(nL5c(HS!?w5QJ0yXb^ zEWCVU9;~N+-l6LOh_tP(ZOHg-Fbf-7+eJ0@*RWLoK4X>>VbJM1mjJv85JBE^%geh0 zslb33f}jBaq#8^|>^G0Mk@uP=Q$uzpfCWj|p^m!Pwdzbv@N9`n!kX?$*z?7=p(XZq z(T=?-(mfnZ-qSYg%_H7@?ARQxwb`IlVAD*f3PbZ9v_b zVl~x{7x$&ILy{J`MttY)h+1@A2og=NHLax&Ey$8XNaPr-396qFm`L;4H^lKAP4?fJ znJRUB3t0Qw843yt)_Iy%f+Y|RsiCoq#ki}aPf1bfNAKGZTd~Bt z<%J=RRgzOEtUj5!2^B?`Z2Gzd7pwK?M>_&dlm~ZB_7=#Hm;O@bc|MAloc1DOZgMX= zM)EJ8%3L(+pnp0|AaCWFPK|$KVKq$f zzJLT5&N!k<&=Q7oo;c?D;$+Mt7$%?}BP(99MBC zn>`@aZuGRLcHDOPt)#T3-hEd#o2IwlB z-mgApkX+>Jbb&{-xmpkdS(kWPhg4;l9={?#prPU7<*X>qx?i{I@gpMkGsiqE zqoJar-e)RMp%SkH)3VF?_g+lrn_z0F4N=}pRKjjMAO$oi&GQC-(X;u3)ywY};#GBm z7N;iMQA-!~Kb3_)Z%dxyRuywemHFDr0^dBqf8AuyI`*O{olrrWAl)Yt+j^$BgWb>7 zU_y3RGt==aci96X=j|W`ayo;FToJj>e5N|mQ|ZX%zBYCNnb|28C~``B^0QM)?syQB zRz_guz2$J5vRDHW(tx7ka(Ho>A@%FhTh{WzItEHhOJi5$o`Axpv&@oCE!l4ydQTQ} zy|Nq)!J_M1ByU#kmgy}1A(K&DT#VYj9=_|t^{pn`Jv=HmC>bq((44>05$+CLlk_(A zcem*k8-(pd^vgxh=5HT-i@w5RS&NWZ{riz%nPope1J{(Qx8P9b5oN$CoNxFlzmOeY zg?^m4SQnTVq!#bPAidvC-OQ7hv!SrUqEm6OK@V|!*QHqP&??rlmq9ldp*=Cpe4bi` zEq4WLvWL7$fkxIU@)C7*R}ZJ|THk35&CHu98gOqdEjI}NB_h8={>SK^+<{Nm4O%=F zAOh7dC;Fks@?lVhrE472cWg4={#dh+7{2Wta)MT6e?dX74Gd+{i36O=WSk(R7V%DV7dx3&DPDDRU)ab( z;1ACqI0VV1nq<{`2X9%T<1~O1Y;FerR8AJ8#_w|f2c6Zw;6&LbJ>c1+PFVGcF@uFv zg->^IA}aedCw#_FUZni!REalt0ew!QO1Q;@57d>abVzN;dfdW{r7-C~cI*xkaY96Y zb1AC1wl57JB6hodEH`th%0txTW@HF{aIO z#UzC@?!cX?jEUR!Zccr7J4=DNIQH3skmQFBnA589fy2G$R(vdei=SWj*fSBZJ(D6c z3Z$rB?TD zwiLf7AO$9JQDGfpN-vr{>N57)#%`oZFDPenvyh2eDEdusa6(@2aP zD&QdX%{n0~sugP1|EJ%A?Y$I;rZ`wP4B_G)0L7D&{TDOgf4YSKr8F;j%1iEb^FFdr zbOKZY+gpv;w*tNu^- zQvPj5S)D%f>I1sLJv@m7V+ zKP{bB3t-hTRSeBmiIxSn>@lObooovD^~1J4*RmiI9BwVJtzn|#cIq;5U{uhIAr$?1 zjY5{8e?o`tf*Fh3hr=+|Yp&^3!R(DxE5U=xRxB+tNS)@ry?ebVHXi>3?d4K-a zidN+X^zX~_Uy!meEb+?#P!k{}cR7lYfO6){D$uLQY@7Hkc%6^d^z<3!&~7GQM59x` zMO}zE6XS>Gl4EVTI7!2~auO2Z0MxT9ObN*TKi@6;w-NpiF8qg#j3|SCw9*S)-yn^f zixdoNbTa39FRq|_1{~0o3Rk;EkXF15(%QA{1VQv^n0!0p5OOWR|J_jkF>IgqR&0dc z|MViUieK(G=lB2Oy92yJg=@qfCjxcAazfND`nPI*|88!*T)xRkd@vtB)cibQO(2_S rAb;PkmD_*1bNL^H^p7@1SGe$pHTyD+%aXv(K6Kj9#328K-L3xx2_rGt literal 1843 zcmYjO2{;=F77lSu2z50Gg04)bC{kn%MVkK&H#(WkN!u1731PYMEgbgL1H;1rfav^evOP#pUm}?? z>MZA}#S3MoB{d9dNsOn57LQ)?*yaAFEXTC24ienxw^f>~njUNZemPt!_NM41g(Upy zII)}}`u0<{Z=+*2u=cE!O&=Wf6Xr`uPeO@l3EdItC?n>s(6l(6qjq?KhBI}m5Qo@&?N@a`R%5+(>^EBx9%{5|7g}eo zFu+E@dm|AV!&nMC@FbM)Wu7aMR}>TAQ5AM_G(>V#QIHNCNV~Lc%Uo|__r?KtuuuUL z(=)P@zXkvZH`t&rxJ2i(nBvc#ojGyW8^w0&TI2H@F`2!ay@+$CAG#h+zx`aRak{@N z#41qf=u`jz<>rkKJF7C&Ygc^h;4FBFU5A8rtgcPQ=dN!ylTl-Y5%0w{-zDPr)#Km(CCUtC zggOR005!YM@;7eh-=VWq3&L7$#}v~xZ|pUQ{yZ_;&G@ccMb@nf0)9GVtJLge5UG}_ zD#@~D^HvL-tcn#}5RfcGXOPHSglpq;D;-TsWaDeZoN-YwmS^&jNXq`fNOapiK{Ty4j&OIYGyXS(xs%C|T0hav;6 zPY>BC`VmSZw&Zv0fiibrJ~>I74>qOw+$;ItB3(8`RqH&TgVu-bc5GNo4P-8_&-Km> zAK_Q)lc130x_K*aNEUtao@g@;HLK|1RouL&44{T5yr<_-1>y_UE#P{ynkj=7zcaqp zHAUiq6Egq-FH&yS+Z~fg9X^w9pyr==_I!Hq{sv#L-R$Bi%dHPqT%O76_b+VGyNL$- zzab6zKwSG|KzONjSV9cX1Sa$+7H^yVr;_L3yA+Y@rM(f&pGyL~|2q4zz3j5k0TZ!a z*Fd0}hfc3t5j%gG%apq$X&g3g{Q=cHs)GXBnRm2<_0CJ}Vv!WR6y+p{y!mr@-w7aP z;h{QBcONir!puegr)C?K{aR{v7`FtS39Kixr(euX?72$?5~k)?7bQH(Qn*Gs{DM`e z`R(0IHy|^b7y8_PL^9KE(#T*aBlT{@qy^phbIH0L}{mi^D`>uK?10j?qEbabsVfvYc!pgqnNygs~9kNYmjEK2kw;qTWd%@zuC^hofn^8r6&^hI$ zpwWO4Z&jJphUq4dx!J!+R*ULmZ>Y5_9f@-#)*%+8@ih>R0=i5sp8EEfckd7 z6!8|20{i63i#s?D{dqwQ#+%+Dz%a(!&3_W=w@w!E&CY{O292K>UbaBJr|j1 zo$cW)AvSVv$|HW^>Ofv<#EPzYO?*5t9d&vcE4*GnckXya>h+Si}vOhDB(JjW!iK2ym7sbXAi!{mOSKlpFIySG5*=6X`g`w78jEJPuJv-C0m-cmDmBA!AL(ky~~ zTrUd+4M`3BjpJ41y5B#fJC!-R4V-bqukW;Fi48fRYx6n+evDpR&A^x$PhhYe+@9qz zKPHa=bDva|CAe*Hd!z@-blqW%y;Ww_wVAtFIstf?F+D2I*L(XZ15>Cyfsyoh`9M47 zh^dJp%I=xBb9?5wZPbgz%-!^QeMW0dCz%iux8PBJ>-$gsv5nHgKe`?}l3$GYzxaXh z2LIsOev1kYGw*djeShk4|AvyG;DjzM!@abN;g|OATw-T`PWZhxtHmn6QR9a4#j9Qa zU&hh+l<6zq9h}Oe`PHxw4ngt{+|wRK-64@VO;?}XPC-^4o*IK46Ub~B;E_V*K;78; OV`yWEMZdb}mH2OslVleF diff --git a/icons/modules/atmospherics/air_alarm.dmi b/icons/modules/atmospherics/air_alarm.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2335a899563c116cd3e2bd77758a9d3223d24d33 GIT binary patch literal 2600 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 bJ^e+@g99agzRsQ!rZ`|@>4`ri5n=jg9E literal 0 HcmV?d00001 diff --git a/icons/modules/food/structures/ice_cream.dmi b/icons/modules/food/structures/ice_cream.dmi new file mode 100644 index 0000000000000000000000000000000000000000..43d85c9cb56cfc7b54fb3e509181f95d5b211149 GIT binary patch literal 562 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 literal 4028 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 AYXATM diff --git a/icons/obj/doors/double/door.dmi b/icons/obj/doors/double/door.dmi index 821d3193f1402fffa05d8172d8fe56299aa87b79..6a76b96963f4aa31cf87fe2c33703d89f278a6c9 100644 GIT binary patch literal 56809 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

    wc** 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 S3;h2CpzCVds@ckDpZ^2iemfoj diff --git a/icons/obj/doors/double/lights_deny.dmi b/icons/obj/doors/double/lights_deny.dmi deleted file mode 100644 index 46a615d62009830b47fcf2461a713c26fedff152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6227 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

    NQApNFw}Jme4S_7 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 Giv16Adw1mk diff --git a/icons/obj/doors/external/lights_deny.dmi b/icons/obj/doors/external/lights_deny.dmi deleted file mode 100644 index 38c652d9f69c63b08e2c81d052dd75a838d5d1e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2973 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 diff --git a/icons/obj/doors/hatch/door.dmi b/icons/obj/doors/hatch/door.dmi index 8e354cf3954dd836eabddc6bcba6e79d29f5fa4b..98cea2557ff06223f18776ccce5ca04c151ce079 100644 GIT binary patch literal 27534 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

    po0wt1UuPUNA-07Fez8Mya;-wU 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 literal 6949 zcmY*edpy(o|L3f;g^6@=H|2EEg>suqHd2Q!E};}LmvTwWHDZ@$NfG0u$R$E?r~ zY$LY_L`2jCc&Tm&0g}~f#|Gfd!RDg`{d;0 zdw6_kXsEKX^3|(XFP%H*Xlv`?z@(Bp>LHmn{gl7~d)rk{N zNVm*RsYjLA7CrTMjaI$Z9bqTrTQFr?r=3*2<>P2mYN~7F{ZLZ__w}-Mu{hXAt6PxUO>KUU z327BCgKbQ^eP+tNeP8Qk-)ZkkwBh;3?2mhp)cXUYxkl1*G(e*=r62;`i1P~-9L$Vl zrczMx@GW&o19f~_1Jp`w+r7G z&}|g1(1_<7ke+ZO7ep2~-zLj9?4Un(=&|wOk#`IrxPpn z@SWV-(FdI$uL^ojJoZ}B+=+YUbckJ(YXWF*!fhU;_QKRCk0T&060m9T$DviJJeVd?K)h4CFfw67c9 z%fPL(F7g6jMz%>E7_50byslSB87_pwsP&UQ&Q%d&?-$}B0RZIUtuNYbH5Iif^xe8h z(rnK)mp_Ul%7~>A5Yz=oVxN>smRK=;s4Wj1yX3`Gti85r#G15R9vdQYMW=+UPSZo& zq{;SK!xIS0{idBf8p+6&9-ZsQ zFwMpIW=Er^|0<;^i(5jrWYCX=eO{N;S*GTrLh zN6!xh;NF5R8+4~w@(XbpMGNL6O-UWv-T5$8EIB}hAN`)Vr#kiEhbJ6s8uv;z%oyiA zR>O-9LmwVAEo#rSiBuP~u(+xbFJ2p z`{5VAig%M#vX1}Jj3>b9pSlFG25_6qCOp0nB*LkmJe0Dc6ZiJcBaCy35vzU4^%PAn z4#g2E6mBR^?7?xQ%e=-K4Ml;3$&$CB(g;iBMuJAzN|+A>PX`qMY?q;!{6k6b>UQq( zfFS-F2xJ^7BA@vpW_`y&yP0x)a^ajg3HBI7Gq1L6r>v~ac8wb&cZ5U)$|cP$7}TvR zd%$LV0cZKv``0CAK9_jAuE;MK?-;XS%pY7;QIJDCKbECCNthBh9;}BOxv`%i?-c(kK}qAdwstVc>;PPLumU9Mxs&U}j6(LX=YQJdpZTXm&80R6|j zIjM`qp7JcpRrh6&FXkOQHWU(Vb#YbHJ5M$doM|IFdaUIoxVS)wYn;c3r)@`CoYSFa zyl6Ma&8Unf!Mt+`k%d6QHe=#)QV1I|fr@W&E382i{vZbBi)n=*3~2)jFt0J<8n&3R zZ**f$D88MIXK)k$FJP5G>fHR$9D^Cl6#`Gf2E#?l1V$tho0?5DpW1Sq^gw(KTlu9^ z0Y`-`Gro^vM(SF;K0l`SFaVAJT}G~jZmPiKSS-Lex0jkf322%jR=%;x{j5YOObEGD z7cm2ZWi0!~OR=fuv%ur>I(Bs=scU0~zGTb~l3TkWR4pRZ&&CL!=65w%w*Zk@dwIM_ z0JMJN5K|ynCa@y0O%MnjfFXX*=tirMkT5tYhB>2tucgb+^BzDvVLS0M7eJ*Ay;7JU zGTIU_eaKB~+2H(z5B3 z8cr{*iD7v(BXu8tV}dS;Fa|NSG}c|vtWTgAQjJ!55Vs_Lg%nVY%U&K+XOs6Z`n)x1 zb1=o6-M9d>#xCgdIhKKR-bbSd-#@oV@~R7Fek;^;SFae3$c0o7(aFX(Au}g()lR<*%_TY zUb_*Adzr}UXTc-clt%7w+_|1T5gs+7v{_~LLrJaT*F8>Mvh1uXyaDy@rDfw#c8!9- z^OfvQocVU&ulLu-MKD>ur*}LwV|}{+??OLy-%orQc*jkUq`-3zZ^=IN1h_(rufd=&0T+G;(QVsKE z*L(Ku$$|A&szaZ^_qOUtv@h4G?Cf8!U*XmACEg-wv)_;VCGv!juT&Vi5HEqg2HGj; zA55Tb{`qt7h|+P&&B=j~a4|D}aUYe(CMS;Mj6Y8={l<91aRqmq-5$$^bjNm^bDiE0 zYSyqjYxc-D_F9V1^%TLTb;xJIj^P*lUO4gyerU3$TV=zAWOvofCFvbBTb@yP+`nEQ zaGlR9;52wX7~9C&***V44tlbI&dlo^}}rFIZ%d>-4*$0C25mtNDN ziQ@tN+}+FmV-1P%Y%)n|va6|;mljEAnG;{lG#lb>Gf z@J(d1^OR(4VC&_>tCy_MN^(;)N6F#m%NJJDM`s@xB!oO2)6{4pe!hRr|CxHHs^HEA zP}tbkKit=ZARoCWJ(r`5K+N0>xXo*QqA;&UYuIzR^h1(alNJtQE;=i4`Kz*kpam^Sj+ELd#8n<&N8rb#1Va{ruzM^ZO_=-b!bP*{=w9vA`Z6jNfNn zN>FpQ&fH4|_1!-*K^qRCY)2{lsYoEhX({klw3(rfGy~0$IKMeD?4OZDM$#%z9BvKV zLn(;_ed3#eLy8xh`{mgl>9q+y_A+LS5?qVk&oyox;Mu*DBnphJ|6L%9fry3LhmJ4TpZ7-?fj?} zV728y3VKok6Ot5pwm*b>{vGIUCRrMF<_D#LbYCyKqrVrxxReBTYO#~OEztL|K4UTPi zQ(Hhk`R^&SOM*1Yu3i1}(tDwr&U48Gen(_bx*mEI(m=@x{>j=yig_C9De3Me_@dC5 zSi%V#J|DuL{oY)<(4Wm>6`5XjNFJ%Bmd;J*BM|pApeiQUujhzmr}ovE9uZ-ptF0x! z(2334CY4U0)=c0!Zl z$Njaqq?MQ;B_FPJ=tq`ESZ*c8*^&h1yyOTj>7B^6d-Snam53T->DGOx+AYc;4uCyb zaL$3fi#bHtF_c43x^^N*Q*LS^CG^u_Mb0O=DY+XbRWq#`x=qs7yIUYExY1wYhJmbj zMTyHHburIe-h!VShlDD(RWDI6kM@t8Qj_DDQQ#ZUcd1EMVdMW0d^Oyfx}HMc0Z|Op zxXsGuy=@*0Yz_AEF8t+D%Ys4ePa`0S3C>AmO#rz`}7ON~>rvf26%N z7WamC^=&TO`gw5eDZw7zmB`93qJATW*p``~?ySi%?hoi;dgS7!rz8U{JL2uxM8-Ls zO3>XgkKN>p05XT3)3|!v70LPHt<6IhUaK$`C;=a`Zkicdm?q~Kev;)T z%-pdz;|vV5;vTTzzBVhIkrNWt`$ppD8g|2fp4OQ-I@iv<(lM*w?Zi{h+*YZ~K=0Ls zLOEqwm(4hN>K;!flE;TTL3Xhq>~q?U#P-0vN`=&RwAR-t{T|ZVP5$w5xX-ftgYpu) zDDCtK&v(=^iR1|r)D(QNt}8HaXzOa~#Ewz1rQid`DYTG8Pa`v~Qv{pX}G+1g?1z5d%29l4dj~#Ax5aD zRt_J(AIsKUb(+-=G@21Fpx>!J@WSt{qNYU`U_+xteu5^0dvZtfhJKQjSm$7dRcayL z?3Jz3d>mKL04J~8@_0R`$4-6{3lbGw9f1~paxKqI<4b? zZJVk}v-uM^w6nIv^}8z==X0|C*;RPoL=)gU(z<-2#hLp~qsTN+(634e`HoMc&Fp@z zj%}n|!)d_X6jnpeX8IDl`5#P`=)D5>wiiLeEv0kU6_Y1rnVelYbByvHli8)_@A%k6G1oqGVc+R8@-hdZB@UHCBLG?9h)JGR&( znGKh)iM7R=kw`NPPFl) zFQ%yBm!KH24;aBHH^zK?vK4%~O@`_(Fo0ooVuwq;=x`a%t&0WJ>tb*r;ucdZX=x*Q zOe`&csV(x7@Mm2Z<^ij+A8NuBga3;fJc$5KTrl_^=e`r*Q65E$KFW3S1x3~23=eTRNJQ_3PSjg${p z(Eoh`1m8DggKZcEJhlLLAYZ1?0T9fnFiqSkjQ&m7?QMpI)`K-Tw`JCQ30-~%WkBLr zy9L79C_xPx0nE~0QlNYf)UkBDSpiE^m{%TMb|bz^S}+4`>w`cgkIezJz(QJH5Aii; zdDNec6~)$7ro#Q`@a@nN+==55`Z)J3kl~n$2c?s`IO%!#n8aoY%sZTU8+!(jyaBA306Z7r3r?@`)e3G3ltI*}gogbseE`IcWaYFs9R9;?+yB>gz!=0 zEjt}-G3qtPjLrBT>vDv>{V;;XHrCN08zrQ{x2e3u>o9JCTFwn!`0X)k0FM zD_G>0O?|7K#d(xk z`eu#DW1s%PQ>H^4K@x!LmC(z-lCpRmdBRtf2TVW{0Xvglci zQ424tFDPg&yqgJ%ES371))pug^QxUb6Z)Rdh-D@b8SeHOndXAeba(shB}zFjKJmM9 z8@#5j>{M~BWD=%7uNW+?My@k|yB9_WwiU5cr$OI`{u@vi^coy+i#sIQ54n<1r4+_C z=5Vlk>iSGn;PrIBmk{vz$ySqcN1|>3kx6JzDVW*16;VzoM2t1fR&^~qppa!bG2rU? zl2$5Up`U#_Xm~ozhEkd%<;wHOd&Aev?F!7Ip*3)pG2lW)OZTyk0f?T|hGB~{PO1cl zvV>7NEf#RIkE;h_L%hepbPye4zN`L|+Y8O2x#ES_<9jDNB_dZT5!stX8z_?1r4+iqBH5Q}wfryY}YU$~$! z=gsq|MQE`n)vCA$WAuB!9r!XaVhx2lo>6`s47rIFe-?61r3@fT=)+r2JZ;5g2A zR585|d2XST!glz2L>Qh1HJ!Ng^h8^_ErjE_Zjsg z_S1VudI`>w<*ripJo|xfKqO^J$)if9HYgpPhEqn9M;T=mW^;7OV6~ywkr(!V8?1raf;nTl8-%|P7{O5Pf93zj_J`s z=HNeP2TQH5ch{M^2@F7MhRCyPSkvY1EC*oHi-WI;V;Szw9WrfsL!Q{NDARgQ;{oMj ze62h72HXQ?`Mq5VZHT+<;N9|9@6m<=!KKlY2TvPST!ZPOZK@D~mw;@QUWFNW@8=4K zG^;hR#}B06`+!TIO%z&&U9qls+%?t@t?0Pb|I{a75S-tFD?WPpW))p8I>R>2gRe&a zoCB`N4}aC(*)MIt#kWsb=M>ouyo_t#r3HE-K$|PZjE^f$(7;rw{dIe+3^8V0#gT7E z09aNVRjK-StsYm@kzOIzu^T?YZ@8ZL+PV6x_Ev^YYAQ_7q<@v~{&O~GP zI>dihe?jiIM&$>tBG3#N(J|;mytX8R80LanUQQR`rsL<6XCX=Cfk3~0pi%4XW|`(K zhh9(DZKUkOtt`>$AN2nJC!p61MqoyOV1K)8d8(-+LHwP-k10D!^N__HQ&pHg8#&80b3b)?Gl>b;I>3{sPilTa1%K0ZJO$jR|K)*B$Ttx|VpBq}#1 s+X2L#5Zft8(rBx!|6+^7kN~9rT>)i2{hSW`4<&N$tks#4)2>nf1Dj)45dZ)H diff --git a/icons/obj/doors/hatch/lights_deny.dmi b/icons/obj/doors/hatch/lights_deny.dmi deleted file mode 100644 index 1fe72d724f9512ff05326027848f61886e378ced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2534 zcmXX|dpy(YAD=O_LOVx?+~!scb16THFq&KCa-^t^OC^nBE-T8~)+lm0LvlH2Zbhe) zTXTroC?~qOS2T*;M%kpX*=F1CJLmlITwc%T^W5H__xtlaxBPuQRiIi>5D28=?S&2i z+6q}wRs`y-f%8b9Nxd2vj6|hl|3-f_M@C7(`hRY=<1kmabq;7dGm_>i`OZmVXb{N581a0^|3@^g31DhRYi z&l~L;m|Vs#e-^9lsqV2nyl4BZo7(1guG?O}7vx_Fvit##F1HLZyR5hh{wh%5yqkl8 zw`XX}#eZ`{X=%iwa%WPJax4{PE&$=Keo? z)!b(XMMISt8^(szdXw9H-ErqjF}HdrM1I_FuOjY}sSy-{9OAK1B3=&C(8$l}NpLEO z@FDOq4k3>U51+{K$Y(E0d75Gy%^@p&g9*%c>z~evM68d=77yo|8OavZp?Hd{Y#|=F@aiIq*8hjE({A4G3et+tJ zi61S<2cNhk`-Rds?nRx2F!oNa?Azf&7Q!0Su5eP8>@Y<2iwYCn@Ea3}(v;hmGxdU6 z+(p&Z1OLcdV1ZCW)!noE=kUoCd6doeyxnx$F4U z)`dCZq{~-^RZe%!(1CfbBBF6=5vyCSR@R>kQ>xLhh+`7Oe=Ie$C8FdR^HzY4l#jge^E%4O_`ybSKDzP>4cw)xG&Tmh%stJ3^J(U?xVGTbY zJaXfS-QPM}1ReQS&rhnFcXs^lpq^(hy|(^6{Vz5D-qgVP3UPUz+4nzP49!s#_+6)i zx-^FTqpcHmHT46jmQ+2sRNt^@7%vS`R${BUjeuKWaecp`CF;u+X>F#jTbky)dM6=4 zZ;SjWlu7SYa4Y!fi%ahqPgqSlG{*mqL1Kftb|mZC^66yDEqC@~h^FZ@i?}t2Y4bIG zVKBuaaZo~vvA6vGw)u3nKkbUkICK!zgcw6Lfo=WsgEQ`PS1^poeACX5K|wMtOdjFW zC3xgrI8Y0E3R=V;V1~8!Rpt+?FWGquDM%`IYRV{li{tXqjCYFcAlE}i6}|JOvv)<4 zrL?1~ZGR$}4XSvB8emCcs-2SePXZFoS&z*hDjX&c6k5FST+6*{+<-EZ7gsw%fU-u#lI3P#YeExpot9GxC!2fTC;_y&7TG9=%mI2Q1)& zs4naqTijU)rlM_p50dI<6Co|KM32a@aFTsn6*M;fz)-#g=rJO?w0b;u|J4UOiHR3acf_v&#ZCBTOYRn zo;yf@)k|ack{9|})lGb|dmxKDR0o%nh28Hqv&VLOoy>qpPP{_eH${X01C3L87Vaa0 z>D`~w9Ev`t%C!2HBo~c@t%2B{nzt^pT37Q}0rMpBy`$kH8SN7$aUZVpsw1ca{Z}c+ z&9ksv)CN7Z-?K)n5DVqWG*w|FTf>m8HdYVD3K55C)J}%-;;xgA%;-o1V$cE}&7924 z>%Mi|93Zjppdf?BFxP%#ZBzCBH9&oNoUe}vq<=$X&Q$ZBOoy= zMevmw0jY4HXP!GG$VSX$Sl`<{HjNrkCnjFXN?jDN^ov!E_t$A}x8 z;ko@i)ndb|+?}__vQey=AwplxN~m=?#Z$B+m9idEi-y1^NSDi-qMM zz{Sdv5WNwRoHK5`=%R;rhUds$wC%0Ym!nd7o?RZDJ{!OGI`J9yQMC*4$4=2)9KL#@ z9N-k*e^1yOR*HUF;(6@{v)rL<^g2Lqt15dcWp`;`WU@?W+r+-TpZ4p^U{=Xq;(jcd z<05YA$??+$fM_W8dYL`HVu%u{ans6#IJNKUgF=b~v=wPfzuZHVV-|w_Zj4KQL7gT>KWfaM_ zZ-+%IWWy4QnjL|8KX0+geklurRKCaG2PyuGSOt9C OK;G`Y=z6zs^8W!|*a@xx diff --git a/icons/obj/doors/hazard/floor_inflatables.dmi b/icons/obj/doors/hazard/floor_inflatables.dmi new file mode 100644 index 0000000000000000000000000000000000000000..76198144476eed9a30b06881adcf8b0f1d7214ec GIT binary patch literal 519 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 literal 5372 zcmZWtc|4SB`!_TVgRw?2mXa+Fogzb+v4zMW4%voEk}$SxnK8t?Qb|z*Z{2rap`+nZ@{{EPGp8LAL*Z11)`+2VWNwBsu<%dc@IXF1@&CQH$ zIXFNl;3vz?1xVKGoSJ}3ptYr)357yYS68>Qv%7lrDguEpFfj1*^D{%C9334)LPDgZ zq)weWB`qy&V{YzbYa5NnUvqX&OG{H!R6KFwgkU06_%&2bP3;CJXAuNqXlQu;{CQ<% zWjQ%HBoe8hpy2obt#(abKI53ei(_^P78>3vfH@+x>?&X#6l`mCnFBR9bORWCjIeVI zHuem<7U+!)_V)MV;0Vhuf7A(!InCGF{q3?UR{lay*v3`a_}C9IR~+NyugTHxt#0{c zp)Bpx{>-S}*&MIT%()+Q<<*{TA4v6L!SJIcE$53DlwIhtt{2RCUweO7LA6SSX_Y-O z5EPO(bmFs58&zGA-To27)6?%YKkQ=KTNt}Guw^S=b%SLx3mqc4{~sb_?a6U*o9>; zxh7sMJSQw_MB%%0r(xJ@@yqOT>i&L?Q@*S}Oj=> zmZ3%ct3#$=L}~Kjh9pQa$S8a;y8eqQQU5lN*{J61<8cc52T$5+%TA{tE@H&byDqU# zvg0xR&yz{HsOi01PobBRr(4l^`cZHhWM+8R*7QIQ?pi>o=0l13iZ#_S1lb9zr94oe zldXiCw}Ox5P#r6N@2)0vf6;7_T0(pX!FkTjOsC$`D2QOiZBh)|rqqTJ$a?g4c=6;~ z%g)!gE|Q&vfluw##=G7$Qn{F~+a{d3WM~59k;81J2hI{rihkc!xtPq1h!|v~Z#j>)t{hmuM7YrWZxjL&zplBx+`s4Q6`Fg=RC zFu5w8Zq%(u?B1x&+YPE~AA|LW(f3|O(^kcqGsL4Sa{&YRsqaaf*w)GNjaJT)#OvAy zF`>*9?UAL#%`W!bdhzt?;Eo8$RKeiEZpLHZSGnZFo4wTNEvbK>?Dfh^|xgnv9N?9~Mm-xO5BeweOeeYPU_bBF+uTf!DT03AY1H8w+ zwi8#n$Mdp=>^Lr&iRqvLrno@GEVZ+lJYfTIL19{|f4NsDZq;WGtMw5(?+72ntbmzR z&Y@wq`zYOc-FL{H`}dyc;Mup)(Vv`Y4t}K>PrWM>4J0rU+pI)C_t%~{_WJkSU&*TG zYf~TEdbLf$-TlhXw-Q)Kz~F~~l?BwJbR*PjP_0g?NAkYL*k){P=7VH(BviQ4MzMsF*l5Zb>3eDkj)gcWWW0NcLqU@!XiIq*RUTMU=fKc{F zg79Cb`?e!ll$}RHDJ|o4NLN4YIV%29%gRUGga#63Lb%XrHXVvVVzY?jH$mQe4Y zU=u=z;Gb*tl`=!!$)1D`-IN2kI}$x3IJ*i+Yq*WaP9pY}=@7MJUpT$b9L58(>#96& zJDx|vfcv2gu#;b-9+6BHC_I#P6jW?Sso!AO7zNj&QjHv^0rzONx|d#Q2?+yWvvQ3N zjrarCK0b;LonDE}2<&6)1mJ>|6_+YSXr})?d_32h5g59BfXN{{3P^;>u=T?ZaF6GR zzi{5{+$!mp05N%&NvP3^$6;B?3`R&ADxT0XzT{igz<;+)UOifT%-c&Y)}dsqx}~@H zR+Qj-24kn~y~<_%z_7RlUmy70GH@s*i`^urCs;9dSpTa;Q%x;-g^|G`+mkZJdG}|r zA0obuJr&UV+64X-fs*Y}k#j#xeDOXX{VvrTEaktTo?VPrK7#H*jC$%g-L))FE_QRP zTlVBwD5&+83ud#CYDmFKr<-m3BVQ9lkvbq_2-T&RV zrvvmCZ~i;cO~6HrC6QYh0ndg^b3%6y7%q^aW14%zPpgt@$lYlD9V3nVoJn1=9-z;x zDBQX?*?iI2UE|*ZgFrcJv&M;e-J@bv;#&-pwu}`FjsfriG4d)ct|X?aFqHnX!6I}7 zTEL-K~RO=)I_5^oK9yv)d92pl^(CSYE>{ExMMw;I@Yq+^m zoDaNG_j~Rlcsf@7%VTkt;*ZHK;2GyHKhe1t~Y2S=*y{@R-cI zm@;iB3}AYGdO=ThsY=M;?;5itdax4Qs;|YgX zy7P3!equ#=1kR@4YP<6Xs8z+WZnv#5Jf#N6d&S_hPXmgQW#GSYg{&xpz#t5_au~eA zy|(2Ss2hC)d`kBZ^@*xl?rccWdz#8L?bUm!7w*T36|+)4+xT0ge(1R;oTMWe*!EaK zux3OZl8YLK#D>E+t53FVTvD20Vp?vGNk7v+vF-fJHBLCCwNX0dWVcrSgO&c5 z*Q8f0*E3_9>=$#-rqD>!*r9L2ipk1H?~2R=e2+(qC$N#?Tcbg2Oo)O$)HD*6s+&(* zgH>dwDI_bIxqM#M<_gJ;O=|1~DACGhqt59vf#+sYiJ}@6R~gy;gWB^5_!7t*Fwtn^ zWu#V%Zk+Tx(NIf+i<$`iV(UKyHEsB0s2?ctx=DF5AVRIc7_gw<>Vw#_PTh0A|&yqsSABEr1`rLL63WLaH z95}vFzLNWfCSIM?od2)Kt)g()gEd?$C&zHms#Gu>c3#(;a99jd@Mm=8 zE7XWV>tt2)Su1IqD#X#+8GSHO1x>nHdgE{4^vo+1Us7abW)VCV!WnO&Ne4;*RP3ZW zk0Yg52&f#?Om+4T!Z}7ZK^G!LY=(6s!i^gzu}8)&4}#B$E-I2pEa*BMtV~RbcCyfp zyswgWrTs|2(Bu_I?`;chXzL5^;6#p`K& zGY3W5LbSGtKqUZptVQjRUU741PXJZS9pP3s}D^(vCoI1_H%^R(kly!gI~n4Mi>@bO6!83UB&; zX?Rf|oG`t~>$!7;?RM@tfqANNqUw!7CfN{d!4$a>8ST^V;T5Zj1omeXQhnie%G|-$ zU7?xe@b~Ru!4^MRAFwP#4_r-*{2tD&XIQpVz@h5icsH+(WZ{mwb!Mr1!pA&uK5rbj z{#j3k4&ivG0A$a$xMgQD8nZBfK*CooawKR(E?nv5={>Bd^wG?DweVl}Df}O1imV=P zG=ss@=im=IVRFTU-`fXRa1?O6&awm4fCxv7?1R}FN z{GmFW_jZmftQwDZCnj-t8yIdHQ ze#USAm8%O)AHF( zdHFb5Tcl0?=7u$XvfCOdSekd!R}IC|9l~T5*LbrinNwNJ1f~M#*KQ+LTp!RIFcYBV zc|<1fEFH3C%`yg4ySZ3#LAg^m{+_GIgD`nN(;+dNB5TZWcTuI7+Qnys0v*=Z75Yrz zm3ff(U>52v?t~jsfbR#BU=%-9#!RrkuZHrHbw&zSl+2UVG?Q;T7uB!^7yG7a((4SbLT+SN`nyskd%rIQI&k zfI#8>Ht^kz1I^oQ>Lq!O#W=UPL5r^f9hx2%I0KfkimVf|(vV(spj{mE}2<#+Ny=P>R-Q z_1SjB@g5Tk?HUL-7059F*M18zqYA*!h*Ag8E*XKxqSRjI5w|#i;BT^w;|9B5*cjNp z#kt3ycvFP=WIt>edgXtzues<;BA>Q+WGQJ8_Jm0gGSTt=ZMtl5mk@fNGYZ6Ti-vcI zoK-jLnmY8&6ZBCwLY?xj2ALtZ8|A1gp{_ipnBMOuqC(oqm6g$W$2s2Rz4Y2WaJ$Z4Or!RpnQKu9u5a#`R(hS)}(?zMt0pbovMl!GBNI&p5Tu5DXDm&*KHtP zOFs&i1__y5Uz!HA?)jA5LBEPs!&29PheGhSsKU9-Y z@p!EF`>Vo|IBMb-w!Y7iR4fa50Y|L9;hq+8r{aMl9L(WNt6tZu*sjp-@NrRW@S#ji zf~im{a-&9ML_|z zScIF_9Ne}r>roiLmysR_GiqEb>wdVE-g1xg;e+Vkm(kt=dejS%s4KEdxsu$V-;x}x z+Myb%A`JvVZ1Y-~l)C`86Jvq5@O#if%d-_7gPNwPV@wSx{0xQmTvP^<8t>x;F5gJM zHK?ZrgC~(C-^lj7_bTkz1}32XkP(B7^Fyg!>(%iwMNY4C z>?ys{*oCXmJQx3xJ_OUxI&O=@pY}F1asRuXmwu2iaU2$TKTGf=axE+lLbnze@;mb^ zR&7X=%+VS_X?yDM$9>rya|TL+@ltX(zLYIFS2DJhA7KB3McFESccf&`?mRJ8PqsaM z8>;O>f8p~&HyFoWo*Z7xACb14JlH*#90~1@fK~-nzsh;-FiM-^YZ+l9ehp8Rqn2cYI#GjC6>Di71u1Tex|-irj4;Fn}5IVC#Fc z?7(=Lxe88JR3CFm#Cu>ow8uH-7pjCTu$fLefVksj7Ag!65RGj8QP-kbM>g{Ae1U+= z%u4+etIyG_DEFiLZvNn(dyx(HDGWyb9(Eg@lf1KAg}t>oX_U7qxB{FtC%Nxh8nX4# zlprN{8Qx4?s>y)}cnwA=;S19(+=NfB9cUgZKR*GWuYpW2P=m8>Vmod@~;N8CDCSHS)VgWHM^{E*!Ca)qHV)a8eWrOkkk8(>u zIOI{MKAYXOYug1s&WaMw0uy$3w}=;rx4d?q@erajc6MjdoC{*e0_)<>57M>8|CL=u zUMc#r3#k`Zk$o7;*1xiuHgajsloe$~8bBU}I#O)#d4+crVu}an{(8dJSF~P`;RCBq wl#tQ3=T%In2Fx?cMcuw)!emdr>tDlbA0Kr-`qVQ4_=d<~ZenFzVdx(7f4U&2-v9sr diff --git a/icons/obj/doors/station/lights_deny.dmi b/icons/obj/doors/station/lights_deny.dmi deleted file mode 100644 index fff1fd844594b172f6b00c43df739a640a343eab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2960 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 diff --git a/icons/obj/doors/vault/panel.dmi b/icons/obj/doors/vault/panel.dmi new file mode 100644 index 0000000000000000000000000000000000000000..fcf3e68df2b0e79bbe79085c9d806228aa97d424 GIT binary patch literal 629 zcmV-*0*d{KP)a2 zb-QOeJpf(g{zoV!%*1gjG2M(*$$#Z1pl{sq`arHtFGlx<-9BT;x46n zH97C99#6$9)*dJxK? z5imD4-uX1;ynaxLgVS+@gc}=24h>QchNgQ<8X#_L962;dd7aqV;iGr`Ww8>zWrD@f z*~uvozp$`z^G+h?U>MJXQ2oDR`yc>D3~)=;G$sx%9}xqMu0KLIb(f5 z`!2_s@^%L=v;x^`Us0AV{$gt=hvH}RlxwBg8X%Su8;qg6Rm<+<2@v1dU{M+00P`Oj zynF5EjBk5`RoZ)BWvq|*)xT!S$WUsZ{3HV>Q!PL_agd+v$|atv^pBJa7VA#pe8Bmj z;C#UOfb#+80~U*j^8x3Bg7X3A1I`DW4_GWB&Ig%wEn|$yM9g$-Q>N*ES P00000NkvXXu0mjfU^ERD literal 0 HcmV?d00001 diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index d04cef23357f3f73ef0960b3c72591de578844fa..b7d88fd8c09f2dcfff822980cc3c33f903d90e1b 100644 GIT binary patch delta 10941 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 x^+q;WwoA+ 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 diff --git a/icons/obj/integrated_electronics/electronic_setups.dmi b/icons/obj/integrated_electronics/electronic_setups.dmi index 8d5e6f10a643ede47b37f900300a06138bb615a0..f053bab9913591305d50e3ed1e67eaaa13d561f2 100644 GIT binary patch literal 18253 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

    yb9U960 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 diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 9d869bbe3c954469ef34128280166d1e6d7bab1b..4b46a4a3c14e854e6618e15232fdceeef60077b4 100644 GIT binary patch literal 20198 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 literal 22645 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 D1_y>g diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi index 2ae9e5a33811eee11972de054b8e1cde0666de71..6e3b17e8de8e1fe878b61ae9ae8c80405fdba9a2 100644 GIT binary patch literal 10978 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 G*#82Gw8S|8 literal 31260 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 USpNVHBL+BR?4d7rv%3NV1y#QYBLDyZ delta 534 zcmV+x0_pv_555nOwSWD3R9JLGWpiV4X>fFDZ*Bkpc$}41%Wm8-3_P#DVv*d7HtDsO zB0-Tu^AEH{S?ucJQt~?f`*PQt9tsp>Zn8Zhhvbm-{qg(rkC)fu)6bXTjNGV}U3lYKBFbn@$3MSn_Bn((4Du_C5#)iNy+T*;K&*;fPsv(dwIN3vx zkQbJes_@R>4OSZ#s%(yQhrh>bWL*|+s3NI!8$5{1@@>Dmh3^X#1l87zsoM7E7K2u%w7&2wOXup?Bq@1C3i(}xa zengxRLeFF=BD5x=07I*e3Cc-DVMdnDcbm+ZxtdD(&wrIB$_IUgoQbU+F2>O~I&L%F zSJN7p;qp>$=*YIo&VbGq5~A&F!3DzPZT`>HOr5X~alK@3bCRuN$xx4hOfr}$RXt{z zpML3^eQ(?@mEd3bqya-Ll!Nxr9qO70cWk(}FEtB&kCG2e>~z Yzdl|6R0{t954SZWp6!J7v$p~R1tfb5y8r+H diff --git a/icons/turf/outdoors.dmi b/icons/turf/outdoors.dmi index 7308e2f09654a560cf268560ea80e6de7d7da1ac..e509a728718d717d687a062717591cd59e88eede 100644 GIT binary patch delta 688 zcmV;h0#E(-mJj)s50E5(h7*sBHq4-bOUTjXACQHLHgz&`yXdKc~sw@e=c9u;$@lD zNWuC_&DHeNC>u1^#8S=GWSk93w3{-ve?o+aYOWq0vVpM_)Lcz}v%#8Rhe6HNEE^bf za8z?OdAj(WBFPuq2ArFmB=R$f{6xa)7y?TLgthaYSa5eR+5m0Ep!Uv)U}raFWJ&Uc zOp<)TFOqz*)!>9_H-twSDRT%TxCWf#s{<9kVPh!{MTt97WaNe*gpmx(W!TUFZH1CU z1GE+D>R{JGSsmW1=F}?0U zhvss0%%Xem`5w4JD9XZ9g>+p|a&4{)d!s`-wkI8RQ|64s5d-+n` zyl@>3t4L79RIRIO?S`&srq-oT@p9KUt7`ZN>l%pX)k_xgJJb!-c*pUD050glPm(XfBwvNxOvrt^XVJO1^879N7vyiq7S!gj z5uz++3uKvpUr>Yk;hiV-8yv>Shd8L=Hg^pMq-cmA?v155lzpgd2n63KGJf08)-Sd zYAwf)*e%Cj0nRrbtvyrhw?^sDDPDkhxXd_sGeUJYVoqn{s2CjP}}+9 WJxqhM0*A8#0f(~!0=KgQ1H{Nsbx&9T delta 686 zcmV;f0#W_>mJj!q50E5(hI&+3bVOxyV{&P5bZKvH004NLt(U=$+At7?&&g9*yVs>6 zKwEm?(z2?Mx~sl{HN-<=VPZ5kiFo@S(hbX&bS8kv1?iiA?0=l`JJ zBL(X#wNSH9<1}fkiKSYo=_E}`v_%=)KOsUywNMWaX<{q|wNSHvG}#dBFsOx^r-?xa zN3~GXr?cNFl6<~xz`5y3B6}y1ok&<8Ltv?ZuyNiK3+@g^8=$Qi)ZQ5p>}*j+mL#9c zB+2LeBFX1l4NjQ0AUw)QnL`-CHQ*dy9jN#X8%uE{O5BkmBMX8M#xg9EVIu>y6-tf_ z&{n9cgWU*ab+DU%0jheyiaVay50!63(11$G(M*m`mbsC=V0-p4)JD!#iWW|tl4 z&`gd_Sak0_-vieOd6|2vkS+^KuFW+uHp; zQ=-ZE>FxO#+|xK^!99&s7CaMf@AEB5z6g_i6>@VS_wANNXX489cjRA?zaLvrn?oT) zS9{ UgS7&OwE_W$wE_aSwE_dg$Z>&5mjD0& diff --git a/icons/turf/river.dmi b/icons/turf/river.dmi new file mode 100644 index 0000000000000000000000000000000000000000..590f6f048e1992eec39cfe3d4ee1df2879d354c2 GIT binary patch literal 122315 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 z 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 Github URL is not set in the server configuration.") return +/client/proc/changelog_async() + set waitfor = FALSE + + changelog() + /client/verb/changelog() set name = "Changelog" set category = "OOC" diff --git a/maps/UTILITY_REGEXES.md b/maps/UTILITY_REGEXES.md new file mode 100644 index 0000000000..84b124c0af --- /dev/null +++ b/maps/UTILITY_REGEXES.md @@ -0,0 +1,10 @@ +# Utility regexes + +random regexes, with varying levels of usefulness + +## pulling a dir out of something with multiple dirs to force a /dir subtype instead + +that ; at the end is bad and can lead to issues. + +`/obj/machinery/air_alarm(.*)\{([a-zA-Z0-9\n\t "_=();]*)\n\tdir = 8;` -> `/obj/machinery/air_alarm$1/west{$2` + diff --git a/maps/away_missions/140x140/carpfarm.dmm b/maps/away_missions/140x140/carpfarm.dmm index 1e23650994..df75f4dd3f 100644 --- a/maps/away_missions/140x140/carpfarm.dmm +++ b/maps/away_missions/140x140/carpfarm.dmm @@ -126,11 +126,8 @@ "az" = ( /obj/item/storage/toolbox/electrical, /obj/structure/cable, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + alarms_hidden = 1 }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -507,7 +504,7 @@ icon_state = "intact" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1375; master_tag = "carp_airlock"; name = "interior access button"; @@ -678,7 +675,7 @@ /area/awaymission/carpfarm/base) "ce" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1375; master_tag = "carp_airlock"; name = "exterior access button"; diff --git a/maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm index 0745747a3f..9eb53929a4 100644 --- a/maps/away_missions/140x140/snow_outpost.dmm +++ b/maps/away_missions/140x140/snow_outpost.dmm @@ -59,11 +59,7 @@ /turf/simulated/floor/tiled/old_tile/white, /area/awaymission/snow_outpost/powered) "am" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) @@ -196,12 +192,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "aK" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; temperature = 80 @@ -265,12 +256,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "aX" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /mob/living/simple_mob/humanoid/merc/ranged/ionrifle, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) @@ -314,12 +300,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bg" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bh" = ( @@ -327,11 +308,7 @@ /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/dark) "bi" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ icon_state = "intact"; dir = 10 @@ -487,12 +464,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bJ" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4; icon_state = "intact" @@ -516,11 +488,7 @@ /turf/simulated/floor/tiled/white, /area/awaymission/snow_outpost/powered) "bM" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber{ dir = 8 }, @@ -895,9 +863,8 @@ /turf/simulated/floor, /area/awaymission/snow_outpost/powered) "dl" = ( -/obj/machinery/power/apc{ - operating = 0; - pixel_x = 31 +/obj/machinery/power/apc/south_mount{ + operating = 0 }, /turf/simulated/floor, /area/awaymission/snow_outpost/powered) @@ -1557,10 +1524,8 @@ /turf/simulated/floor/plating, /area/awaymission/snow_outpost/outside/nospawn) "fo" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "BSD APC"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + name = "BSD APC" }, /turf/simulated/floor/tiled/yellow, /area/awaymission/snow_outpost/powered) @@ -2392,7 +2357,6 @@ pixel_y = 0 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0 diff --git a/maps/away_missions/140x140/snowfield.dmm b/maps/away_missions/140x140/snowfield.dmm index 8c4675c90f..8eff3bdd7e 100644 --- a/maps/away_missions/140x140/snowfield.dmm +++ b/maps/away_missions/140x140/snowfield.dmm @@ -109,12 +109,10 @@ /turf/simulated/floor/plating, /area/awaymission/snowfield/base) "ar" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ alarms_hidden = 1; - dir = 8; name = "west bump-derelict"; - operating = 0; - pixel_x = -24 + operating = 0 }, /obj/structure/cable{ icon_state = "0-4" diff --git a/maps/away_missions/archive/Academy.dmm b/maps/away_missions/archive/Academy.dmm index 80e4346635..67d9d5ffb5 100644 --- a/maps/away_missions/archive/Academy.dmm +++ b/maps/away_missions/archive/Academy.dmm @@ -41,8 +41,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ environ = 0; locked = 0; req_access = "" @@ -1000,8 +999,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, @@ -1665,8 +1663,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, @@ -2465,8 +2462,7 @@ /turf/simulated/floor/carpet, /area/awaymission/academy/academygate) "jW" = ( -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, diff --git a/maps/away_missions/archive/blackmarketpackers.dmm b/maps/away_missions/archive/blackmarketpackers.dmm index 524ef77707..dcd9d3d2f1 100644 --- a/maps/away_missions/archive/blackmarketpackers.dmm +++ b/maps/away_missions/archive/blackmarketpackers.dmm @@ -598,8 +598,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, @@ -836,8 +835,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ environ = 0; locked = 0; req_access = "" @@ -1104,8 +1102,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; +/obj/machinery/power/apc/north_mount{ locked = 0; req_access = "" }, diff --git a/maps/away_missions/archive/example.dmm b/maps/away_missions/archive/example.dmm index 3f90555f7b..8440742b10 100644 --- a/maps/away_missions/archive/example.dmm +++ b/maps/away_missions/archive/example.dmm @@ -33,10 +33,7 @@ /turf/simulated/floor, /area/awaymission/example) "ag" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm index 6646f2f00a..3438b17126 100644 --- a/maps/away_missions/archive/stationCollision.dmm +++ b/maps/away_missions/archive/stationCollision.dmm @@ -800,11 +800,9 @@ "dE" = ( /obj/structure/window/reinforced, /obj/structure/cable, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 7500; - dir = 8; - name = "Research APC"; - pixel_x = -28 + name = "Research APC" }, /turf/simulated/floor/airless, /area/awaymission/research) @@ -1065,11 +1063,9 @@ /turf/simulated/floor/plating, /area/awaymission/northblock) "eN" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = 5000; - dir = 4; - name = "North Block APC"; - pixel_x = 28 + name = "North Block APC" }, /obj/structure/cable, /turf/simulated/floor/airless, @@ -1598,11 +1594,9 @@ /area/awaymission/midblock) "gG" = ( /obj/item/ammo_casing/a12g/pellet, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 5000; - dir = 8; - name = "Mid Block APC"; - pixel_x = -28 + name = "Mid Block APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -2029,11 +2023,9 @@ /turf/simulated/floor, /area/awaymission/arrivalblock) "ib" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 7500; - dir = 8; - name = "Arrivals Block APC"; - pixel_x = -28 + name = "Arrivals Block APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -2627,10 +2619,9 @@ /area/awaymission/southblock) "kf" = ( /obj/machinery/light/small, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ cell_type = 5000; - name = "South Block APC"; - pixel_y = -30 + name = "South Block APC" }, /obj/structure/cable, /turf/simulated/floor, @@ -3217,10 +3208,8 @@ /turf/simulated/floor, /area/awaymission/gateroom) "mo" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Gateroom APC"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + name = "Gateroom APC" }, /obj/structure/cable{ icon_state = "0-8" diff --git a/maps/away_missions/archive/zresearchlabs.dmm b/maps/away_missions/archive/zresearchlabs.dmm index a8fc991c1b..929c71d59f 100644 --- a/maps/away_missions/archive/zresearchlabs.dmm +++ b/maps/away_missions/archive/zresearchlabs.dmm @@ -1073,10 +1073,8 @@ }, /area/awaymission/labs/researchdivision) "dH" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-2" @@ -1677,10 +1675,8 @@ /turf/simulated/floor, /area/awaymission/labs/gateway) "ft" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -1748,14 +1744,12 @@ }, /area/awaymission/labs/militarydivision) "fD" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/closet/crate/secure/weapon, /obj/structure/cable{ @@ -1904,14 +1898,12 @@ }, /area/awaymission/labs/militarydivision) "fW" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -2014,14 +2006,12 @@ }, /area/awaymission/labs/militarydivision) "gj" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-2" @@ -2785,10 +2775,9 @@ /turf/simulated/floor, /area/awaymission/labs/researchdivision) "im" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -3153,14 +3142,12 @@ }, /area/awaymission/labs/militarydivision) "jm" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -3498,16 +3485,16 @@ /area/awaymission/labs/solars) "kp" = ( /obj/item/clothing/suit/space/void/security{ - cold_protection = 1; + cold_protection_cover = 1; desc = "A suit specially designed for Sogun anatomy, as well as operation in high-temperature environments. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; icon_state = "rig-soghun"; item_state = "rig-soghun"; name = "Soghun Hardsuit" }, /obj/item/clothing/head/helmet/space/void/security{ desc = "A special helmet designed for the Soghun anatomy, as well as work in a hazardous, high-temperature environment. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; name = "Soghun Suit Helmet" }, /obj/item/clothing/mask/breath, @@ -3659,14 +3646,12 @@ }, /area/awaymission/desert) "kK" = ( -/obj/machinery/power/apc{ - dir = 8; +/obj/machinery/power/apc/west_mount{ environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-2" @@ -4098,10 +4083,8 @@ c_tag = "Aft Port Solar Control"; dir = 1 }, -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable, /obj/machinery/power/terminal{ @@ -4466,11 +4449,9 @@ /turf/simulated/floor, /area/awaymission/labs/cargo) "mI" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ cell_type = 5000; - dir = 1; - name = "Virology APC"; - pixel_y = 24 + name = "Virology APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -4574,16 +4555,16 @@ /area/awaymission/labs/civilian) "mW" = ( /obj/item/clothing/suit/space/void/security{ - cold_protection = 1; + cold_protection_cover = 1; desc = "A suit specially designed for Sogun anatomy, as well as operation in high-temperature environments. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; icon_state = "rig-soghun"; item_state = "rig-soghun"; name = "Soghun Hardsuit" }, /obj/item/clothing/head/helmet/space/void/security{ desc = "A special helmet designed for the Soghun anatomy, as well as work in a hazardous, high-temperature environment. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; name = "Soghun Suit Helmet" }, /obj/item/clothing/mask/breath, @@ -4780,16 +4761,16 @@ /area/awaymission/labs/cave) "nC" = ( /obj/item/clothing/suit/space/void/security{ - cold_protection = 1; + cold_protection_cover = 1; desc = "A suit specially designed for Sogun anatomy, as well as operation in high-temperature environments. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; icon_state = "rig-soghun"; item_state = "rig-soghun"; name = "Soghun Hardsuit" }, /obj/item/clothing/head/helmet/space/void/security{ desc = "A special helmet designed for the Soghun anatomy, as well as work in a hazardous, high-temperature environment. Has sunray shielding."; - heat_protection = 3000; + heat_protection_cover = 3000; name = "Soghun Suit Helmet" }, /obj/item/clothing/mask/breath, @@ -4959,10 +4940,8 @@ /turf/simulated/floor, /area/awaymission/labs/cave) "oc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5254,10 +5233,9 @@ }, /area/awaymission/labs/civilian) "oS" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5267,15 +5245,13 @@ }, /area/awaymission/labs/civilian) "oT" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = 5000; - dir = 8; environ = 0; equipment = 0; lighting = 0; locked = 0; - name = "Worn-out APC"; - pixel_x = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -5419,10 +5395,8 @@ /turf/simulated/floor, /area/awaymission/labs/civilian) "po" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5722,10 +5696,8 @@ }, /area/awaymission/labs/command) "qm" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -5859,10 +5831,8 @@ }, /area/awaymission/labs/command) "qJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -6042,10 +6012,9 @@ }, /area/awaymission/labs/civilian) "rk" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-4" @@ -6391,10 +6360,8 @@ /turf/simulated/floor, /area/awaymission/labs/civilian) "sq" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "Worn-out APC"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + name = "Worn-out APC" }, /obj/structure/cable{ icon_state = "0-8" @@ -6978,11 +6945,9 @@ }, /area/awaymission/labs/security) "ug" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ cell_type = 5000; - dir = 1; - name = "Virology APC"; - pixel_y = 24 + name = "Virology APC" }, /obj/structure/cable, /turf/simulated/floor{ @@ -7062,10 +7027,9 @@ "ur" = ( /obj/structure/table/standard, /obj/machinery/light, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ dir = 0; - name = "Worn-out APC"; - pixel_y = -24 + name = "Worn-out APC" }, /obj/structure/cable, /turf/simulated/floor{ diff --git a/maps/euthenia/levels/deck0.dmm b/maps/euthenia/levels/deck0.dmm index bf5983e070..4b9c124529 100644 --- a/maps/euthenia/levels/deck0.dmm +++ b/maps/euthenia/levels/deck0.dmm @@ -2,7 +2,7 @@ "ah" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "al" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, @@ -15,7 +15,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "au" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -32,13 +32,13 @@ /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "aM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "aQ" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, @@ -57,7 +57,25 @@ dir = 4 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"bI" = ( +/obj/machinery/door/airlock/glass/command, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0; + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/bridge) +"bM" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "cC" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot{ @@ -65,29 +83,61 @@ }, /turf/simulated/floor/tiled/techfloor, /area/space) +"cL" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "cO" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, /area/space) +"de" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "dl" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck0) +"dp" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/structure/lattice, +/turf/simulated/open, /area/space) -"eS" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/sign/vacuum{ - pixel_x = -32 +"dZ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/lattice, +/turf/simulated/open, /area/space) -"eU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +"ef" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_zero/forward/port) +"ew" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "S-NE-NW" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) +"eR" = ( +/obj/structure/railing/grey{ + dir = 1 }, +/turf/simulated/open, +/area/main_map/hallway/deck0) +"eW" = ( /turf/simulated/wall/r_wall, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "eZ" = ( /obj/machinery/computer/ship/navigation{ dir = 8 @@ -97,18 +147,21 @@ "fD" = ( /obj/machinery/holoplant, /turf/simulated/floor/tiled/techfloor/grid, +/area/bridge) +"fQ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, /area/space) "fT" = ( /obj/machinery/door/airlock/lift, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "fU" = ( /turf/simulated/wall, -/area/space) -"gj" = ( -/obj/machinery/oxygen_pump, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/maintenance/deck_zero/starboard) "gA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -123,22 +176,18 @@ /area/space) "gM" = ( /obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/outdoors, /area/space) "gN" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/space) -"gU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/space) -"hh" = ( -/obj/structure/railing, +"hf" = ( /obj/structure/lattice, -/turf/space, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, /area/space) "hk" = ( /obj/machinery/computer/ship/engines, @@ -147,27 +196,50 @@ "hD" = ( /turf/simulated/floor/plating, /area/maintenance/substation/command) +"hT" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) +"ib" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "ih" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, -/area/space) -"iD" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/bridge) "iE" = ( /obj/structure/railing, /turf/simulated/open, /area/main_map/hallway/deck0) +"jb" = ( +/obj/structure/catwalk, +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "jm" = ( /turf/simulated/wall/r_wall/prepainted/medical, +/area/main_map/maintenance/deck_zero/forward/starboard) +"jz" = ( +/turf/simulated/floor/tiled/monotile, /area/space) +"jQ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) "jR" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/space) +/area/bridge) "jS" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/firedoor{ @@ -183,10 +255,13 @@ dir = 1 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "kd" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"kE" = ( +/turf/simulated/floor/glass/reinforced, +/area/bridge) "kY" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -196,25 +271,28 @@ name = "Chemistry Shutters" }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "lB" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/firedoor{ dir = 4 }, -/turf/simulated/floor/plating, -/area/space) -"lD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0; dir = 8 }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 4; - id_tag = "deck1_airlock2"; - pixel_x = -26 +/turf/simulated/floor/plating, +/area/bridge) +"lE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "mk" = ( /obj/structure/railing{ dir = 4 @@ -223,13 +301,25 @@ dir = 4 }, /turf/simulated/open, +/area/main_map/maintenance/deck_zero/forward/starboard) +"mr" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/main_map/hallway/deck0) +"mu" = ( +/obj/machinery/oxygen_pump{ + dir = 4; + pixel_x = 30 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "mw" = ( /obj/machinery/camera/network/outside{ dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "my" = ( /obj/structure/railing{ @@ -237,19 +327,47 @@ }, /turf/simulated/open, /area/space) +"mN" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/hallway/deck0) +"ne" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) +"no" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/space) +"np" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "ns" = ( /obj/machinery/power/pointdefense{ id_tag = "forward_pd" }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ny" = ( -/obj/structure/lattice, -/obj/machinery/camera/network/outside{ - dir = 5 - }, -/turf/space, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"nv" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/bridge) +"nw" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "nW" = ( /obj/structure/railing, /obj/structure/window/reinforced, @@ -260,7 +378,14 @@ dir = 4 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"nY" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/main_map/hallway/deck0) "ok" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ @@ -270,45 +395,69 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"oo" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_zero/starboard) "ov" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck0) -"oD" = ( -/obj/machinery/door/airlock/glass/security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) +"oE" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"pl" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_grid, /area/main_map/hallway/deck0) -"oE" = ( -/turf/simulated/floor/tiled/steel_grid, -/area/space) +"pp" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) "pq" = ( /obj/effect/floor_decal/techfloor{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "pA" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/hallway/deck0) +"pF" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/forward/starboard) "pG" = ( /obj/structure/railing, /turf/simulated/open, /area/space) +"pM" = ( +/obj/structure/railing, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/space) +"pP" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "pV" = ( /obj/structure/lattice, /turf/simulated/open, /area/space) "pZ" = ( /turf/simulated/floor/tiled/white, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "qf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1 @@ -321,30 +470,34 @@ }, /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "qo" = ( /turf/simulated/floor/tiled/monofloor{ dir = 1 }, -/area/space) -"qx" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/airlock_sensor{ - dir = 8; - id_tag = "deck1_airlock2"; - pixel_x = 22 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/main_map/hallway/deck0) "qJ" = ( /obj/effect/floor_decal/corner/mauve{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/hallway/deck0) +"qQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/space) +"qW" = ( +/obj/structure/transit_tube/station, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) +"rk" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, /area/space) "rl" = ( /obj/structure/table/reinforced, @@ -353,33 +506,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/space) -"rB" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/machinery/door/window/southright{ - dir = 8; - name = "Jetpack Storage"; - req_one_access = list(11,24) - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"rK" = ( -/obj/structure/dispenser{ - phorontanks = 0 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "rS" = ( /turf/simulated/open, /area/main_map/hallway/deck0) +"sj" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/main_map/hallway/deck0) "sJ" = ( /obj/structure/cable{ icon_state = "2-4" @@ -392,11 +524,26 @@ dir = 10 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "tq" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/space) +"tJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"ud" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_zero/forward/port) +"uf" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/hallway) "uj" = ( /obj/structure/cable{ icon_state = "1-2" @@ -416,21 +563,34 @@ }, /turf/simulated/open, /area/space) -"vw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"vI" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) "vN" = ( /obj/structure/bed/chair/bay/comfy{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/space) +"wz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wJ" = ( /turf/simulated/floor/plating, /area/space) @@ -443,19 +603,25 @@ "wQ" = ( /obj/machinery/door/airlock/maintenance/command, /turf/simulated/floor/plating, -/area/space) -"wU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/area/main_map/hallway/deck0) +"xd" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_zero/starboard) +"xM" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/railing{ dir = 8 }, -/obj/machinery/door/airlock/glass/engineeringatmos{ - name = "Atmospherics" +/turf/simulated/open, +/area/space) +"xP" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/open, /area/space) "xR" = ( /turf/simulated/floor/glass/reinforced, @@ -466,7 +632,14 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/bridge) +"yE" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/bridge) +"yJ" = ( +/turf/simulated/wall/prepainted/command, +/area/bridge) "yN" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -480,28 +653,54 @@ pixel_x = -26 }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "zp" = ( /turf/simulated/floor/tiled/monotile, -/area/space) +/area/tether/surfacebase/security/hallway) "zx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, +/obj/machinery/door/airlock/multi_tile/glass/exploration, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck0) +"zz" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"zA" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_zero/starboard) +"zE" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) +"zK" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) "zO" = ( /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Ao" = ( -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"Ae" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/main_map/hallway/deck0) "AB" = ( /obj/item/tank/emergency/oxygen, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "AL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -513,12 +712,46 @@ /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"AU" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"Bb" = ( +/obj/machinery/door/airlock/lift, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) "Bf" = ( /obj/machinery/computer/ship/navigation{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"Bj" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/space) +"Bx" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"Ci" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"CF" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "CT" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -531,7 +764,20 @@ master_tag = "flight_deck_1" }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"DX" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/bridge) +"Ea" = ( +/turf/simulated/floor/plating, +/area/bridge) +"Eb" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Ee" = ( /obj/structure/cable{ icon_state = "4-8" @@ -542,12 +788,10 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/space) -"EC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/space) +"Ef" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "EF" = ( /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot{ pixel_y = 3 @@ -555,20 +799,17 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/techfloor, /area/space) -"EN" = ( -/obj/structure/catwalk, -/obj/machinery/shield_diffuser, -/obj/item/sign{ - icon_state = "warning"; - name = "hazard stripes" - }, -/turf/simulated/floor/airless/ceiling, -/area/space) "ES" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) +"Fe" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) "Fp" = ( /turf/simulated/wall/r_wall, /area/space) @@ -576,11 +817,23 @@ /obj/structure/railing, /obj/structure/window/reinforced, /turf/simulated/open, -/area/space) -"GJ" = ( -/obj/machinery/atmospherics/pipe/tank, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) +"FT" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_zero/starboard) +"FV" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/bridge) +"GZ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/tether/surfacebase/security/hallway) "Ha" = ( /obj/machinery/computer/ship/helm{ dir = 8 @@ -590,7 +843,7 @@ "Hb" = ( /obj/spawner/window/low_wall/borosillicate/full/firelocks, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "Hj" = ( /turf/space/basic, /area/space) @@ -600,7 +853,7 @@ }, /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck0) "Hp" = ( /obj/structure/lattice, /obj/structure/cable/green{ @@ -638,7 +891,11 @@ "HA" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"HM" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck0) "If" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/glass, @@ -659,29 +916,48 @@ dir = 8 }, /turf/simulated/open, +/area/main_map/maintenance/deck_zero/starboard) +"Il" = ( +/turf/simulated/floor/tiled/techfloor, +/area/bridge) +"IB" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/structure/lattice, +/turf/simulated/open, /area/space) +"Jc" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) +"Jh" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-SW-NW" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) "Jj" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "Jl" = ( /obj/machinery/holoplant, /turf/simulated/floor/tiled/monotile, -/area/space) -"JP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/space) +/area/main_map/hallway/deck0) "JQ" = ( /turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "JS" = ( /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/outdoors, /area/space) "JX" = ( /obj/machinery/door/airlock/maintenance/command, @@ -700,86 +976,86 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"Ke" = ( -/obj/machinery/oxygen_pump/mobile, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"Ki" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Kt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/wall/r_wall, -/area/space) +"Kx" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_zero/forward/starboard) "KG" = ( /turf/simulated/floor/tiled/monofloor, -/area/space) +/area/main_map/hallway/deck0) +"KH" = ( +/turf/simulated/wall, +/area/main_map/hallway/deck0) "KO" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/space) +"Lf" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge) "LA" = ( /obj/machinery/light/small{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"LW" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Ma" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"Ml" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"MI" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/storage/toolbox/mechanical, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 +/obj/structure/cable{ + icon_state = "1-2" }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"LW" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_zero/starboard) +"Mm" = ( +/turf/simulated/open, +/area/tether/surfacebase/security/hallway) +"Mo" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) +"MD" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/bridge) +"MJ" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"MM" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/forward/port) "MQ" = ( /obj/effect/floor_decal/techfloor{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"MX" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Nd" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) +"Np" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "Nu" = ( /obj/structure/railing/grey{ dir = 4 }, /turf/simulated/open, -/area/space) +/area/bridge) "NG" = ( /turf/simulated/floor/tiled/steel_grid, /area/main_map/hallway/deck0) @@ -787,30 +1063,52 @@ /obj/structure/handrail{ dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "NT" = ( /turf/space, /area/space) -"NV" = ( -/obj/machinery/shield_diffuser, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) "Oe" = ( /obj/machinery/computer/ship/helm{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/space) +"Oi" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/hallway) +"Om" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/main_map/hallway/deck0) +"On" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/bridge) +"Ou" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Ox" = ( /turf/simulated/open, /area/space) +"OE" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/starboard) "OM" = ( /turf/simulated/floor/glass/reinforced, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "Pm" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/firedoor, @@ -820,19 +1118,33 @@ "Pr" = ( /obj/machinery/door/airlock/glass/command, /obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0 + }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/bridge) +"PS" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_zero/forward/port) "Qd" = ( /obj/structure/table/reinforced, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"Qp" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) "QR" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Elevator Shaft Access"; req_one_access = null }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "Rj" = ( /obj/structure/cable{ icon_state = "2-8" @@ -844,78 +1156,98 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/space) -"RX" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Sl" = ( -/obj/machinery/shield_diffuser, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/access_button/airlock_exterior{ - master_tag = "deck1_airlock2"; - pixel_x = 24 +/area/main_map/hallway/deck0) +"RK" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, +/obj/structure/transit_tube/station{ + dir = 8 }, -/obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/main_map/hallway/deck0) +"Sc" = ( +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) +"Sj" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck0) "Sq" = ( /obj/effect/floor_decal/techfloor{ dir = 6 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/main_map/hallway/deck0) "SH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) -"SN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/area/main_map/hallway/deck0) +"SI" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/obj/machinery/light/small/emergency{ +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/tether/surfacebase/security/hallway) +"SJ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) "SU" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck0) "Ti" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/space) -"Tx" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/access_button/airlock_interior{ - master_tag = "deck1_airlock2"; - pixel_x = 24 - }, -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/tiled/techfloor/grid, -/area/space) "TB" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Us" = ( -/obj/structure/catwalk, -/turf/simulated/floor/airless/ceiling, +/turf/simulated/floor/reinforced/outdoors, /area/space) -"Vz" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +"TR" = ( +/obj/structure/railing/grey{ + dir = 8 }, -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/main_map/hallway/deck0) +"Uf" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"UM" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/steel_grid, +/area/main_map/hallway/deck0) +"Vd" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) +"Vo" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck0) +"VI" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/hallway/deck0) "VJ" = ( -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced/outdoors, /area/space) "VK" = ( /obj/structure/table/reinforced, @@ -927,17 +1259,21 @@ "VR" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_zero/forward/starboard) "Wy" = ( /obj/item/banner/command, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck0) -"WG" = ( -/obj/structure/catwalk, -/obj/structure/handrail{ - dir = 4 +"WD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/airless/ceiling, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/security/hallway) +"WI" = ( +/obj/structure/railing, +/obj/structure/lattice, +/turf/simulated/open, /area/space) "WT" = ( /obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot{ @@ -945,17 +1281,19 @@ }, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/bridge) "WW" = ( /obj/spawner/window/low_wall/borosillicate/full/firelocks, /turf/simulated/floor/reinforced, -/area/space) -"Xg" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8 +/area/bridge) +"WX" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "Xi" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, @@ -964,9 +1302,15 @@ "Xt" = ( /obj/structure/closet/emcloset, /obj/structure/cable, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/space) +"Xv" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "Xz" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, @@ -979,6 +1323,12 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck0) +"XQ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "XX" = ( /obj/structure/railing, @@ -986,7 +1336,13 @@ dir = 1 }, /turf/simulated/open, -/area/space) +/area/main_map/maintenance/deck_zero/starboard) +"XY" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck0) "Yd" = ( /obj/machinery/door/airlock/glass{ name = "Helm"; @@ -1000,26 +1356,38 @@ dir = 8 }, /turf/simulated/open, -/area/space) +/area/bridge) "Ys" = ( /obj/structure/bed/chair/bay/comfy, /turf/simulated/floor/tiled/techfloor, /area/space) -"YG" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/techmaint, -/area/space) "YL" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, /area/main_map/hallway/deck0) +"YM" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/bridge) +"Zg" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/hallway/deck0) "Zt" = ( /obj/structure/catwalk, /turf/simulated/open, /area/space) +"ZD" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/space) (1,1,1) = {" NT @@ -4819,17 +5187,17 @@ Ox Ox VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV VJ VJ Ox @@ -5013,17 +5381,17 @@ VJ VJ VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV +pV VJ VJ VJ @@ -5205,21 +5573,21 @@ VJ VJ VJ VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ +zO +zO +hf +hf +hf +hf +hf +hf +hf +hf +hf +hf +hf +zO +zO VJ VJ VJ @@ -5398,23 +5766,23 @@ VJ VJ VJ VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ +MJ +gM +gM +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +gM +gM +Xv VJ VJ VJ @@ -5592,23 +5960,23 @@ VJ VJ VJ VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ +MJ +gM +gM +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +gM +gM +Xv VJ VJ VJ @@ -5786,23 +6154,23 @@ VJ VJ VJ VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ +MJ +gM +gM +xM +rk +rk +rk +rk +rk +rk +rk +rk +rk +xP +gM +gM +Xv VJ VJ VJ @@ -5980,9 +6348,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -5994,11 +6362,11 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ +Bj VJ VJ VJ @@ -6174,9 +6542,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6188,11 +6556,11 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ +Bj VJ VJ VJ @@ -6368,9 +6736,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6382,13 +6750,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -6562,9 +6930,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6576,13 +6944,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -6756,9 +7124,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6770,13 +7138,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -6950,9 +7318,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -6964,13 +7332,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -7144,9 +7512,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -7158,13 +7526,13 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz VJ VJ VJ @@ -7338,9 +7706,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ +MJ +gM +gM my Ox Ox @@ -7352,15 +7720,15 @@ Ox Ox Ox pG +gM +gM +Xv VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz +no +no VJ VJ VJ @@ -7532,29 +7900,29 @@ VJ VJ VJ VJ +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj +jz +jz +no +no VJ VJ VJ @@ -7664,60 +8032,25 @@ NT NT NT NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +NT +NT +NT +NT +NT +NT +NT +NT +NT +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox VJ VJ VJ @@ -7729,17 +8062,6 @@ VJ VJ VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -7748,7 +8070,53 @@ VJ VJ VJ VJ +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +CF +fQ +fQ +IB +dp +dp +dp +dZ +dZ +dZ +dp +dp +dp +pM +fQ +jb +WX VJ +Bj +jz +jz +no +no VJ VJ VJ @@ -7877,16 +8245,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -7905,6 +8263,7 @@ VJ VJ VJ VJ +Uf VJ VJ VJ @@ -7923,26 +8282,35 @@ VJ VJ VJ VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ -VJ VJ VJ VJ VJ VJ VJ +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8071,16 +8439,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8098,6 +8456,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -8117,6 +8479,12 @@ VJ VJ VJ VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8128,15 +8496,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8265,16 +8633,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8292,6 +8650,13 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -8311,6 +8676,9 @@ VJ VJ VJ VJ +MJ +gM +gM my Ox Ox @@ -8322,15 +8690,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8459,16 +8827,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8486,25 +8844,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ VJ VJ VJ VJ VJ -JP -wU -Fp -Fp -Fp -Fp -Fp -Fp -Fp VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8516,15 +8884,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8653,16 +9021,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8680,25 +9038,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -vw -Ma -eS -Vz -lD -SN -NV -WG VJ VJ VJ VJ VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8710,15 +9078,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -8847,16 +9215,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -8874,25 +9232,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -MI -Ao -Ki -Tx -Xg -qx -Sl -Us VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -8904,15 +9272,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9041,16 +9409,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9068,25 +9426,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -Ml -Ao -YG -Kt -Fp -Fp -Fp -EN VJ VJ VJ VJ VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9098,15 +9466,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9235,16 +9603,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9262,25 +9620,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -JP -rB -rK -GJ -eU -Fp -ny -hh -EN VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9292,15 +9660,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9429,16 +9797,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9456,25 +9814,35 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ VJ VJ -EC -Fp -Fp -Fp -Fp -NT -NT -hh -Us VJ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9486,15 +9854,15 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ @@ -9623,16 +9991,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9650,6 +10008,11 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ VJ VJ VJ @@ -9669,6 +10032,11 @@ VJ VJ VJ VJ +VJ +VJ +MJ +gM +gM my Ox Ox @@ -9680,21 +10048,21 @@ Ox Ox Ox pG +gM +gM +Xv +Uf +Bj +jz +jz +no +no VJ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Bj VJ VJ VJ @@ -9817,16 +10185,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -9844,6 +10202,13 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -9863,6 +10228,9 @@ VJ VJ VJ VJ +MJ +gM +gM my Ox Ox @@ -9874,21 +10242,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +uf +zp +zp +oE +oE +uf +Bj +Bj +Bj +Bj +Bj VJ VJ VJ @@ -10011,16 +10379,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10038,6 +10396,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -10057,6 +10419,12 @@ VJ VJ VJ VJ +VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10068,16 +10436,16 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +gM +gM +Xv +Uf +uf +zp +Oi +Fe +Fe +uf VJ VJ VJ @@ -10205,16 +10573,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10232,38 +10590,7 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG -VJ -VJ +Uf VJ VJ VJ @@ -10287,6 +10614,47 @@ VJ VJ VJ VJ +wJ +VJ +MJ +gM +gM +my +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +Ox +pG +gM +gM +Xv +VJ +SI +Ef +pP +np +np +GZ +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +Uf +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -10399,16 +10767,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10426,6 +10784,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -10445,6 +10807,12 @@ VJ VJ VJ VJ +VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10456,27 +10824,27 @@ Ox Ox Ox pG +gM +gM +Xv +uf +uf +Jh +Ci +WD +WD +uf +uf +uf +uf +uf +uf VJ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -10593,16 +10961,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10620,6 +10978,10 @@ VJ VJ VJ VJ +Uf +VJ +VJ +VJ VJ VJ VJ @@ -10639,6 +11001,12 @@ VJ VJ VJ VJ +VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10650,28 +11018,28 @@ Ox Ox Ox pG +gM +gM +Xv +uf +uf +Bx +zp +oE +oE +uf +uf +Mm +Mm +uf +uf VJ VJ VJ VJ VJ VJ -VJ -VJ -VJ -Fp -Fp -Fp -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -10787,16 +11155,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -10807,10 +11165,6 @@ VJ VJ VJ VJ -ov -CT -CT -ov VJ VJ VJ @@ -10818,6 +11172,15 @@ VJ VJ VJ VJ +Uf +VJ +VJ +ov +CT +CT +ov +VJ +VJ VJ VJ VJ @@ -10833,6 +11196,11 @@ VJ VJ VJ VJ +wJ +VJ +MJ +gM +gM my Ox Ox @@ -10844,6 +11212,21 @@ Ox Ox Ox pG +gM +gM +Xv +uf +jQ +zp +zp +oE +oE +uf +uf +Mm +Mm +uf +uf VJ VJ VJ @@ -10851,22 +11234,7 @@ VJ VJ VJ VJ -VJ -VJ -Fp -Fp -Ox -Ox -Fp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -10981,16 +11349,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11001,6 +11359,16 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ +VJ CT rS rS @@ -11022,9 +11390,9 @@ VJ VJ VJ VJ +wJ VJ -VJ -RX +MJ gM gM my @@ -11038,22 +11406,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp +gM +gM +Xv +uf +Bx zp -Ox -Ox zp -Fp -VJ +oE +oE +zp +zp +oE +oE +zp +uf VJ VJ VJ @@ -11062,6 +11429,7 @@ VJ VJ VJ VJ +Uf VJ VJ VJ @@ -11175,16 +11543,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11195,6 +11553,16 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ +VJ CT rS rS @@ -11216,9 +11584,9 @@ VJ VJ VJ VJ +wJ VJ -VJ -RX +MJ gM gM my @@ -11232,22 +11600,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp +gM +gM +Xv +uf +Bx +zp zp oE oE +oE +oE +oE +oE zp -Fp -VJ +uf VJ VJ VJ @@ -11257,6 +11624,7 @@ VJ VJ VJ VJ +Uf VJ VJ VJ @@ -11264,10 +11632,10 @@ VJ VJ VJ VJ -Fp -Xi -Xi -Fp +ov +CT +CT +ov Ox Ox Ox @@ -11369,16 +11737,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11389,11 +11747,6 @@ VJ VJ VJ VJ -CT -rS -rS -CT -VJ VJ VJ VJ @@ -11401,8 +11754,13 @@ VJ VJ VJ VJ +Uf VJ VJ +CT +rS +rS +CT VJ VJ VJ @@ -11412,20 +11770,6 @@ VJ VJ VJ VJ -RX -gM -gM -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -11434,14 +11778,37 @@ VJ VJ VJ VJ +wJ VJ -Fp +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +uf +Bx +zp zp oE oE +oE +oE +oE +oE zp -Fp -VJ +uf VJ VJ VJ @@ -11452,16 +11819,17 @@ VJ VJ VJ VJ +Uf VJ VJ VJ VJ VJ VJ -Xi -Ox -Ox -Xi +CT +rS +rS +CT Ox Ox Ox @@ -11563,18 +11931,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ VJ VJ VJ @@ -11582,13 +11938,6 @@ VJ VJ VJ VJ -ov -ov -SU -SU -ov -ov -VJ VJ VJ VJ @@ -11599,27 +11948,22 @@ VJ VJ VJ VJ +Uf VJ +ov +ov +SU +SU +ov +ov +wJ +wJ VJ VJ VJ VJ VJ VJ -RX -gM -gM -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -11628,14 +11972,37 @@ VJ VJ VJ VJ +wJ VJ -Fp -zp +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +uf +AU +uf +uf oE oE zp -Fp -VJ +zp +zp +zp +zp +uf VJ VJ VJ @@ -11647,15 +12014,16 @@ VJ VJ VJ VJ +Uf VJ VJ VJ VJ VJ -Xi -Ox -Ox -Xi +CT +rS +rS +CT Ox Ox Ox @@ -11757,31 +12125,11 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ VJ VJ VJ VJ VJ -ov -XL -NG -NG -XL -ov VJ VJ VJ @@ -11794,26 +12142,21 @@ VJ VJ VJ VJ +Uf VJ +ov +XL +NG +NG +XL +ov +wJ +wJ VJ VJ VJ VJ VJ -RX -gM -gM -my -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -pG VJ VJ VJ @@ -11823,13 +12166,37 @@ VJ VJ VJ VJ -Fp +wJ +wJ +MJ +gM +gM +qQ +pV +pV +pV +pV +pV +pV +pV +pV +pV +WI +gM +gM +Xv +mr +XY +XL +uf +zz +tJ +uf zp -oE -oE zp -Fp -VJ +zp +zp +uf VJ VJ VJ @@ -11842,14 +12209,15 @@ VJ VJ VJ VJ +Uf VJ VJ VJ VJ -Xi -Ox -Ox -Xi +CT +rS +rS +CT Ox Ox Ox @@ -11951,16 +12319,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -11970,12 +12328,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -11991,10 +12361,8 @@ VJ VJ VJ VJ -VJ -VJ -VJ -RX +wJ +MJ gM gM my @@ -12008,21 +12376,21 @@ Ox Ox Ox pG -VJ -VJ -VJ -ov -ov -ov -ov -ov -ov -ov -ov -oD -oD -ov -ov +gM +gM +Xv +mr +qW +XL +XL +NG +NG +uf +uf +uf +uf +uf +uf ov ov ov @@ -12035,15 +12403,15 @@ ov ov ov ov +zE ov ov ov ov ov -Fp pq to -Fp +ov Ox Ox Ox @@ -12145,16 +12513,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -12164,12 +12522,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -12184,11 +12554,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -RX +wJ +wJ +Fp gM gM my @@ -12202,17 +12570,13 @@ uS uS uS uD -VJ -VJ -VJ +gM +gM +Xv ov XL XL XL -XL -XL -XL -XL NG NG XL @@ -12232,12 +12596,16 @@ XL XL XL XL +pp +zE +ne +XL XL ov qJ MQ HA -Xi +CT Ox Ox Ox @@ -12339,16 +12707,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -12358,12 +12716,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -12378,10 +12748,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ +wJ +wJ +ZD gM gM gM @@ -12396,9 +12765,8 @@ gM gM gM gM -VJ -VJ -VJ +gM +Xv ov XL xR @@ -12422,16 +12790,16 @@ NG NG NG NG -NG -NG -NG +UM +vI +lE NG NG zx pq XN HA -Xi +CT Ox Ox Ox @@ -12533,16 +12901,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox VJ VJ VJ @@ -12552,12 +12910,24 @@ VJ VJ VJ VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +Uf +VJ ov XL NG NG XL ov +wJ +wJ VJ VJ VJ @@ -12572,10 +12942,9 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ +wJ +wJ +ZD gM gM gM @@ -12590,9 +12959,8 @@ gM gM gM gM -VJ -VJ -VJ +gM +Xv ov XL xR @@ -12616,16 +12984,16 @@ NG NG NG NG +UM +vI +lE NG NG -NG -NG -NG -zx -Rp -dl -Sq -Xi +HM +MQ +SU +HA +CT Ox Ox Ox @@ -12727,33 +13095,9 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ VJ VJ VJ -ov -XL -NG -NG -XL -ov -VJ -VJ VJ VJ VJ @@ -12768,25 +13112,49 @@ VJ VJ VJ VJ +Uf VJ -VJ -NQ +ov +XL +NG +NG +XL +ov +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +Fp mw gM gM -gM +wz NQ -gM -gM -gM -gM -gM -gM -gM -gM -VJ -VJ -VJ +de +de +de +de +de +de +de +de +de +de +XQ ov XL xR @@ -12810,16 +13178,16 @@ XL XL XL XL -XL -XL -XL +SJ +Mo +Vo XL XL ov -iD -iD -iD -Fp +MQ +SU +HA +ov Ox Ox Ox @@ -12921,31 +13289,8 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ VJ VJ -ov -XL -NG -NG -XL -ov VJ VJ VJ @@ -12957,19 +13302,42 @@ VJ VJ VJ VJ -Hu -Hu VJ VJ VJ VJ +Uf VJ -Fp -Fp +ov +Sj +Qp +Qp +Sj +ov +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +wJ +ov +ov aw CU -Fp -Fp +ov +ov VJ VJ VJ @@ -13005,15 +13373,15 @@ Xz ov ov ov +zK ov ov ov ov +MQ +SU +HA ov -Fp -Fp -Fp -Fp Ox Ox Ox @@ -13113,35 +13481,8 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -ov -XL -NG -NG -XL -ov -VJ -VJ +Ox +Ox VJ VJ VJ @@ -13151,21 +13492,48 @@ VJ VJ VJ VJ -gj -Ke VJ VJ VJ VJ VJ -VR +ov +ov +ov +ov +ov +ov +XL +NG +NG +XL +KH +KH +KH +KH +KH +KH +KH +KH +Sj +Sj +Sj +KH +KH +KH +KH +KH +KH +KH +aQ +ov yU Jj aM Hk -VR -VJ +Sj VJ +mu VJ VJ VJ @@ -13181,33 +13549,33 @@ NG NG XL ov -wJ -wJ -wJ -wJ -Ao +nw +nw +nw +nw +xd LW -Ao -Ao -Ao -Ao -Ao +xd +xd +xd +xd +xd fU -wJ -wJ -Ao -wJ -wJ -wJ -wJ -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ +nw +nw +xd +nw +nw +nw +Jc +nw +nw +nw +ov +MQ +SU +HA +ov Ox Ox Ox @@ -13309,34 +13677,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -ov -XL -NG -NG -XL -ov -VJ -VJ -VJ VJ VJ VJ @@ -13351,13 +13691,41 @@ VJ VJ VJ VJ -VJ -VR +ov +Ou +VI +VI +VI +VI +TR +xR +xR +Vd +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +VI +TR +Zg +Sj AB -Hu +SU SH -wJ -Fp +Sc +ov Fp Fp Fp @@ -13375,33 +13743,33 @@ NG NG XL aQ -Ao -Ao -Ao -Ao -Ao +xd +xd +xd +xd +xd fU -wJ -wJ -wJ -wJ -Ao +nw +nw +nw +nw +xd LW -Ao -Ao -Ao -wJ -wJ -wJ -wJ -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ +xd +xd +xd +xd +xd +xd +oo +xd +xd +xd +aQ +MQ +SU +HA +CT Ox Ox Ox @@ -13503,35 +13871,6 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -ov -XL -NG -NG -XL -ov -VJ -VJ -VJ -VJ VJ VJ VJ @@ -13546,12 +13885,41 @@ VJ VJ VJ VJ -VR +ov +eR +rS +rS +rS +rS +Ae +xR +xR +eR +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS +Ae +Zg +Sj ES Jj ah qf -Fp +ov wJ wJ wJ @@ -13569,33 +13937,33 @@ NG NG XL ov -yN -tq -wJ -wJ -wJ +Np +OE +nw +nw +nw fU -wJ -wJ -wJ -wJ -wJ +nw +nw +nw +nw +nw fU -wJ -wJ -Ao -wJ -wJ -wJ -wJ -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ +nw +nw +xd +nw +fU +fU +ib +nw +nw +nw +ov +MQ +SU +HA +CT Ox Ox Ox @@ -13697,16 +14065,7 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox +VJ VJ VJ VJ @@ -13717,35 +14076,44 @@ VJ VJ VJ ov -XL -NG -NG -XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -Fp +ov +ov +ov +MX +Eb +Eb +Eb +Eb +nY +xR +xR +MX +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +Eb +nY +Zg +ov +ov Nd al -Fp -Fp +ov +ov wJ wJ wJ @@ -13763,33 +14131,33 @@ NG NG XL ov -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp -Fp +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT fU LW fU -fU -Fp -Fp -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ +fU +fU +fU +ib +ib +nw +ov +Rp +dl +Sq +CT Ox Ox Ox @@ -13891,16 +14259,7 @@ Ox Ox Ox Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Ox +VJ VJ VJ VJ @@ -13912,34 +14271,43 @@ VJ VJ ov XL +XL +XL +XL +XL +XL +XL +XL +XL +XL NG NG XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL Jl -oE -gU +NG +YL Jl -Fp +ov wJ wJ wJ @@ -13957,33 +14325,33 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ -Ao -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw +xd +nw +nw +nw +fU +fU +fU +ew +hT +mN +mN +RK +ov Ox Ox Ox @@ -14088,26 +14456,50 @@ VJ VJ VJ VJ -Ox -Ox -Ox -Ox -Ox -Ox -Ox -Fp -ov -ov -ov -ov -ov -ov -ov -ov +VJ +VJ +VJ +VJ +VJ +VJ +VJ ov XL NG NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +YL XL ov ov @@ -14122,62 +14514,38 @@ ov ov ov ov -ov -ov -ov -ov -ov -ov -ov XL NG -YL +NG XL ov +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw +xd +nw +nw +FT +FT +FT +zA +FT ov ov ov ov ov -ov -ov -ov -ov -ov -ov -ov -XL -NG -NG -XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ -Ao -wJ -wJ -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ Ox Ox Ox @@ -14284,46 +14652,46 @@ VJ VJ VJ VJ -Fp -Fp -Fp -Fp -Fp -Fp -XL -XL -XL -XL -XL -XL -XL -XL -XL +ov +ov +ov +ov +ov +ov XL NG NG -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG +NG NG NG XL @@ -14345,26 +14713,26 @@ NG NG XL ov +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw +xd +nw +nw +FT VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ -Ao -wJ -wJ -Fp -VJ -VJ +Uf VJ VJ VJ @@ -14478,46 +14846,46 @@ VJ VJ VJ VJ -Fp -zp -zp -zp -zp -zp +ov +XL +XL +XL +XL +XL XL NG NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL NG NG NG @@ -14539,25 +14907,25 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw XX -wJ -wJ -Fp -VJ +nw +nw +FT +Uf VJ VJ VJ @@ -14672,38 +15040,7 @@ VJ VJ VJ VJ -VJ -oE -oE -oE -oE -oE -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG -NG +ov NG NG NG @@ -14712,6 +15049,37 @@ NG NG NG NG +XL +KH +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +ud +KH +KH +KH +XL NG NG NG @@ -14733,25 +15101,25 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -wJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT +nw XX -wJ +nw If -Fp -VJ +FT +Uf VJ VJ VJ @@ -14866,86 +15234,86 @@ VJ VJ VJ VJ -VJ -oE -oE -oE -oE -oE +ov +NG NG NG NG -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL -XL NG NG -XL -XL -XL -XL -XL NG NG XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +Sc +Sc +KH XL +NG +NG XL XL XL XL XL -XL -XL -XL -XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -Fp -Fp -Fp -Fp -Fp -VJ +NG +NG +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +XL +ov +nw +nw +nw +nw +nw +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Uf VJ VJ VJ @@ -15060,42 +15428,42 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE +ov +XL +NG +NG +NG +NG NG NG NG XL -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov -ov +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS ov ov ov @@ -15121,6 +15489,12 @@ ov ov ov ov +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15132,13 +15506,7 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -15254,57 +15622,73 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +MM +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15315,23 +15699,7 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Uf VJ VJ VJ @@ -15448,73 +15816,73 @@ gM gM gM gM -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -zp -oE -oE -zp -oE -zp +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +XL +NG +NG +XL +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15631,46 +15999,10 @@ NT NT NT NT -NT -Ox -Ox -Ox -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +NT +Ox +Ox +Ox VJ VJ VJ @@ -15678,37 +16010,73 @@ VJ VJ VJ VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -15836,73 +16204,73 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -Fp -Fp -zp -oE -oE -zp -Fp -Fp -Fp +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +ov +XL +NG +NG +XL +ov +nw +nw +nw +nw +nw +nw +nw +FT +FT +FT +FT +FT +FT +FT +FT +FT VJ VJ VJ @@ -16030,65 +16398,65 @@ VJ VJ VJ VJ -Fp -zp -oE -oE -oE -oE -oE -oE -oE -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +NG +NG +NG +NG +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16191,68 +16559,32 @@ NT NT NT NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -NT -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE -oE -zp -zp -zp -zp -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT +NT VJ VJ VJ @@ -16260,29 +16592,65 @@ VJ VJ VJ VJ -Fp -zp -oE -zp -oE -oE -zp -oE -zp +ov +XL +NG +NG +NG +XL +XL +XL +XL +XL +KH +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +PS +ov +XL +NG +XL +NG +NG +XL +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16418,65 +16786,65 @@ Ox Ox VJ VJ -Fp -zp -oE -oE -oE -Xi -Fp -Fp -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Fp -zp -oE -oE +ov +XL +NG +NG +NG +CT +ov +ov +ov +ov +ov +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16612,16 +16980,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -zp -zp -zp -Fp -VJ +CT +XL +NG +NG +NG +XL +XL +XL +ov +ov VJ VJ VJ @@ -16648,29 +17016,29 @@ VJ VJ VJ VJ -Fp -Fp -Fp -zp -oE -oE -zp -Fp -Fp -Fp +ov +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +ov +XL +NG +NG +XL +ov +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -16806,16 +17174,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -16842,29 +17210,29 @@ VJ VJ VJ VJ -Fp -zp -oE -oE +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17000,16 +17368,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -17036,29 +17404,29 @@ VJ VJ VJ VJ -Fp -zp -oE -zp -oE -oE -zp -oE -zp +ov +XL +NG +XL +NG +NG +XL +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17194,16 +17562,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -17230,29 +17598,29 @@ VJ VJ VJ VJ -Fp -zp -oE -oE +ov +XL +NG +NG qo KG -oE -oE -zp +NG +NG +XL Hb XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17388,16 +17756,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -Fp -VJ +CT +XL +NG +NG +NG +NG +NG +NG +ov +ov VJ VJ VJ @@ -17424,29 +17792,29 @@ VJ VJ VJ VJ -Fp -Fp -zp -zp -zp -zp -zp -zp -Fp -Fp +ov +ov +XL +XL +XL +XL +XL +XL +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17582,16 +17950,16 @@ NT Ox VJ VJ -Fp -zp -zp -zp -zp -zp -oE -oE -Fp -VJ +ov +XL +XL +XL +XL +XL +NG +NG +ov +ov VJ VJ VJ @@ -17618,29 +17986,29 @@ VJ VJ VJ VJ -Fp -Fp -Fp -Fp -Fp -Fp +ov +ov +ov +ov +ov +ov wQ -Fp -Fp -Fp +ov +ov +ov XL NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17776,17 +18144,16 @@ NT Ox VJ VJ -kd -JQ -JQ -JQ -kd -zp -oE -oE -zp -VJ -VJ +Om +Sj +Sj +Sj +Om +XL +NG +NG +XL +ov VJ VJ VJ @@ -17813,6 +18180,7 @@ VJ VJ VJ VJ +KO wJ wJ wJ @@ -17827,14 +18195,14 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +nw +nw +nw +nw +nw +nw +nw +FT VJ VJ VJ @@ -17970,17 +18338,16 @@ NT Ox VJ VJ -JQ -Ox -Ox -Ox -JQ -zp -oE -oE -zp -VJ -VJ +sj +rS +rS +rS +sj +XL +NG +NG +XL +ov VJ VJ VJ @@ -18007,6 +18374,7 @@ VJ VJ VJ VJ +KO wJ wJ wJ @@ -18021,21 +18389,21 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +jm +jm +jm +jm +jm jm jm jm -pZ -pZ -pZ -pZ -pZ jm jm jm @@ -18164,17 +18532,16 @@ NT Ox VJ VJ -JQ -Ox -Ox -Ox -zp -zp -oE -oE -zp -VJ -VJ +sj +rS +rS +rS +Bb +XL +NG +NG +XL +ov VJ VJ VJ @@ -18201,6 +18568,7 @@ VJ VJ VJ VJ +KO wJ wJ wJ @@ -18215,13 +18583,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -18352,28 +18720,22 @@ NT NT NT NT -NT -NT -NT -Ox -VJ -VJ -JQ -Ox -Ox -Ox -zp -zp -oE -oE -zp -VJ -VJ -VJ -VJ -VJ +NT +NT +NT +Ox VJ VJ +sj +rS +rS +rS +Bb +XL +NG +NG +XL +ov VJ VJ VJ @@ -18400,6 +18762,12 @@ VJ VJ VJ VJ +KO +KO +KO +KO +KO +KO VO VO jS @@ -18409,13 +18777,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -18427,10 +18795,10 @@ pZ pZ pZ jm -Fp -Fp -Fp -Fp +eW +eW +eW +eW VJ VJ VJ @@ -18552,17 +18920,16 @@ NT Ox VJ VJ -JQ -Ox -Ox -Ox -JQ -zp -oE -oE -zp -VJ -VJ +sj +rS +rS +rS +sj +XL +NG +NG +XL +ov VJ VJ VJ @@ -18589,6 +18956,7 @@ VJ VJ VJ VJ +KO VJ VJ VJ @@ -18603,28 +18971,28 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ pZ jZ -Ox +Kx FO pZ pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -18746,17 +19114,16 @@ NT Ox VJ VJ -kd -JQ -JQ -JQ -kd -zp -oE -oE -zp -VJ -VJ +Om +Sj +Sj +Sj +Om +XL +NG +NG +XL +ov VJ VJ VJ @@ -18783,6 +19150,7 @@ VJ VJ VJ VJ +KO VJ VJ VJ @@ -18797,13 +19165,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -18815,10 +19183,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -18940,23 +19308,16 @@ NT Ox VJ VJ -Fp -zp -zp -zp -zp -zp -oE -oE -Fp -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +XL +XL +XL +XL +XL +NG +NG +ov +ov VJ VJ VJ @@ -18982,6 +19343,13 @@ VJ VJ VJ VJ +Lf +Lf +Lf +Lf +Lf +Lf +KO VO au hD @@ -18991,13 +19359,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19009,10 +19377,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -19134,21 +19502,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -Fp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +ov +ov VJ VJ VJ @@ -19174,7 +19537,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf KO VO JX @@ -19185,13 +19553,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19203,10 +19571,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -19328,21 +19696,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -19368,7 +19731,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf wJ wJ gA @@ -19379,13 +19747,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19397,10 +19765,10 @@ OM pZ pZ jm -wJ -wJ -wJ -Fp +pF +pF +pF +eW VJ VJ VJ @@ -19522,21 +19890,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -19562,7 +19925,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf wJ wJ wJ @@ -19573,13 +19941,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19716,21 +20084,16 @@ NT Ox VJ VJ -Xi -zp -oE -oE -oE -oE -oE -oE -zp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +NG +NG +NG +NG +NG +NG +XL +ov VJ VJ VJ @@ -19756,7 +20119,12 @@ VJ VJ VJ VJ -KO +Lf +nv +Il +Il +nv +Lf wJ wJ wJ @@ -19767,13 +20135,13 @@ NG NG XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19784,10 +20152,10 @@ OM OM pZ pZ -fT -Ox -Ox -Ox +JQ +Kx +Kx +Kx JQ VJ VJ @@ -19910,21 +20278,16 @@ NT Ox VJ VJ -Xi -zp -zp -zp -zp -zp -zp -zp -Fp -VJ -VJ -VJ -VJ -VJ -VJ +CT +XL +XL +XL +XL +XL +XL +XL +ov +ov VJ VJ VJ @@ -19950,24 +20313,29 @@ VJ VJ VJ VJ -KO -KO +Lf +nv +Il +Il +nv +Lf +Lf lB -KO -KO -KO -KO -NG -NG +Lf +Lf +Lf +Lf +Qp +cL ov ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -19979,9 +20347,9 @@ OM pZ pZ fT -Ox -Ox -Ox +Kx +Kx +Kx JQ VJ VJ @@ -20104,20 +20472,15 @@ NT NT VJ VJ -Fp -Xi -Xi -Xi -Xi -Xi -Fp -Fp -Fp -VJ -VJ -VJ -VJ -VJ +ov +CT +CT +CT +CT +CT +ov +ov +ov VJ VJ VJ @@ -20144,24 +20507,29 @@ VJ VJ VJ VJ -Ti -Ti -Ti -Ti -Ti +Lf +nv +Il +Il +nv +nv +nv +nv +nv +nv fD -KO +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF jm pZ pZ @@ -20172,10 +20540,10 @@ pZ pZ pZ pZ -fT -Ox -Ox -Ox +VR +Kx +Kx +Kx JQ VJ VJ @@ -20333,29 +20701,29 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il Ym Ym -KO +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF jm jm jm @@ -20527,30 +20895,30 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il Nu Nu -KO -NG +Lf +pl NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -20721,30 +21089,30 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -Ti -Hu -Hu -Ti -Ti +Lf +nv +nv +On +nv +nv +Il +Il +On +nv fD -KO +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -20914,31 +21282,31 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO -KO +Lf +Lf +Lf +Lf +Lf +Lf xY xY -KO -KO -KO -KO +Lf +Lf +Lf +Lf +Lf NG NG ov ov ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -21108,17 +21476,17 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO +Lf +nv +nv +nv +Lf fD -Hu -Hu +Il +Il fD -KO +Lf +Lf Wy XL NG @@ -21126,13 +21494,13 @@ NG pA iE ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +pF +pF +eW VJ VJ VJ @@ -21302,16 +21670,16 @@ VJ VJ VJ VJ -VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il +Il Pr NG NG @@ -21320,13 +21688,13 @@ NG pA iE ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +ov +ov +pF +pF +pF +pF +eW VJ VJ VJ @@ -21496,31 +21864,31 @@ VJ VJ VJ VJ -VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu +Lf +nv +Il +Il +Il +Il +Il +Il +Il +Il Pr NG NG NG NG -XL -XL +NG +NG +NG +NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -21690,31 +22058,31 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO +Lf +nv +nv +nv +Lf fD -Hu -Hu +Il +Il fD -KO +Lf +Lf Wy XL NG -NG -XL -XL -ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +bM +NG +NG +NG +NG +ov +pF +pF +pF +pF +eW VJ VJ VJ @@ -21884,31 +22252,31 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -KO -KO +Lf +Lf +Lf +Lf +Lf +Lf xY xY -KO -KO -KO -KO +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf NG NG -XL -XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22083,26 +22451,26 @@ VJ VJ VJ VJ -VJ -KO -Hu -Hu -KO -wJ -wJ -KO +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf NG NG -XL -XL ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22277,26 +22645,26 @@ VJ VJ VJ VJ -VJ -KO -Hu -Hu -KO -wJ -wJ -KO -NG -NG +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22471,26 +22839,26 @@ VJ VJ VJ VJ -VJ -VJ -Hu -Hu -KO -wJ -wJ -KO -NG -NG +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf NG NG ov -VJ -VJ -VJ -VJ -VJ -VJ -VJ +pF +pF +pF +pF +eW VJ VJ VJ @@ -22665,26 +23033,26 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -KO -wJ -wJ -KO -KO -KO -KO -KO -KO -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Lf +Il +Il +Lf +Ea +Ea +Ea +Ea +Ea +Ea +Ea +Lf +bI +bI +Lf +pF +pF +pF +pF +eW VJ VJ VJ @@ -22859,26 +23227,26 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -KO -KO -KO -KO -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +Lf +Il +Il +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Il +Il +Lf +eW +eW +eW +eW +eW VJ VJ VJ @@ -23053,21 +23421,21 @@ VJ VJ VJ VJ -VJ -OM -OM -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -OM -OM -VJ +Lf +kE +kE +Il +Il +Il +Il +Il +Il +Il +Il +Il +kE +kE +Lf VJ VJ VJ @@ -23247,21 +23615,21 @@ VJ VJ VJ VJ -VJ -OM -OM -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -OM -OM -VJ +Lf +kE +kE +Il +Il +Il +Il +Il +Il +Il +Il +Il +kE +kE +Lf VJ VJ VJ @@ -23441,21 +23809,21 @@ VJ VJ VJ VJ -VJ -OM -OM -VJ -VJ -KO -KO -KO -KO -KO -VJ -VJ -OM -OM -VJ +Lf +kE +kE +Il +Il +Il +Il +Il +Il +Il +Il +Il +kE +kE +Lf VJ VJ VJ @@ -23635,21 +24003,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -VJ +Lf +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Lf VJ VJ VJ @@ -23829,21 +24197,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -Hu -Hu -VJ +Lf +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Il +Lf VJ VJ VJ @@ -24023,21 +24391,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -OM -OM -OM -OM -OM -OM -OM -OM -OM -Hu -Hu -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -24217,21 +24585,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -OM -OM -OM -OM -OM -OM -OM -OM -OM -Hu -Hu -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -24411,21 +24779,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -OM -OM -Hu -Hu -Hu -Hu -Hu -OM -OM -Hu -Hu -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -24605,26 +24973,26 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ -VJ -VJ -VJ -VJ -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -24799,21 +25167,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf VJ VJ VJ @@ -24993,21 +25361,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf VJ VJ VJ @@ -25187,21 +25555,21 @@ VJ VJ VJ VJ -VJ -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Hu -VJ +Lf +Il +Il +yJ +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Il +Lf VJ VJ VJ @@ -25381,21 +25749,21 @@ VJ VJ VJ VJ -VJ -VJ -VJ -OM -OM -Hu -Hu -Hu -Hu -Hu -OM -OM -VJ -VJ -VJ +Lf +Il +Il +kE +kE +kE +Lf +Lf +Lf +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -25575,21 +25943,21 @@ VJ VJ VJ VJ -VJ -VJ -VJ -OM -OM -OM -OM -OM -OM -OM -OM -OM -VJ -VJ -VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ VJ @@ -25769,21 +26137,21 @@ VJ VJ VJ VJ -VJ -VJ -VJ -OM -OM -OM -OM -OM -OM -OM -OM -OM -VJ -VJ -VJ +Lf +Il +Lf +kE +kE +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Lf VJ VJ VJ @@ -25959,28 +26327,28 @@ Ox Ox Ox Ox -VJ -VJ -VJ -VJ -VJ -VJ -KO -wJ -wJ -wJ -Hu -Hu -Hu -wJ -wJ -wJ KO VJ VJ VJ +Lf +Il +Lf +Lf +Lf +Lf +kE +kE +kE +Lf +Lf +Lf +Lf +Il +Lf VJ VJ +KO Ox Ox Ox @@ -26153,28 +26521,28 @@ Ox Ox Ox Ox -VJ -VJ KO VJ -VJ -VJ -KO -OM -OM -OM -Hu -Hu -Hu -OM -OM -OM KO VJ +Lf +Il +Lf +kE +kE +kE +kE +kE +kE +kE +kE +kE +Lf +Il +Lf VJ VJ -VJ -VJ +KO Ox Ox Ox @@ -26347,28 +26715,28 @@ Ox Ox Ox Ox -VJ -VJ KO VJ -VJ -VJ -KO -OM -OM -OM -Hu -Hu -Hu -OM -OM -OM KO VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ VJ -VJ -VJ +KO Ox Ox Ox @@ -26541,28 +26909,28 @@ Ox Ox Ox Ox -VJ -VJ KO -VJ -VJ -VJ KO -OM -OM -OM -Hu -Hu -Hu -OM -OM -OM KO VJ +Lf +Il +Il +kE +kE +kE +kE +kE +kE +kE +kE +kE +Il +Il +Lf VJ -VJ -VJ -VJ +KO +KO Ox Ox Ox @@ -26739,23 +27107,23 @@ Ox Ox KO VJ -VJ -VJ -KO +Lf +Il +Il jR jR jR -Hu -Hu -Hu +Il +Il +Il jR jR jR -KO -VJ -VJ -VJ +Lf +Il +Lf VJ +KO Ox Ox NT @@ -26931,25 +27299,25 @@ Ox NT Ox Ox -VJ -VJ -VJ -VJ KO -Ti -Ti -Ti +KO +Lf +Lf +Lf +nv +nv +nv WT -Hu -Hu -Ti -Ti -Ti +Il +Il +nv +nv +nv +Lf +Lf +Lf +KO KO -VJ -VJ -VJ -VJ Ox Ox NT @@ -27129,17 +27497,17 @@ Ox Ox Ox Ox -Xi -Ti -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Ti -Xi +DX +nv +Il +Il +Il +Il +Il +Il +Il +nv +DX Ox Ox Ox @@ -27323,17 +27691,17 @@ Ox Ox Ox Ox -Xi -Ti -Hu -Hu -Hu -Hu -Hu -Hu -Hu -Ti -Xi +DX +nv +Il +Il +Il +Il +Il +Il +Il +nv +DX Ox Ox Ox @@ -27517,17 +27885,17 @@ Ox Ox Ox Ox -Xi -Ti -Hu -Hu -OM -OM -OM -Hu -Ox -Ox -Xi +DX +nv +Il +Il +kE +kE +kE +Il +FV +yE +DX Ox Ox Ox @@ -27711,17 +28079,17 @@ Ox Ox Ox Ox -KO -Ti -Hu -Hu -OM -OM -OM -Hu -Ox -Ox -KO +Lf +nv +Il +Il +kE +kE +kE +Il +YM +MD +Lf Ox Ox Ox @@ -27906,15 +28274,15 @@ Ox Ox VJ WW -Ti -Ti -Ti -OM -OM -OM -Ti -Ti -Ti +nv +nv +nv +kE +kE +kE +nv +nv +nv WW VJ Ox @@ -28101,13 +28469,13 @@ Ox VJ WW WW -Ti -Ti -Ti -Ti -Ti -Ti -Ti +nv +nv +nv +nv +nv +nv +nv WW WW VJ @@ -28296,11 +28664,11 @@ VJ VJ WW ih -KO +Lf ih ih ih -KO +Lf ih WW VJ diff --git a/maps/euthenia/levels/deck1.dmm b/maps/euthenia/levels/deck1.dmm index 5e91da2e00..4712a295e6 100644 --- a/maps/euthenia/levels/deck1.dmm +++ b/maps/euthenia/levels/deck1.dmm @@ -1,4 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aav" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/reinforced, +/area/security/tactical) "aax" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -30,10 +34,18 @@ /obj/machinery/power/solar_control, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) -"acO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/space) +"acq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "acZ" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -51,6 +63,13 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_8) +"adB" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "adC" = ( /obj/machinery/door/airlock/command{ id_tag = "captaindoor"; @@ -70,12 +89,21 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"aeM" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +"aeH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "aeO" = ( /obj/structure/railing{ dir = 1 @@ -121,6 +149,15 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) +"agF" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/shower{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "agL" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -161,6 +198,17 @@ "aiY" = ( /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora) +"ajH" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1/fore) +"ajP" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "ajS" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -172,18 +220,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) -"ajY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "akc" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 1 @@ -213,6 +249,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) +"akH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"akR" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "akX" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 @@ -261,16 +306,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) -"alN" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/door/airlock/glass/research{ - name = "Fighter Bay"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) "alR" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ @@ -328,13 +363,47 @@ /obj/machinery/door/window/brigdoor/southright, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) +"anf" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"anl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science"; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "ano" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery_hallway) +"anp" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "anH" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "anX" = ( /turf/simulated/floor/tiled/steel_ridged, @@ -360,10 +429,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) -"apA" = ( -/obj/structure/catwalk, -/turf/simulated/open, -/area/space) "apD" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -428,6 +493,22 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"atW" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "auP" = ( /obj/machinery/air_alarm{ pixel_y = 30 @@ -445,29 +526,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"auW" = ( -/obj/effect/floor_decal/industrial/halfstair, -/turf/simulated/floor/tiled, -/area/space) -"avn" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"avz" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "avO" = ( /obj/structure/table/hardwoodtable, /obj/item/stamp/denied{ @@ -483,11 +541,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"axd" = ( -/obj/structure/railing, -/obj/structure/window/reinforced, -/turf/simulated/open, -/area/space) "axh" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -500,6 +553,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck1) +"axU" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "ayi" = ( /obj/machinery/button/remote/airlock{ id = "dorm6"; @@ -532,25 +592,14 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"azc" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay emergency access door."; - id = "MedbayEmergency"; - name = "Door Switch"; - pixel_x = -24; - pixel_y = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +"azw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/bar) "azB" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /turf/simulated/floor/carpet/oracarpet, @@ -573,6 +622,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/solars) +"aAR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "aBe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -580,7 +635,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "aBA" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -592,20 +647,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"aBL" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/beige, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "aBR" = ( /turf/simulated/wall/r_wall, /area/space) +"aCm" = ( +/obj/structure/cable/green, +/obj/machinery/power/solar, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "aCV" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck1) +"aDs" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "kitchen-c"; + name = "Kitchen Service Shutters" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/kitchen) "aDO" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 @@ -621,14 +685,8 @@ "aEg" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) -"aEl" = ( -/obj/machinery/atmospherics/component/unary/engine/biggest{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "aEt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -658,6 +716,12 @@ /obj/random/bedsheet, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) +"aFP" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck1) "aGB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -679,6 +743,18 @@ /obj/item/storage/box/donut, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"aHo" = ( +/obj/machinery/door/airlock/glass/security{ + name = "Locker Room"; + req_one_access = list(2) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/security/security_lockerroom) "aHx" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -694,6 +770,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"aJv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "aJB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -719,32 +800,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"aKS" = ( -/obj/spawner/window/reinforced/full/firelocks, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) "aLc" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck1) -"aMO" = ( -/obj/machinery/button/remote/airlock{ - id = "bathroomlock100"; - name = "Bathroom Lock"; - pixel_x = -20; - pixel_y = -20; - specialfunctions = 4 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/white, -/area/space) "aNp" = ( /obj/structure/bed/double/padded, /obj/random/bedsheet/double, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"aNE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"aNW" = ( +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/main_map/maintenance/atmospheric_substation/medical) "aNY" = ( /obj/structure/sign/directions/evac{ dir = 1; @@ -752,20 +827,20 @@ }, /turf/simulated/wall, /area/main_map/hallway/deck1) -"aOe" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) +"aOJ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "aOO" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/mechbay) -"aPE" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/space) "aQa" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) @@ -777,21 +852,16 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"aRn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"aRg" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/lattice, +/obj/structure/sign/deck1{ + pixel_y = -32 }, -/turf/simulated/floor/wood, -/area/bridge/hallway) +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "aRD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -813,6 +883,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) +"aRW" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) +"aSr" = ( +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "aSs" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -831,7 +914,7 @@ pixel_y = -26; specialfunctions = 4 }, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -864,12 +947,6 @@ /obj/structure/closet/lawcloset, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officeb) -"aVt" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "aVu" = ( /obj/structure/undies_wardrobe, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -879,16 +956,10 @@ /area/crew_quarters/captain) "aWt" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 27 }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) -"aXw" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/wall/prepainted/civilian, -/area/main_map/maintenance/deck_one) "aXK" = ( /obj/machinery/computer/med_data/laptop, /obj/structure/table/reinforced, @@ -915,6 +986,18 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) +"aYP" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"aZi" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rift/station/fighter_bay/hangar) "aZm" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/red/border, @@ -934,10 +1017,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"bak" = ( -/obj/machinery/computer/timeclock/premade/west, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) "bat" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -961,13 +1040,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) -"bdb" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "bdd" = ( /obj/structure/bed/chair{ dir = 4 @@ -983,14 +1055,12 @@ "bdQ" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/maintenance/security/port) -"beR" = ( -/obj/machinery/door/airlock{ - name = "Internal Affairs"; - req_access = list(38) +"bel" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officea) +/turf/simulated/floor/glass/reinforced, +/area/tether/surfacebase/security/hallway) "bfr" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -999,16 +1069,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"bgk" = ( -/obj/structure/bed/chair/comfy/purp{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +"bgf" = ( +/obj/structure/bed/chair/comfy/brown{ dir = 1 }, -/mob/living/simple_mob/humanoid/clown, +/obj/landmark/spawnpoint/job/assistant, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_5) +/area/crew_quarters/recreation_area) +"bgq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced, +/area/security/tactical) "bia" = ( /obj/structure/table/steel, /obj/item/cell/device/weapon{ @@ -1025,12 +1108,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) -"biS" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "bja" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck" @@ -1047,6 +1124,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) +"bjM" = ( +/obj/machinery/iv_drip, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "bjV" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ @@ -1063,24 +1144,20 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"bkw" = ( -/obj/structure/sink/kitchen{ - dir = 8; - name = "sink"; - pixel_x = 13 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) -"bkx" = ( +"bkH" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/shuttle_control/emergency, +/turf/simulated/floor/tiled/steel_grid, +/area/space) +"bkY" = ( /obj/structure/railing{ - dir = 4 + dir = 1 }, /obj/structure/railing{ dir = 8 }, -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "bla" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -1107,12 +1184,69 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora) +"blP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"blY" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"bmu" = ( +/obj/machinery/door/window/westright{ + dir = 4; + name = "Bar"; + req_access = list(25); + req_one_access = list(25) + }, +/obj/machinery/door/window/eastleft{ + dir = 8; + name = "Kitchen"; + req_one_access = list(28) + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bmy" = ( /obj/structure/railing/grey{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"bmI" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "bmJ" = ( /obj/effect/floor_decal/corner/paleblue/bordercee{ dir = 1 @@ -1148,6 +1282,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"boO" = ( +/obj/machinery/holopad, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/lino, +/area/security/detectives_office) "bph" = ( /obj/machinery/requests_console/preset/security{ pixel_y = 30 @@ -1199,6 +1339,36 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"brn" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_6) +"brK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/junction/flipped{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"brX" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/obj/structure/table/standard, +/obj/random/soap, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "bsP" = ( /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 @@ -1229,9 +1399,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) -"btn" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/space) +"bts" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "buO" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -1259,27 +1432,22 @@ /obj/item/bodybag/cryobag, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"bve" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) "bvn" = ( /obj/effect/floor_decal/corner/white/border{ dir = 9 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_2) -"bvw" = ( -/obj/structure/bed/chair/comfy/blue, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_8) +"bvW" = ( +/obj/machinery/door/airlock/engineering{ + name = "Hangar Substation" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) +"bvZ" = ( +/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck1) "bwN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1331,6 +1499,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"bAg" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "bAX" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 8 @@ -1348,36 +1523,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) -"bBH" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck1/a) -"bBN" = ( -/obj/machinery/door/blast/regular{ - dir = 8; - id = "armorytactical"; - name = "Tactical Armory Access" - }, -/turf/simulated/floor/reinforced, -/area/security/tactical) -"bCn" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/space) -"bCq" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/reinforced/airless, -/area/space) "bDO" = ( /obj/structure/grille, /obj/structure/girder/reinforced, @@ -1386,12 +1531,6 @@ "bEp" = ( /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"bFy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) "bFR" = ( /obj/machinery/door/airlock/engineering{ name = "Solars"; @@ -1400,12 +1539,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) -"bFU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) "bGk" = ( /obj/structure/table/steel, /obj/item/folder/red, @@ -1440,6 +1573,19 @@ /obj/item/clothing/mask/gas/half, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) +"bHe" = ( +/obj/machinery/door/airlock/glass/security/polarized{ + id_tag = "detdoor"; + id_tint = "det_office"; + name = "Detective's Office"; + req_access = list(4) + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "bHp" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Elevator Shaft Access"; @@ -1477,15 +1623,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_3) -"bLa" = ( -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "bLn" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1502,20 +1639,45 @@ "bLI" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"bLP" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "bLT" = ( /turf/simulated/floor/tiled/white, /area/medical/surgery2) -"bMX" = ( -/obj/structure/railing{ - dir = 1 +"bMn" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 4; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 }, -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/medical{ + dir = 8; + id_tag = "MedbayEmergency"; + name = "Medbay Emergency Access"; + req_one_access = list(5) + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "bNd" = ( /obj/structure/table/rack, /obj/item/tank/jetpack/oxygen, @@ -1524,18 +1686,21 @@ /obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) -"bNz" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +"bNE" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) -"bNS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) +"bOl" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bOP" = ( /obj/structure/table/steel_reinforced, /obj/item/reagent_containers/blood/OMinus, @@ -1567,6 +1732,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) +"bPh" = ( +/obj/machinery/button/windowtint{ + id = "det_office"; + pixel_x = -24; + pixel_y = 24 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "bPn" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 @@ -1596,6 +1773,13 @@ "bQH" = ( /turf/simulated/floor/carpet/arcadecarpet, /area/main_map/maintenance/deck_one/port) +"bRr" = ( +/obj/structure/closet/crate/biohazard, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/surgery) "bRU" = ( /obj/structure/table/standard, /obj/item/stack/cable_coil, @@ -1610,6 +1794,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"bSb" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "bTt" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/red, @@ -1740,6 +1930,12 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"bYo" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "bYD" = ( /obj/structure/railing{ dir = 8 @@ -1749,26 +1945,33 @@ }, /turf/simulated/open, /area/crew_quarters/recreation_area) +"bYV" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "armorylight"; + name = "Light Armory Acccess" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/security/armoury) "bZY" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor/hole, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"cab" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1) "cal" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) -"cam" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) "cbe" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -1776,13 +1979,17 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "cbf" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/Hangar_bay/deck1/a) +"cbZ" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "ccE" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -1791,50 +1998,81 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, /area/medical/medbay) -"cee" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"cdY" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-8" }, +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) +"cex" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"ceP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/hallway) -"ceY" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officeb) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "cfT" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/hallway/deck1) -"chI" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-8" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" +"cgX" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"chn" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 9 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass/medical, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"chC" = ( +/obj/machinery/turnstile/entry{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"chG" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "chW" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -1851,19 +2089,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"ciA" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/starboard) -"cjx" = ( -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Fighter Bay Maintenance"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/space) "cjB" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -1890,6 +2115,20 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"cko" = ( +/obj/machinery/conveyor_switch/oneway{ + pixel_y = 14 + }, +/obj/map_helper/conveyor/lever{ + id_tag = "_mobile_mining_interior"; + name = "Ore Processing" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) +"ckq" = ( +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "ckx" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/armor/vest/wolftaur{ @@ -1931,6 +2170,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"clv" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "clX" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -1957,30 +2206,31 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) +"cmQ" = ( +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 4; + name = "Fighter Hangar"; + req_one_access = list(1,19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "cmR" = ( /turf/simulated/floor/crystal, /area/space) -"cnj" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/recreation_area) -"cnu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"cnb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) +/turf/simulated/floor/lino, +/area/security/detectives_office) "cnv" = ( /obj/machinery/door/window/eastleft{ dir = 1 }, /obj/structure/cable/green, /obj/effect/floor_decal/steeldecal/steel_decals_central6, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/monotile, /area/security/forensics) "cnB" = ( @@ -2010,6 +2260,13 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) +"cnV" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/briefingroom) "cos" = ( /obj/structure/table/steel, /obj/item/folder/red, @@ -2027,15 +2284,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_2) -"coX" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 +"cpB" = ( +/obj/machinery/conveyor, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) "cpF" = ( /obj/structure/toilet{ dir = 4 @@ -2052,18 +2308,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) -"cqQ" = ( -/obj/structure/bed/chair/comfy/purp, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24; - pixel_y = -5 +"cqI" = ( +/obj/machinery/door/blast/regular{ + dir = 4 }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_7) +/turf/simulated/floor/reinforced, +/area/main_map/Hangar_bay/deck1/a) +"crA" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) +"crH" = ( +/obj/machinery/cryopod/robot/door/shuttle, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck1) "csa" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -2091,6 +2355,22 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/tether/surfacebase/security/lobby) +"cuD" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "cuX" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing/grey{ @@ -2117,6 +2397,13 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) +"cvu" = ( +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "cvU" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -2172,6 +2459,38 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/tether/surfacebase/security/iaa/officea) +"cyz" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"cyF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/security/armoury) +"cyI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/bar) "cyQ" = ( /obj/machinery/light_switch{ pixel_x = -9; @@ -2208,7 +2527,7 @@ /obj/fiftyspawner/glass, /obj/fiftyspawner/glass, /turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) +/area/space) "cAw" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/medical/medbay_emt_bay) @@ -2228,33 +2547,13 @@ /obj/machinery/papershredder, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"cBJ" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass/security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "cBZ" = ( /turf/simulated/wall/r_wall, /area/security/riot_control) +"cCn" = ( +/obj/item/chess/bknight, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "cEi" = ( /obj/structure/table/steel, /obj/item/tool/crowbar, @@ -2293,36 +2592,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"cFn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/bar) "cFD" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"cGb" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"cGd" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, -/area/medical/medbay) "cGk" = ( /obj/machinery/button/remote/airlock{ id = "dorm1"; @@ -2356,7 +2628,7 @@ "cHK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) "cHM" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -2369,12 +2641,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_2) -"cIK" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 +"cJK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/light/no_nightshift{ + dir = 1 }, /turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/bridge/hallway) "cKt" = ( /obj/structure/railing, /turf/simulated/open, @@ -2393,13 +2666,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"cNl" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/space) "cNI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -2410,18 +2676,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/warden) -"cNQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "kitchen-c"; - layer = 3.3; - name = "Kitchen Service Shutters" +"cOg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/crew_quarters/kitchen) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "cOt" = ( /obj/structure/closet/wardrobe, /turf/simulated/floor/wood, @@ -2435,6 +2698,18 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_6) +"cPk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"cPn" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "cPo" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) @@ -2450,15 +2725,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"cPY" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/port) "cQb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"cQj" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "cQx" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -2483,6 +2758,12 @@ /obj/effect/floor_decal/corner/blue/bordercorner, /turf/simulated/floor/tiled/white, /area/medical/reception) +"cRj" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "cRE" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -2504,6 +2785,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"cSk" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "cSq" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/portables_connector{ @@ -2511,6 +2799,18 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"cSD" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "cTQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2562,16 +2862,36 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/aft/starboard) +"cVt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/structure/closet/l3closet/scientist/double, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "cWf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"cWt" = ( +/turf/simulated/wall/r_wall, +/area/rift/station/fighter_bay/hangar) "cWG" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing, /turf/simulated/floor/plating, /area/medical/medbay) +"cXs" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/delivery) "cXH" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -2579,10 +2899,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) -"cXP" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1/fore) "cZb" = ( /obj/structure/railing{ dir = 1 @@ -2595,13 +2911,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_one) -"cZI" = ( -/obj/structure/sign/directions/evac{ - dir = 1; - pixel_y = 10 - }, -/turf/simulated/wall/r_wall, -/area/space) "cZP" = ( /turf/simulated/wall/r_wall, /area/security/tactical) @@ -2614,15 +2923,14 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) -"daD" = ( -/obj/machinery/power/apc/critical/east_bump, -/obj/structure/cable/green, -/turf/simulated/floor/tiled, -/area/space) -"dcp" = ( -/obj/landmark/spawnpoint/latejoin/station/arrivals_shuttle, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"daB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "dcS" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -2641,6 +2949,10 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"ddp" = ( +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/glass/reinforced, +/area/hydroponics) "ddC" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2657,11 +2969,6 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) -"des" = ( -/obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/monotile, -/area/space) "deI" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(30,47,77) @@ -2698,18 +3005,6 @@ /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"dho" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) "dhu" = ( /turf/simulated/floor/carpet, /area/security/detectives_office) @@ -2741,15 +3036,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"djK" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, -/area/medical/medbay) "dkD" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -2763,6 +3049,17 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/reception) +"dlF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"dlQ" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/rift/station/fighter_bay/hangar) "dme" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -2778,18 +3075,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"dpc" = ( -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) +"dmV" = ( +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/obj/effect/mist, +/turf/simulated/floor/water/pool, +/area/bridge/hallway) "dpu" = ( /obj/structure/table/steel_reinforced, /obj/machinery/recharger, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark, /area/medical/medbay) -"dpB" = ( -/turf/simulated/floor/tiled, -/area/space) "dpM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -2797,7 +3098,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "dqF" = ( /obj/machinery/camera/network/security{ @@ -2870,6 +3171,12 @@ /obj/structure/sign/deck/first, /turf/simulated/wall, /area/crew_quarters/bar) +"dux" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "dvm" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -2918,6 +3225,15 @@ }, /turf/simulated/floor/plating, /area/bridge/hallway) +"dvN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "dwD" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, @@ -2937,12 +3253,23 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"dwU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "dwV" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) +"dxb" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "dxv" = ( /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) @@ -2981,79 +3308,70 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) +"dAH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "dAM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"dBY" = ( -/obj/structure/railing{ - dir = 1 +"dAO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled, +/area/security/security_lockerroom) "dCH" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) -"dDa" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "dDn" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/door/airlock/glass/security, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) -"dDz" = ( -/obj/structure/bed/chair{ - dir = 4 +"dDF" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled, -/area/rnd/research_foyer) -"dDE" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"dFw" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/lobby) -"dDU" = ( -/obj/machinery/appliance/cooker/grill, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "dFP" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted/medical, /area/medical/reception) -"dHn" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/main_map/maintenance/deck_one/port) -"dHC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"dIr" = ( -/obj/structure/table/marble, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) "dJq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"dJz" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "dJT" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -3069,12 +3387,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"dKt" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "dLJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3097,13 +3409,11 @@ }, /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/sleep/Dorm_7) -"dNV" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/reinforced/airless, -/area/space) +"dNX" = ( +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "dOe" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/industrial/outline/blue, @@ -3161,30 +3471,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "dQq" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/robotics) -"dQt" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1) -"dRw" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/space) "dRI" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3204,6 +3496,12 @@ "dSS" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) +"dTl" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "dUq" = ( /obj/machinery/computer/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3242,12 +3540,12 @@ "dVR" = ( /obj/structure/closet/crate/solar, /turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) +/area/space) "dXV" = ( /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "dXW" = ( /obj/structure/flora/pottedplant/thinbush, @@ -3261,6 +3559,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) +"dYu" = ( +/obj/structure/table/marble, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/chemical_dispenser/catering/bar_alc, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) +"dYv" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) "dYM" = ( /obj/structure/cable/heavyduty{ icon_state = "2-8" @@ -3277,6 +3588,22 @@ /obj/structure/railing/grey, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) +"dZj" = ( +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/captain) +"eaF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "ebc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3294,13 +3621,6 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/warden) -"ecf" = ( -/obj/structure/filingcabinet/tall, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/security/lobby) "ecv" = ( /obj/structure/closet/emcloset, /obj/machinery/light/no_nightshift{ @@ -3354,6 +3674,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"ege" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) +"egH" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/heads/chief) "egZ" = ( /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officea) @@ -3380,10 +3710,24 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) +"eip" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "eiv" = ( /obj/machinery/appliance/mixer/candy, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"eiY" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "eja" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -3393,6 +3737,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"ejn" = ( +/obj/machinery/iv_drip, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "eju" = ( /obj/structure/closet/wardrobe/red, /obj/effect/floor_decal/industrial/outline/yellow, @@ -3407,17 +3765,20 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"ejG" = ( -/obj/structure/railing{ - dir = 4 +"ejM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/structure/railing, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/open, -/area/space) +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "ekp" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -3430,6 +3791,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"eks" = ( +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) "ekw" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -3443,6 +3807,41 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"eky" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/rnd{ + req_access = list(47) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/research/researchdivision) +"ekO" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) +"elf" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "elt" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloor{ @@ -3453,6 +3852,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"emI" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/structure/closet/crate/biohazard, +/turf/simulated/floor/tiled, +/area/medical/surgery2) "emJ" = ( /obj/structure/filingcabinet, /turf/simulated/floor/wood, @@ -3484,6 +3890,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"enK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "enT" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -3491,7 +3904,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) "eof" = ( /obj/structure/railing{ @@ -3507,6 +3920,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"eow" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "epg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3515,8 +3933,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) +"epn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "epA" = ( -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3547,14 +3980,53 @@ }, /turf/simulated/floor/tiled, /area/medical/surgery2) +"eqV" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"eri" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/maintenance/security/port) "erm" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"erB" = ( +/obj/machinery/holopad, +/turf/simulated/floor/lino, +/area/security/detectives_office) "erM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"erP" = ( +/obj/machinery/door/airlock/command{ + id_tag = "captaindoor"; + name = "Facility Director's Office"; + req_access = list(20) + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "erU" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -3562,12 +4034,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"esd" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +"esp" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/red, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "eth" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3588,6 +4060,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"etO" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/briefingroom) +"euS" = ( +/obj/structure/bed/chair/comfy/purp, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24; + pixel_y = -5 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_7) +"evz" = ( +/obj/structure/bed/chair/comfy/brown, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "evA" = ( /obj/structure/undies_wardrobe, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3629,6 +4122,19 @@ }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/sleep/Dorm_2) +"exf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "eyg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3638,12 +4144,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) -"eyk" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "eym" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -3676,26 +4176,10 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) -"ezf" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - id = "MedbayFoyer"; - name = "Door Switch"; - pixel_x = 27; - pixel_y = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "eAb" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -3726,27 +4210,11 @@ /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled/white, /area/medical/surgery2) -"eBr" = ( +"eBW" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/space) -"eBM" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/starboard) -"eBY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "eCl" = ( @@ -3777,11 +4245,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"eDy" = ( -/obj/structure/railing, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) +"eDE" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/detective, +/turf/simulated/floor/lino, +/area/security/detectives_office) "eDG" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -3824,19 +4294,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"eDU" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"eDV" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "eEa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -3900,6 +4357,10 @@ "eHd" = ( /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"eHz" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "eHE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3907,6 +4368,18 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"eIE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/flipped{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "eJi" = ( /obj/structure/table/rack/shelf/steel{ pixel_y = -2 @@ -3929,7 +4402,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "eJR" = ( /obj/structure/cable/green{ @@ -3968,6 +4441,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"eMO" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck1) "eMT" = ( /obj/machinery/door/airlock/glass/security, /turf/simulated/floor/tiled/techmaint, @@ -3987,22 +4464,30 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"eNJ" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"eNZ" = ( +/obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/turf/simulated/floor/lino, +/area/security/detectives_office) +"eOb" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "ePj" = ( /obj/machinery/computer/timeclock/premade/east, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) +"ePF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/starboard) "ePK" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 4 @@ -4010,16 +4495,25 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"eQJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"ePS" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"eQf" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ dir = 4 }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/recreation_area) +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) +"eQj" = ( +/obj/structure/closet/crate/biohazard, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "eRN" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, @@ -4033,11 +4527,15 @@ /obj/structure/flora/pottedplant/small, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) -"eSr" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/east, -/turf/simulated/floor/tiled, -/area/rnd/research_foyer) +"eSY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck1/a) "eTp" = ( /obj/structure/bed/chair/wood{ dir = 4 @@ -4060,6 +4558,24 @@ /obj/item/bedsheet/iandouble, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) +"eUT" = ( +/obj/machinery/camera/network/security{ + dir = 1 + }, +/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 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "eVI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -4069,6 +4585,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"eVK" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "eVW" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4109,7 +4632,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4142,24 +4665,10 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) -"eYG" = ( -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) -"eZw" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/monotile, +"eZR" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, /area/space) -"eZK" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/rnd{ - req_access = list(47) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/research/researchdivision) "fak" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -4199,6 +4708,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_3) +"faE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"faG" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "fbE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -4218,18 +4735,40 @@ /obj/item/material/knife/butch, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"fcC" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) +"fcR" = ( +/obj/structure/disposalpipe/sortjunction/untagged/flipped, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "fdk" = ( /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"feG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"fdu" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"fec" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) "fgg" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/hallway) @@ -4240,6 +4779,15 @@ }, /turf/simulated/floor/airless, /area/space) +"fgs" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "fgF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -4253,16 +4801,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"fhS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"fhg" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "fhX" = ( /obj/structure/panic_button{ pixel_x = -32 @@ -4313,13 +4869,6 @@ }, /turf/simulated/wall, /area/main_map/hallway/deck1) -"fmV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) "fnl" = ( /obj/structure/table/bench/steel, /obj/landmark/spawnpoint/job/security_officer, @@ -4378,6 +4927,12 @@ /obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"fsi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "fsn" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/hallway/deck1) @@ -4386,7 +4941,7 @@ /area/maintenance/solars) "ftC" = ( /obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "ftD" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, @@ -4396,16 +4951,17 @@ "ftR" = ( /turf/simulated/open, /area/main_map/hallway/deck1/fore) -"fuV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"fuO" = ( +/obj/structure/closet/l3closet/security, +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/dark, +/area/security/armoury) "fvj" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -4463,10 +5019,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"fxL" = ( -/obj/structure/bed/chair/office/dark, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "fxM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -4506,6 +5058,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"fyh" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "fym" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -4519,27 +5077,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) -"fzx" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/red/border, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/briefingroom) -"fzJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/chemistry) -"fzY" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Port to Isolation" - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "fBj" = ( /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) @@ -4562,50 +5099,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) -"fBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) -"fCh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "fCs" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled/monowhite, /area/security/forensics) +"fCG" = ( +/obj/machinery/door/airlock/maintenance/command, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/bridge/hallway) "fCJ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/medical/surgery) -"fCM" = ( -/obj/machinery/camera/network/security{ - dir = 1 - }, -/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/red, -/area/tether/surfacebase/security/lobby) "fDi" = ( /obj/machinery/door/airlock/glass/medical{ name = "Medbay Reception"; @@ -4628,15 +5142,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"fDC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "fEq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -4685,29 +5190,28 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"fGn" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) +"fGz" = ( +/obj/machinery/camera/network/medbay{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "fGB" = ( /obj/structure/shuttle/engine/heater{ dir = 4 }, /turf/simulated/shuttle/wall/voidcraft, /area/main_map/Hangar_bay/deck1/a) -"fHf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/space) "fHw" = ( /obj/machinery/photocopier, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"fIh" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "fIK" = ( /obj/structure/cable/heavyduty, /obj/structure/cable/green{ @@ -4743,20 +5247,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"fKr" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/bridge/hallway) "fKH" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"fKV" = ( -/obj/machinery/washing_machine, -/turf/simulated/floor/tiled/white, -/area/space) +"fLd" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "fLu" = ( /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) @@ -4767,16 +5280,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"fLR" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) -"fNz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "fND" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -4787,6 +5290,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics) +"fOY" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "fPY" = ( /obj/structure/railing{ dir = 4 @@ -4829,10 +5335,6 @@ /obj/landmark/spawnpoint/job/paramedic, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"fQI" = ( -/obj/machinery/door/airlock/maintenance/engi, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/port) "fQJ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -4860,18 +5362,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"fRZ" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fSj" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/window/northright, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "fSr" = ( /obj/structure/window/reinforced{ @@ -4909,6 +5402,15 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/security/tactical) +"fUl" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) +"fUK" = ( +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "fUW" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -4952,17 +5454,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"fWp" = ( -/obj/machinery/door/blast/regular{ - dir = 8; - id = "armorytactical"; - name = "Tactical Armory Access" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/tactical) "fWS" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -4993,6 +5484,11 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"fYm" = ( +/obj/structure/railing, +/obj/structure/window/reinforced, +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "fYx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5037,6 +5533,14 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"fZS" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "gaL" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -5130,13 +5634,36 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"gfx" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"gfn" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/turf/simulated/open, -/area/space) +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay emergency access door."; + id = "MedbayEmergency"; + name = "Door Switch"; + pixel_x = -24; + pixel_y = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"gfK" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/recreation_area) "gfN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -5174,6 +5701,13 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"gfX" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/head_of_security, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/briefingroom) "ggi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5182,10 +5716,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"ggJ" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) "ggN" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/portables_connector, @@ -5197,9 +5727,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"ght" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/bar_backroom) +"ghd" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "ghG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5216,6 +5748,13 @@ /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officeb) +"gii" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "gir" = ( /obj/machinery/computer/prisoner{ dir = 1 @@ -5233,6 +5772,24 @@ /obj/structure/catwalk, /turf/simulated/floor/airless, /area/space) +"giZ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "gjj" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -5263,13 +5820,30 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"gkF" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/railing{ +"gjE" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"gjG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"gjO" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"gkF" = ( +/obj/effect/floor_decal/spline/plain, /obj/machinery/door/window/southleft, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "glc" = ( /obj/machinery/door/firedoor/glass, @@ -5279,6 +5853,19 @@ }, /turf/simulated/floor, /area/holodeck_control) +"glF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "glV" = ( /obj/structure/closet/bombclosetsecurity, /obj/effect/floor_decal/corner/blue{ @@ -5286,11 +5873,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"gmr" = ( -/obj/machinery/door/airlock/glass, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_one/aft/port) "gms" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -5301,10 +5883,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) -"gnB" = ( -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) +"gnq" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "gnD" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -5319,7 +5901,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "gnZ" = ( /obj/structure/cable/green{ @@ -5329,18 +5911,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/bridge/hallway) +"gov" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "goR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) -"gpm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) "gqE" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -5355,6 +5941,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/lino, /area/security/detectives_office) +"gqS" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) "gqX" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -5365,20 +5957,6 @@ /obj/item/paper/dockingcodes, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) -"gru" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"gry" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "gsh" = ( /obj/structure/table/steel, /obj/item/storage/box/evidence, @@ -5410,6 +5988,32 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_lockerroom) +"gtn" = ( +/obj/structure/table/steel_reinforced, +/obj/item/storage/box/traumainjectors, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/item/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"gue" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "gul" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics/mechbay) @@ -5445,6 +6049,15 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) +"gvY" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "gwf" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -5468,15 +6081,6 @@ }, /turf/simulated/floor/plating, /area/security/forensics) -"gyD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "gyF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5487,19 +6091,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) -"gyH" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/space) -"gyO" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officecommon) "gzy" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -5520,6 +6111,15 @@ /obj/structure/railing, /turf/simulated/floor/reinforced, /area/space) +"gzI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "gAl" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5535,17 +6135,10 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"gBp" = ( -/obj/machinery/door/airlock/glass_external/public, -/turf/simulated/floor/tiled, -/area/space) "gBz" = ( /obj/structure/table/standard, /turf/simulated/floor/wood, /area/bridge/hallway) -"gCL" = ( -/turf/simulated/floor/tiled/red, -/area/space) "gDe" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -5570,18 +6163,36 @@ }, /turf/simulated/floor/crystal, /area/space) +"gDS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/security/warden) +"gDV" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "gEp" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/open, /area/main_map/hallway/deck1/fore) -"gFU" = ( -/obj/structure/railing{ - dir = 4 +"gFh" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "armorytactical"; + name = "Tactical Armory Access" }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +/turf/simulated/floor/reinforced, +/area/security/tactical) "gGu" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted/civilian, @@ -5612,13 +6223,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"gIA" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/hallway) "gJU" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -5637,6 +6241,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"gKt" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/hallway/deck1/fore) "gKw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5649,6 +6259,21 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"gKZ" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "gLe" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -5661,15 +6286,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"gLZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/bar) "gMs" = ( /obj/structure/closet/secure_closet/security, /obj/structure/window/basic{ @@ -5678,16 +6294,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"gMF" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/medical/reception) "gMN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5700,12 +6306,6 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"gMZ" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "gNG" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -5732,16 +6332,28 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_2) -"gNQ" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/reinforced/airless, -/area/space) +"gNX" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"gPj" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "gQs" = ( /obj/machinery/door/airlock/glass/medical{ name = "Paramedic Storage" }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"gQw" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "gQF" = ( /obj/machinery/appliance/mixer/cereal, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -5758,14 +6370,21 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"gRF" = ( -/obj/machinery/vending/nifsoft_shop{ - dir = 8 +"gRV" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "gRZ" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, @@ -5782,16 +6401,13 @@ /obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) -"gSx" = ( -/obj/machinery/conveyor{ - dir = 4 - }, -/obj/map_helper/conveyor/belt{ - id_tag = "cargo_mailroom"; - name = "Cargo Mail belt" +"gSE" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "gTl" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/box/gloves{ @@ -5825,10 +6441,24 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck1) -"gXp" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/research/researchdivision) +"gWj" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock101"; + name = "Toilet 2" + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"gWt" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "gXq" = ( /obj/machinery/camera/network/research{ dir = 8 @@ -5842,16 +6472,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora) -"gXK" = ( -/obj/machinery/door/airlock/medical{ - name = "Chemistry"; - req_one_access = list(33) - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/medical/chemistry) "gZM" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) @@ -5859,6 +6479,21 @@ /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"haP" = ( +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) +"hbt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "hbN" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -5903,9 +6538,24 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) +"heq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "heZ" = ( /turf/simulated/wall, /area/main_map/hallway/deck1) +"hfn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) "hfG" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -5925,25 +6575,71 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/security_equiptment_storage) +"hgD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "hhb" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"hjv" = ( -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" +"hhH" = ( +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/light/no_nightshift{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/holodeck_control) +"hhN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/medical/surgery) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) +"hhP" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) +"his" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "hjR" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/medical/medbay) @@ -5951,24 +6647,9 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/critical/north_bump, +/obj/machinery/power/apc/critical/north_mount, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck1/a) -"hkO" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"hlb" = ( -/obj/structure/closet/l3closet/security, -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/dark, -/area/security/armoury) "hlh" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -5989,6 +6670,12 @@ "hmh" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/cmo) +"hml" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/glass/reinforced, +/area/main_map/hallway/deck1) "hmK" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) @@ -6046,6 +6733,20 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"hpI" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "hpV" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -6073,6 +6774,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"hrb" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "hrh" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -6161,6 +6872,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) +"hwV" = ( +/obj/machinery/papershredder, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/medical/reception) "hxc" = ( /obj/machinery/door/firedoor/glass, /obj/structure/table/reinforced, @@ -6187,6 +6909,13 @@ /obj/structure/bed/chair/wood, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) +"hyj" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "hzV" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -6200,6 +6929,15 @@ "hzX" = ( /turf/simulated/open, /area/main_map/hallway/deck1) +"hAg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) "hAj" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -6229,14 +6967,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"hBO" = ( -/obj/machinery/door/airlock/glass, +"hBJ" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/firedoor/glass{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "hBV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6257,6 +6994,13 @@ /obj/machinery/door/window/brigdoor/northleft, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) +"hCZ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "hDc" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) @@ -6273,33 +7017,34 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"hHj" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 8 +"hEZ" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 }, -/obj/structure/table/steel, -/obj/item/storage/box/firingpins, -/obj/item/storage/box/firingpins, -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"hJi" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-8" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) -"hHn" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hJz" = ( /obj/structure/bed/double/padded, /obj/random/bedsheet/double, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) +"hJF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "hJO" = ( /obj/machinery/door/airlock/maintenance, /obj/map_helper/network_builder/power_cable/green/auto, @@ -6308,10 +7053,6 @@ "hKl" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_4) -"hKm" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/bridge/hallway) "hLw" = ( /obj/machinery/button/windowtint{ id = "holodeck"; @@ -6331,16 +7072,6 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"hMl" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) -"hMx" = ( -/obj/structure/cable/green{ - icon_state = "32-2" - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/port) "hMB" = ( /obj/structure/filingcabinet, /obj/machinery/light/no_nightshift{ @@ -6372,6 +7103,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"hNc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hOo" = ( /obj/machinery/door/window/brigdoor/northright{ req_access = null; @@ -6385,16 +7125,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"hPH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) +"hOp" = ( +/obj/structure/bed/chair/comfy/blue, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_8) "hPX" = ( /obj/structure/bed/padded, /obj/random/bedsheet, @@ -6525,11 +7259,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"hYb" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/lab) "hYz" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6554,6 +7283,10 @@ }, /turf/simulated/open, /area/rnd/xenobiology/xenoflora_storage) +"hYL" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "hZr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6600,15 +7333,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"iaT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "ibx" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -6625,12 +7349,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) -"idb" = ( -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/briefingroom) "idX" = ( /obj/machinery/light_switch{ pixel_x = 25 @@ -6649,16 +7369,19 @@ /obj/item/bedsheet/hosdouble, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/heads/hos) -"ieA" = ( -/obj/machinery/conveyor_switch/oneway{ - pixel_y = 14 +"iey" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/map_helper/conveyor/lever{ - id_tag = "_mobile_mining_interior"; - name = "Ore Processing" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/port) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "ifl" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/light/no_nightshift, @@ -6686,13 +7409,47 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"igq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "igr" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/forward/port) +"igz" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/hallway) "igQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) +"igS" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/landmark{ + name = "lightsout" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) +"ihC" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "ihS" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/accessory/armor/helmcover/nt, @@ -6728,6 +7485,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"ijP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) "ijT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6791,19 +7555,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"ipY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "iqc" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"isf" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "isn" = ( /obj/machinery/door/airlock/atmos{ name = "Medical Atmospherics Backup"; @@ -6848,6 +7615,11 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one) +"itm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "itv" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -6876,7 +7648,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -6884,6 +7655,25 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"iuu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"iuI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "iuK" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -6899,59 +7689,75 @@ name = "Medical Maintenance Access"; req_access = list(5) }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/dark, /area/medical/medbay) "ivd" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck1) +"ivs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"ivv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"ivI" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/briefingroom) "iwo" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"iwG" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "iwV" = ( /obj/structure/railing, /turf/simulated/floor/plating, /area/medical/medbay) +"ixc" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one) "ixM" = ( /obj/structure/bed/padded, /obj/random/bedsheet, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_9) -"iyd" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass/security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) "iyz" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/heads/cmo) +"iyD" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "iyQ" = ( /turf/simulated/floor/tiled/dark, /area/medical/medbay) -"izi" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/bed/chair/comfy/beige{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "izF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -6972,25 +7778,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) -"iAi" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/space) -"iAt" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Locker Room"; - req_one_access = list(2) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/security/security_lockerroom) "iAC" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -7042,31 +7829,19 @@ "iBF" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) +"iCg" = ( +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "iDo" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) -"iDv" = ( -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/port) -"iDB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) "iDV" = ( /obj/structure/sign/deck1, /turf/simulated/wall, -/area/maintenance/solars) +/area/space) "iEd" = ( /obj/machinery/vending/security, /obj/effect/floor_decal/industrial/outline/yellow, @@ -7102,22 +7877,31 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"iFS" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 +"iFo" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"iFJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "iGH" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -7137,14 +7921,21 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) -"iHS" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1) +"iHo" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/medical/medbay) "iIt" = ( /obj/structure/sink{ pixel_y = 22 @@ -7188,10 +7979,24 @@ "iKd" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/tactical) -"iKu" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/space) +"iKe" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "iKP" = ( /obj/machinery/computer/borgupload, /obj/effect/floor_decal/corner/purple{ @@ -7202,36 +8007,40 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"iLb" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) +"iLB" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"iLN" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/vending/nifsoft_shop{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "iMf" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"iMj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1/fore) "iMl" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck1/a) -"iNp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/security/upper) "iOk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -7241,35 +8050,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"iOF" = ( -/obj/structure/closet/crate/solar, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) "iOT" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"iPA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/lab) -"iQA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one) "iQD" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorwhite{ @@ -7317,6 +8103,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) +"iTi" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "iTu" = ( /obj/machinery/button/remote/airlock{ id = "dorm9"; @@ -7362,6 +8152,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) +"iUP" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"iUY" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hop) "iVG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7386,7 +8191,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -7394,23 +8198,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"iWI" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/medical/medbay) -"iXz" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) -"iXB" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "iXF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7422,10 +8209,40 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"iXQ" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "iYu" = ( /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) +"iYL" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"iYM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officeb) +"iYZ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "iZB" = ( /obj/structure/table/woodentable, /obj/item/tape_recorder{ @@ -7434,20 +8251,18 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) -"iZI" = ( -/obj/machinery/door/blast/regular, -/turf/simulated/floor/reinforced, -/area/main_map/Hangar_bay/deck1/a) -"iZQ" = ( -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "bar"; - name = "Bar counter shutters"; - pixel_x = -24; - pixel_y = 10 +"jaq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/chemistry) "jaL" = ( /obj/effect/floor_decal/corner/green/full{ dir = 8 @@ -7462,11 +8277,6 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/maintenance/solars) -"jch" = ( -/obj/structure/cable/green, -/obj/machinery/power/solar, -/turf/simulated/floor/reinforced/airless, -/area/space) "jcB" = ( /turf/simulated/shuttle/wall/voidcraft, /area/main_map/Hangar_bay/deck1/a) @@ -7477,9 +8287,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"jdS" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/starboard) "jeu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7488,18 +8295,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) -"jew" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/space) -"jhy" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "jhN" = ( /turf/simulated/wall/prepainted/security, /area/security/security_lockerroom) @@ -7539,6 +8334,10 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/monotile, /area/security/forensics) +"jms" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "jmx" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -7549,13 +8348,6 @@ "jny" = ( /turf/simulated/wall/r_wall, /area/maintenance/security/port) -"jou" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/space) "joZ" = ( /turf/simulated/wall/prepainted/engineering/atmos, /area/main_map/maintenance/deck_one/aft/port) @@ -7571,15 +8363,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) -"jqj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/chemistry) "jqt" = ( /obj/structure/railing{ dir = 4 @@ -7593,13 +8376,6 @@ "jqy" = ( /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) -"jrb" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/hole/right, -/obj/effect/floor_decal/techfloor/hole, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/white, -/area/space) "jta" = ( /obj/item/radio/intercom{ dir = 8; @@ -7638,6 +8414,14 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"juY" = ( +/obj/item/chess/wpawn, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) +"jvh" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "jvs" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_3) @@ -7648,6 +8432,16 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) +"jwg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "jwl" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -7664,10 +8458,9 @@ "jwS" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery2) -"jxN" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) +"jxs" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/security/tactical) "jxY" = ( /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/briefingroom) @@ -7680,6 +8473,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"jzc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"jzh" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/forward/port) "jzA" = ( /obj/machinery/door/airlock{ name = "Hydroponics"; @@ -7694,7 +8502,7 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/hydroponics) "jzJ" = ( /obj/structure/filingcabinet/chestdrawer, @@ -7705,8 +8513,7 @@ /area/security/warden) "jAs" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -7715,13 +8522,6 @@ /obj/item/defib_kit/loaded, /turf/simulated/floor/tiled, /area/medical/surgery2) -"jAA" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plating, -/area/space) -"jBk" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/rnd/research/researchdivision) "jBA" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -7746,25 +8546,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"jCH" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"jCL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck1) "jDH" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -7861,6 +8642,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"jHV" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "jIe" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -7903,26 +8695,38 @@ "jKW" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/maintenance/deck_one) -"jLH" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) +"jLk" = ( +/obj/structure/sign/deck/first, +/turf/simulated/wall, +/area/main_map/maintenance/deck_one/forward/starboard) "jLN" = ( /obj/machinery/door/airlock/maintenance/common, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_one/aft/port) -"jML" = ( -/obj/machinery/button/windowtint{ - id = "det_office"; - pixel_x = -24; - pixel_y = 24 +"jLV" = ( +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) +"jMX" = ( +/obj/machinery/vending/nifsoft_shop{ + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/security/detectives_office) +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"jNK" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) +"jNO" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "jOg" = ( /turf/simulated/wall/prepainted/science, /area/main_map/maintenance/deck_one/starboard) @@ -7930,6 +8734,18 @@ /obj/structure/sign/deck/first, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck1) +"jQD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/starboard) "jQS" = ( /obj/structure/table/rack/shelf/steel, /obj/item/cell/device/weapon{ @@ -7985,6 +8801,22 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techfloor, /area/space) +"jSR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/crystal, +/area/space) +"jSV" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "jSW" = ( /obj/structure/window/reinforced{ dir = 4 @@ -8015,31 +8847,12 @@ }, /turf/simulated/open, /area/rnd/lab) -"jUd" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/space) "jUE" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"jUI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "jUJ" = ( /obj/structure/sign/directions/evac{ dir = 8 @@ -8049,13 +8862,18 @@ "jVi" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/starboard) +"jVx" = ( +/obj/structure/bedsheetbin, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "jWJ" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/space) "jWO" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "jXb" = ( @@ -8098,37 +8916,37 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"jYg" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "jYE" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"jYU" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 +"jYI" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/reception) +"jZH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/recreation_area) "jZX" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/iv_drip, @@ -8143,13 +8961,10 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) -"kaB" = ( -/turf/simulated/wall/prepainted/command, -/area/space) -"kcG" = ( -/obj/machinery/door/airlock/maintenance/common, +"kao" = ( +/obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one) +/area/quartermaster/delivery) "kdH" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -8170,6 +8985,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"keX" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "keY" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -8182,6 +9003,19 @@ /obj/landmark/spawnpoint/job/lawyer, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) +"kfo" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -25 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/security/riot_control) "kgz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8234,19 +9068,26 @@ "kij" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) -"kiK" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +"kil" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/turnstile/entry{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) +"kiR" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kjj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 @@ -8264,12 +9105,10 @@ }, /turf/simulated/open, /area/crew_quarters/recreation_area) -"kkJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) +"kkd" = ( +/obj/structure/sign/greencross, +/turf/simulated/wall/prepainted/medical, +/area/main_map/hallway/deck1) "kkN" = ( /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical/emt, @@ -8304,6 +9143,15 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"kmY" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/structure/bed/chair/sofa/black/right{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "knx" = ( /obj/structure/bed/chair/bay/chair/padded/red/smallnest, /obj/random/plushie, @@ -8322,10 +9170,20 @@ }, /turf/simulated/floor/airless, /area/space) +"knI" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/starboard) "knK" = ( /obj/structure/sign/deck1, /turf/simulated/wall/r_wall, /area/maintenance/solars) +"kob" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/main_map/maintenance/deck_one) "koc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8336,6 +9194,11 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"koG" = ( +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp, +/turf/simulated/floor/lino, +/area/security/detectives_office) "koY" = ( /obj/structure/railing{ dir = 4 @@ -8343,6 +9206,12 @@ /obj/structure/railing, /turf/space, /area/space) +"kpK" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kpX" = ( /obj/structure/filingcabinet, /obj/machinery/light/no_nightshift{ @@ -8403,16 +9272,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"ktt" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/obj/machinery/shower{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/space) "ktz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -8436,21 +9295,19 @@ "ktR" = ( /turf/simulated/floor/glass/reinforced, /area/main_map/maintenance/deck_one) -"kuG" = ( -/obj/map_helper/network_builder/power_cable/green/auto, +"kub" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"kuH" = ( -/obj/machinery/door/airlock/maintenance/command, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "bridge_lockdown"; - name = "Bridge Lockdown"; - opacity = 0 +/area/main_map/maintenance/deck_one) +"kuJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_one) "kuK" = ( /obj/machinery/flasher/portable, /obj/effect/floor_decal/corner/blue{ @@ -8471,21 +9328,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"kwb" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "kwx" = ( /obj/structure/closet/wardrobe, /turf/simulated/floor/wood, @@ -8524,6 +9366,15 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_one/forward/starboard) +"kxQ" = ( +/obj/structure/bed/chair/comfy/purp{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_5) "kxV" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8563,15 +9414,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"kzO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "kAb" = ( /obj/structure/railing{ dir = 4 @@ -8606,10 +9448,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officea) -"kBW" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/lobby) "kDw" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -8617,21 +9455,15 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"kDy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "kEI" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"kFg" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/delivery) "kFJ" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 8 @@ -8653,6 +9485,11 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/maintenance/security/upper) +"kGv" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/communications, +/turf/simulated/floor/tiled/steel_grid, +/area/space) "kGP" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8664,6 +9501,18 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"kHm" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "kHF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8678,6 +9527,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/xenobiology/xenoflora) +"kIO" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/recreation_area) "kJp" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/kitchen) @@ -8697,40 +9549,48 @@ /obj/structure/ladder, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"kKP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) +"kKN" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "kLp" = ( /obj/structure/bed/chair/sofa/brown/left{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) +"kLy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "kLM" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"kMt" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock100"; - name = "Toilet 1" - }, -/turf/simulated/floor/tiled/white, -/area/space) "kMM" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"kMQ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "kMU" = ( /obj/machinery/door/airlock/glass{ name = "Hydroponics"; @@ -8774,44 +9634,20 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"kNS" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 6 - }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) -"kOz" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/port) "kOA" = ( /obj/effect/floor_decal/corner/white/border{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) +"kOR" = ( +/turf/simulated/floor/reinforced, +/area/main_map/Hangar_bay/deck1) "kOT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "kOZ" = ( /obj/structure/railing{ @@ -8839,11 +9675,6 @@ "kPF" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/cmo) -"kPH" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/crystal, -/area/space) "kPV" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass{ @@ -8851,19 +9682,6 @@ }, /turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) -"kPZ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "kQk" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = null; @@ -8877,12 +9695,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"kQx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/chemistry) "kQy" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -8900,6 +9712,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"kQJ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "kRe" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/aft/starboard) @@ -8910,14 +9731,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"kRv" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) "kRJ" = ( /obj/structure/railing, /obj/structure/railing{ @@ -8938,11 +9751,34 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officecommon) +"kTu" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "kTQ" = ( /obj/structure/ladder, /obj/structure/catwalk, /turf/simulated/open, /area/maintenance/security/port) +"kTW" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"kUm" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "kUB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -8950,6 +9786,35 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"kUD" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"kUO" = ( +/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 + }, +/obj/machinery/light/no_nightshift, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"kUQ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "kVA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9036,6 +9901,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"kYZ" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "kZq" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -9052,6 +9922,11 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"laz" = ( +/obj/structure/grille, +/obj/structure/girder/reinforced, +/turf/simulated/floor/reinforced/carbon_dioxide, +/area/rift/station/fighter_bay/hangar) "laC" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -9085,9 +9960,6 @@ /obj/structure/railing, /turf/simulated/floor/glass/reinforced, /area/hydroponics) -"leG" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/main_map/maintenance/deck_one/port) "leK" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -9113,6 +9985,21 @@ }, /turf/simulated/floor/tiled/monowhite, /area/security/forensics) +"lfz" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"lhu" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officea) "liV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/mauve{ @@ -9170,9 +10057,36 @@ /obj/landmark/spawnpoint/job/chef, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"lmG" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/obj/structure/table/steel, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/dark, +/area/security/riot_control) "lnc" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/recreation_area) +"lnA" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "kitchen-c"; + name = "Kitchen Service Shutters" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/kitchen) "lnG" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -9182,11 +10096,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"lnR" = ( -/obj/machinery/door/airlock/glass/security, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/security/briefingroom) +"loW" = ( +/turf/simulated/wall, +/area/security/detectives_office) +"lph" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "lpN" = ( /obj/machinery/air_alarm{ dir = 8; @@ -9195,6 +10114,55 @@ /obj/structure/table/glass, /turf/simulated/floor/crystal, /area/space) +"lqe" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) +"lqo" = ( +/obj/machinery/door/airlock/security{ + name = "Equipment Storage"; + req_access = list() + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/security/security_equiptment_storage) +"lrl" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"lsF" = ( +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/deliveryChute{ + dir = 8 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"lsH" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/port) "lsP" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, @@ -9251,6 +10219,38 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"lxm" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"lxZ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/black{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) +"lyo" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "lyW" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/white, @@ -9268,12 +10268,6 @@ }, /turf/simulated/open, /area/maintenance/security/port) -"lBm" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "lBr" = ( /obj/item/clothing/suit/space/emergency, /obj/item/clothing/suit/space/emergency, @@ -9306,12 +10300,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"lCI" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) +"lCX" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "lDd" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"lDo" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one) "lDx" = ( /obj/structure/railing{ dir = 1 @@ -9327,6 +10339,13 @@ "lFl" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/port) +"lFK" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "lFP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9336,6 +10355,33 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"lGR" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/medical/medbay) +"lGU" = ( +/obj/machinery/door/blast/regular{ + id = "armorylight"; + name = "Light Armory Acccess" + }, +/turf/simulated/floor/reinforced, +/area/security/armoury) +"lHp" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"lHx" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "lHC" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -9356,10 +10402,16 @@ /obj/machinery/vending/medical, /turf/simulated/floor/tiled/dark, /area/medical/medbay) -"lJR" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/crystal, -/area/space) +"lJb" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "lJV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9380,7 +10432,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "solar_dock"; name = "interior access button"; @@ -9397,17 +10449,6 @@ "lKP" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_5) -"lLO" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) -"lLS" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "armoryriot"; - name = "Emergency Armory Access" - }, -/turf/simulated/floor/reinforced, -/area/security/riot_control) "lLX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9424,13 +10465,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/wall, /area/main_map/hallway/deck1/fore) -"lMH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "lMW" = ( /turf/simulated/open, /area/space) @@ -9449,21 +10483,9 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"lOo" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/structure/closet/l3closet/scientist/double, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/east, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "lOT" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "solar_dock"; name = "exterior access button"; @@ -9471,7 +10493,16 @@ pixel_y = -26 }, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) +"lPc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "lPz" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/marble, @@ -9480,28 +10511,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"lPP" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) -"lPW" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) "lQn" = ( /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) @@ -9509,6 +10518,9 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"lQP" = ( +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "lRr" = ( /obj/effect/floor_decal/techfloor/orange/corner, /turf/simulated/floor/tiled/techmaint, @@ -9521,12 +10533,41 @@ /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/tiled, /area/medical/surgery2) -"lTD" = ( +"lSP" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"lTf" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"lTm" = ( +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"lTE" = ( +/obj/machinery/door/airlock/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) +"lVy" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"lWs" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "lWV" = ( /obj/structure/table/standard, /obj/item/disk/design_disk{ @@ -9572,6 +10613,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"lYx" = ( +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/crystal, +/area/space) "lZc" = ( /obj/structure/table/woodentable, /obj/item/folder/red, @@ -9605,6 +10653,16 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"lZx" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1/fore) +"lZM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "lZV" = ( /obj/machinery/door/airlock/glass/medical{ name = "Paramedic Storage" @@ -9617,28 +10675,23 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"maf" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/crew, +/turf/simulated/floor/tiled/steel_grid, +/area/space) "mbb" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"mbz" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 +"mbE" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/forward/port) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "mdg" = ( /obj/machinery/door/airlock/glass/research{ name = "Xenoflora Research"; @@ -9658,6 +10711,10 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, /area/space) +"meL" = ( +/obj/machinery/computer/timeclock/premade/north, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "mfl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9665,8 +10722,52 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"mfw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) +"mfP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/hallway) +"mgA" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/hallway) +"mhf" = ( +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -32 + }, +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_2) +"mis" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"mjs" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "mjv" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4; @@ -9677,19 +10778,22 @@ "mjw" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) +"mjM" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "mjR" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) -"mlU" = ( -/obj/machinery/shower{ - dir = 1 - }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) +"mlH" = ( +/obj/machinery/holopad, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "mmw" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -9717,8 +10821,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "mnb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/glass, @@ -9735,13 +10838,49 @@ }, /obj/item/hand_labeler, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/medical/reception) +"moz" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/heads/cmo) +"moV" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck1) +"mpc" = ( +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/obj/structure/cable/heavyduty, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mpd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "mpj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, /area/security/tactical) +"mpC" = ( +/obj/machinery/button/remote/airlock{ + id = "bathroomlock100"; + name = "Bathroom Lock"; + pixel_x = -20; + pixel_y = -20; + specialfunctions = 4 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "mpQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9756,6 +10895,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) +"mqr" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "mqQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -9773,6 +10918,28 @@ /obj/structure/girder/reinforced, /turf/simulated/floor/reinforced/carbon_dioxide, /area/space) +"mqZ" = ( +/obj/machinery/door/blast/regular{ + dir = 8; + id = "armorytactical2"; + name = "Tactical Armory Access" + }, +/turf/simulated/floor/reinforced, +/area/security/tactical) +"mrp" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officeb) +"mry" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/open, +/area/main_map/hallway/deck1/fore) +"mrH" = ( +/turf/simulated/wall/r_wall, +/area/main_map/Hangar_bay/deck1) "msK" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -9802,6 +10969,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"mtV" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "muA" = ( /obj/structure/bed/chair/bay/chair/padded/red/bignest, /obj/random/plushielarge, @@ -9860,18 +11036,6 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"mvR" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) "mwK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -9881,39 +11045,31 @@ "mxc" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_6) -"mxr" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/open, -/area/medical/medbay) -"myy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/starboard) "myO" = ( /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) -"mzA" = ( -/obj/structure/railing{ - dir = 4 +"myV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/window/reinforced{ +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) +"mzs" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"mAY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/open, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "mBp" = ( /obj/effect/floor_decal/corner/green/full, /obj/machinery/atmospherics/pipe/simple/hidden/yellow, @@ -9921,6 +11077,28 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"mCD" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"mCJ" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "mDT" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -9965,6 +11143,26 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/aft/port) +"mEB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"mEL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "mES" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bunker) @@ -9994,7 +11192,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -10004,32 +11201,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"mGL" = ( -/obj/machinery/iv_drip, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"mHM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) "mId" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 @@ -10053,14 +11224,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"mIH" = ( -/obj/machinery/door/airlock/maintenance, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck1/fore) "mJE" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, @@ -10098,40 +11261,34 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"mKx" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 - }, -/obj/effect/floor_decal/spline/plain{ +"mKt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/space) -"mKV" = ( -/obj/machinery/door/airlock/glass_external/public, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "mLa" = ( /obj/structure/railing, /obj/structure/window/basic, /turf/simulated/open, /area/crew_quarters/bar) -"mMO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"mLP" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/ai_status_display{ + pixel_y = 32 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/disposal, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/bar) "mMY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -10147,6 +11304,10 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) +"mND" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck1) "mNL" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "eva_paramedic_airlock"; @@ -10194,6 +11355,10 @@ }, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) +"mQo" = ( +/obj/machinery/light, +/turf/simulated/floor/carpet/sblucarpet, +/area/crew_quarters/captain) "mRf" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10207,14 +11372,27 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"mSl" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mSq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/computer/timeclock/premade/south, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "mSC" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) -"mTt" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) "mTw" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -10247,15 +11425,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) -"mUN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) "mUP" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/portables_connector, @@ -10270,12 +11439,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"mVg" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "mVz" = ( /obj/structure/cable{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"mVD" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "mVZ" = ( /obj/structure/railing{ dir = 4 @@ -10294,18 +11484,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"mXv" = ( -/obj/effect/floor_decal/corner/paleblue/bordercee{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "mYh" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -10313,11 +11491,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"mYx" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/port) "mYB" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -10366,7 +11539,7 @@ dir = 1 }, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) "nal" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10397,6 +11570,15 @@ }, /turf/simulated/open, /area/space) +"nbe" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/black{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "nbs" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/spray/cleaner{ @@ -10431,24 +11613,51 @@ "nbK" = ( /turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) -"nbN" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/space) "nbZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) +"ncc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) +"ncf" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) +"nch" = ( +/obj/structure/catwalk, +/obj/structure/handrail, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ncr" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"ndV" = ( +"ncO" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "neO" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 1 @@ -10458,25 +11667,26 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"nfd" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "nfj" = ( /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) "nfl" = ( /obj/effect/floor_decal/spline/plain, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/door/window/southright, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) -"ngh" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32 +"nfJ" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 }, -/obj/structure/bed/chair/comfy/brown, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_2) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "nhh" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -10489,6 +11699,13 @@ "niL" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one) +"njl" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "njr" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -10497,24 +11714,21 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"nks" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 +"nkZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "nlb" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) -"nlf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/space) "nmA" = ( /obj/machinery/vending/nifsoft_shop{ dir = 8 @@ -10541,25 +11755,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_8) -"noo" = ( -/obj/structure/table/steel_reinforced, -/obj/item/storage/box/traumainjectors, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +"nov" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/light/no_nightshift{ - dir = 1 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"noA" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "noS" = ( /obj/landmark/spawnpoint/job/bartender, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10568,6 +11775,9 @@ "noW" = ( /turf/simulated/floor/plating, /area/maintenance/security/port) +"npe" = ( +/turf/simulated/open, +/area/quartermaster/delivery) "npj" = ( /obj/structure/table/steel, /obj/effect/floor_decal/corner/red{ @@ -10603,20 +11813,22 @@ }, /turf/simulated/floor/tiled/monowhite, /area/security/forensics) -"nsj" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "nsq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"nsv" = ( +/obj/landmark/spawnpoint/job/xenobotanist, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "nsF" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10626,18 +11838,9 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"ntf" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "ntk" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -10675,7 +11878,7 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/bar) "nvx" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10713,22 +11916,23 @@ "nwB" = ( /turf/simulated/wall, /area/rnd/research/researchdivision) -"nwG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, +"nwT" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/tactical) +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officecommon) "nxa" = ( /turf/simulated/wall/prepainted/security, /area/security/security_equiptment_storage) +"nxh" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "nxk" = ( /turf/simulated/wall, /area/space) @@ -10740,16 +11944,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/medical/surgery2) -"nyv" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) "nyN" = ( /obj/structure/cable/heavyduty{ icon_state = "0-4" @@ -10759,34 +11953,10 @@ }, /turf/simulated/floor/airless, /area/space) -"nzi" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "armorytactical2"; - name = "Tactical Armory Access" - }, -/turf/simulated/floor/reinforced, -/area/security/tactical) "nzv" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) -"nzG" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armorylight"; - name = "Light Armory Acccess" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/armoury) -"nzJ" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1) "nAe" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -10799,6 +11969,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"nBi" = ( +/obj/machinery/door/airlock/glass_external, +/obj/structure/fans/tiny, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "nBE" = ( /obj/structure/flora/pottedplant/bamboo, /turf/simulated/floor/wood, @@ -10815,6 +11991,22 @@ }, /turf/simulated/floor/plating, /area/medical/medbay) +"nCv" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"nEd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/security/security_lockerroom) "nEv" = ( /obj/structure/closet/walllocker{ dir = 4; @@ -10849,14 +12041,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/research_foyer) -"nGm" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officea) "nGt" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) +"nGw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "nGL" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -10880,15 +12075,18 @@ /obj/structure/sign/deck/first, /turf/simulated/wall, /area/main_map/hallway/deck1/fore) -"nHL" = ( -/turf/simulated/floor/carpet/tealcarpet, -/area/crew_quarters/heads/cmo) -"nHZ" = ( +"nHK" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled/monotile, -/area/space) +/area/main_map/hallway/deck1) +"nHL" = ( +/turf/simulated/floor/carpet/tealcarpet, +/area/crew_quarters/heads/cmo) "nIb" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -10933,17 +12131,39 @@ "nIe" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/maintenance/security/upper) +"nID" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "nIE" = ( /obj/landmark/spawnpoint/job/scientist, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"nIH" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_9) +"nIK" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "nIR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "nJl" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -10970,7 +12190,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/lino, /area/security/detectives_office) "nLk" = ( @@ -10984,22 +12204,30 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"nLr" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 4; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "nLu" = ( /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officeb) -"nMa" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "nMe" = ( /obj/structure/sign/hangar/one, /turf/simulated/wall, /area/main_map/Hangar_bay/deck1/a) "nMo" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) "nOk" = ( @@ -11007,9 +12235,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"nOl" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/starboard) "nOp" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled, @@ -11020,15 +12245,25 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"nPJ" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "nPU" = ( /turf/simulated/open, /area/medical/medbay) +"nQs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"nQB" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "nQH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11053,25 +12288,16 @@ "nRV" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora) -"nSu" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"nSy" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/machinery/door/firedoor{ - dir = 1 +"nSq" = ( +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) "nTJ" = ( /obj/structure/closet/crate/solar, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) "nUD" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_7) @@ -11079,7 +12305,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "nUG" = ( @@ -11109,12 +12335,36 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) +"nXm" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/lino, +/area/security/detectives_office) "nXo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) +"nXR" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/glass/reinforced, +/area/main_map/hallway/deck1) +"nXT" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/obj/machinery/holoplant, +/obj/machinery/power/apc/high/north_mount, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/lab) "nYb" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -11146,8 +12396,22 @@ "nZH" = ( /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/lobby) +"oaw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "oaB" = ( -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_one) "oaM" = ( /obj/structure/cable/green{ @@ -11155,38 +12419,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"obN" = ( -/obj/structure/sink/kitchen{ - dir = 8; - name = "sink"; - pixel_x = 13 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/kitchen) -"obR" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/effect/floor_decal/techfloor/hole{ +"oaW" = ( +/obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/lab) -"ocd" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/medical/medbay) -"oco" = ( -/obj/landmark/spawnpoint/overflow/station, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "ocr" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/hop) +"ocC" = ( +/obj/machinery/appliance/cooker/grill, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/kitchen) "ocP" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/techmaint, @@ -11195,18 +12443,24 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"ocY" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"oda" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "odi" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_8) -"oeA" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oeC" = ( -/turf/simulated/floor/plating, -/area/security/tactical) "oeT" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11233,14 +12487,24 @@ /obj/structure/adherent_bath, /turf/simulated/floor/crystal, /area/space) +"ofT" = ( +/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 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "ogl" = ( /turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/briefingroom) -"ogt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/holofloor/tiled/dark, -/area/crew_quarters/bar) "ogG" = ( /turf/simulated/floor/reinforced, /area/security/riot_control) @@ -11259,6 +12523,17 @@ /obj/structure/railing, /turf/simulated/open, /area/rnd/robotics/mechbay) +"ohi" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 4; + name = "Fighter Hangar"; + req_one_access = list(1,19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rift/station/fighter_bay/hangar) "ohL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11268,15 +12543,15 @@ "oih" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"oir" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"oiy" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/light/no_nightshift{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "oiY" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -11296,6 +12571,15 @@ }, /turf/simulated/floor/reinforced, /area/space) +"ojk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "okA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11334,15 +12618,16 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"omH" = ( -/obj/machinery/door/airlock/sandstone{ - name = "Command Showers" +"omZ" = ( +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 24 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/space) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/security/warden) "onv" = ( /obj/structure/railing{ dir = 8 @@ -11370,11 +12655,22 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"oqR" = ( -/obj/machinery/holopad, +"opN" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck1/fore) +"oqF" = ( +/obj/machinery/door/airlock{ + name = "Internal Affairs"; + req_access = list(38) + }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/security/detectives_office) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officeb) "orj" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/maintenance/deck_one/port) @@ -11393,6 +12689,10 @@ "ort" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/hallway/deck1/fore) +"orw" = ( +/obj/item/chess/bqueen, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "orT" = ( /obj/structure/railing, /obj/structure/railing{ @@ -11410,16 +12710,9 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/forward/starboard) -"orW" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 1 - }, -/obj/machinery/camera/network/medbay, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +"orZ" = ( +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "osi" = ( /obj/machinery/suit_cycler{ req_access = null @@ -11431,7 +12724,7 @@ /area/maintenance/solars) "osx" = ( /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) "osD" = ( /obj/structure/table/steel, /obj/fiftyspawner/glass, @@ -11473,6 +12766,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"oug" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "ovz" = ( /turf/simulated/wall/r_wall, /area/main_map/Hangar_bay/deck1/a) @@ -11483,20 +12782,49 @@ /turf/simulated/floor/reinforced, /area/security/tactical) "owq" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"owN" = ( +/obj/machinery/door/airlock{ + name = "Internal Affairs"; + req_access = list(38) + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officea) +"owP" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area) "owQ" = ( /obj/structure/closet/lawcloset, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officea) -"oxz" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"oxj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) +"oxY" = ( +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "oys" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11510,43 +12838,18 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck1/fore) -"ozJ" = ( -/obj/machinery/door/airlock/glass, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officecommon) -"ozZ" = ( -/obj/structure/catwalk, -/obj/structure/handrail, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oAM" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oBU" = ( -/obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"oDt" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) +"oDG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 + dir = 6 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/maintenance/security/upper) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "oEe" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -11559,21 +12862,32 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"oEF" = ( -/obj/structure/bed/chair/office/light{ - dir = 4 +"oEv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/security/briefingroom) -"oFr" = ( -/turf/simulated/floor/wood, -/area/space) -"oGk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/area/security/security_lockerroom) +"oEB" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) +"oER" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 9 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"oFJ" = ( +/obj/structure/catwalk, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "oGO" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, @@ -11585,6 +12899,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) +"oHh" = ( +/obj/machinery/power/apc/critical/east_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) +"oHN" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/bridge/hallway) "oIq" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -11597,6 +12922,9 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) +"oIP" = ( +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) "oIS" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/glasses/hud/security, @@ -11617,10 +12945,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hydroponics) -"oJC" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) "oJX" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) @@ -11628,30 +12952,12 @@ /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/space) -"oLz" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mechbay"; - name = "Mech Bay" - }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = 6; - req_access = list(29,47); - req_one_access = list(47) - }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = -5; - req_access = list(29,47); - req_one_access = list(47) +"oKE" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/robotics/mechbay) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "oLZ" = ( /obj/machinery/door/airlock/glass/security{ name = "Light Armory"; @@ -11667,18 +12973,20 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"oMf" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/junction, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "oMm" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/holodeck_control) -"oMz" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mechbay"; - name = "Mech Bay" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/robotics/mechbay) "oMB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -11703,6 +13011,10 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) +"oNp" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck1) "oNv" = ( /obj/structure/sign/directions/bridge{ dir = 1 @@ -11738,6 +13050,20 @@ "oPo" = ( /turf/simulated/floor/glass/reinforced, /area/bridge/bunker) +"oPt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/lab) "oPS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -11751,21 +13077,6 @@ "oPU" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_one/aft/port) -"oQh" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24; - pixel_y = -5 - }, -/obj/structure/bed/chair/sofa/teal/left{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_3) "oQw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11778,19 +13089,16 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) -"oQE" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24; - pixel_y = -5 +"oRI" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/structure/bed/chair/comfy/blue, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/disposal/wall{ + dir = 1 }, -/mob/living/simple_mob/humanoid/clown, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_4) +/area/crew_quarters/bar) "oRS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -11814,16 +13122,6 @@ }, /turf/simulated/floor/carpet/gaycarpet, /area/crew_quarters/sleep/Dorm_7) -"oSj" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/reinforced/airless, -/area/space) -"oSp" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) "oSq" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/meter, @@ -11852,26 +13150,39 @@ "oSK" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_2) -"oUt" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +"oUf" = ( +/obj/machinery/door/airlock/medical{ + name = "Chemistry"; + req_one_access = list(33) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/door/firedoor/glass{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/medical/chemistry) "oUS" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/hor) -"oVy" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/plating, -/area/space) +"oVB" = ( +/obj/machinery/smartfridge/food{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"oVF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) "oVR" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -11904,6 +13215,16 @@ "oWs" = ( /turf/simulated/floor/plating, /area/medical/medbay) +"oZK" = ( +/obj/machinery/washing_machine, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"oZS" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "pad" = ( /obj/machinery/door/airlock/glass{ name = "Holodeck" @@ -11932,7 +13253,7 @@ /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) "pat" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11978,18 +13299,16 @@ }, /turf/simulated/floor/carpet, /area/security/warden) -"pcR" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"pdh" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/bed/chair/sofa/black/left{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "pdn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -12024,10 +13343,29 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"peB" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) +"peD" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 6 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/medical{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "peJ" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/brigdoor/southright{ @@ -12105,6 +13443,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"pif" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "piS" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/tiled/monotile, @@ -12121,12 +13466,32 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) +"pmi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "pnj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) +"pnl" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"pnO" = ( +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "pov" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = list(55); @@ -12134,6 +13499,30 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"poA" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"poE" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "ppG" = ( /obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/wood, @@ -12145,6 +13534,12 @@ /obj/structure/railing, /turf/simulated/open, /area/rnd/xenobiology/xenoflora_storage) +"pqV" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "prA" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -12158,6 +13553,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"prO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "prS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 8 @@ -12173,36 +13577,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/mechbay) -"psK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) -"psN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) -"puH" = ( -/obj/machinery/papershredder, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/tiled, -/area/medical/reception) -"pvd" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/surgery_hallway) "pvj" = ( /obj/structure/table/standard, /obj/item/paper{ @@ -12305,6 +13679,21 @@ }, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) +"pym" = ( +/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 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "pyo" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -12317,25 +13706,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"pyu" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/port) -"pyL" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "pzf" = ( /obj/structure/catwalk, /turf/simulated/open, @@ -12347,14 +13717,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"pzF" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"pAo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "pAI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -12388,6 +13762,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) +"pBW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "pCD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -12396,6 +13779,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "pCW" = ( @@ -12459,6 +13843,12 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/armoury) +"pGm" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/forward/starboard) "pGq" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -12469,12 +13859,13 @@ /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/tiled/white, /area/medical/reception) -"pHy" = ( -/obj/structure/railing{ - dir = 4 +"pGK" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_one/forward/starboard) "pIj" = ( /obj/landmark{ name = "lightsout" @@ -12498,6 +13889,9 @@ /obj/structure/flora/pottedplant/tall, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"pJd" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/rift/station/fighter_bay/hangar) "pKS" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/machinery/door/firedoor/multi_tile, @@ -12518,28 +13912,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"pOc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/forward/port) -"pOh" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/aft/starboard) -"pOo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "pPz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12565,11 +13937,7 @@ /obj/structure/table/reinforced, /obj/item/book/manual/legal/sop_vol2, /obj/item/book/manual/legal/sop_vol1, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) "pQm" = ( @@ -12581,18 +13949,27 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"pQn" = ( +/obj/structure/cable/green{ + icon_state = "32-2" + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "pQv" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) -"pRy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"pRN" = ( +/obj/structure/railing{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/railing, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "pTe" = ( /obj/random/medical, /obj/random/medical, @@ -12611,24 +13988,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"pTE" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/window/brigdoor/southleft{ - dir = 8; - name = "Security Reception" +"pTi" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 }, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/security/lobby) -"pTU" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/reinforced/outdoors, /area/space) "pUf" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -12640,9 +14005,22 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/medical/reception) +"pUm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "pUp" = ( /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) +"pUN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "pWk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12651,32 +14029,12 @@ "pWr" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"pWL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) -"pXE" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) "pYk" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/open, /area/maintenance/security/port) -"pYv" = ( -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/obj/structure/cable/heavyduty, -/turf/simulated/floor/reinforced/airless, -/area/space) "pYy" = ( /obj/structure/sink{ pixel_y = 22 @@ -12707,16 +14065,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"pZb" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"pZe" = ( +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -15 }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/kitchen) "pZE" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -12724,12 +14079,41 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"pZZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"qaA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) +"qaC" = ( +/obj/machinery/computer/timeclock/premade/east, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "qaG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"qaJ" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hallway/deck1/fore) "qaN" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/effect/floor_decal/corner/white/border{ @@ -12747,39 +14131,54 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"qcr" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/north, +"qbU" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) -"qcx" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) -"qcS" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/door/firedoor{ - dir = 2 +/area/main_map/maintenance/deck_one) +"qci" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"qdl" = ( -/obj/structure/railing{ +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"qcv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) +"qdl" = ( /obj/machinery/door/window/northleft, -/turf/simulated/floor/glass/reinforced, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) -"qdS" = ( -/obj/machinery/door/airlock/glass/security/polarized{ - id_tag = "detdoor"; - id_tint = "det_office"; - name = "Detective's Office"; - req_access = list(4) +"qdw" = ( +/obj/machinery/door/blast/regular{ + dir = 4 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/lino, -/area/security/detectives_office) +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/Hangar_bay/deck1) +"qdT" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "qek" = ( /obj/structure/table/hardwoodtable, /obj/item/paper_bin, @@ -12804,13 +14203,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"qfC" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "qfM" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/main_map/hallway/deck1/fore) @@ -12847,12 +14239,26 @@ /obj/item/material/knife/butch, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"qjv" = ( +"qiH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qju" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "qjL" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -12862,6 +14268,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"qkx" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "qkD" = ( /obj/machinery/atmospherics/portables_connector/fuel, /obj/machinery/portable_atmospherics/canister/phoron, @@ -12877,7 +14292,7 @@ /area/crew_quarters/sleep/Dorm_1) "qlB" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/heads/hos) "qlJ" = ( @@ -12889,16 +14304,12 @@ /obj/structure/flora/pottedplant/shoot, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) -"qmY" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, -/turf/simulated/floor/plating, -/area/space) "qne" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay_emt_bay) -"qof" = ( -/turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) +"qnA" = ( +/turf/simulated/wall, +/area/quartermaster/delivery) "qot" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/armoury) @@ -12923,6 +14334,15 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"qoN" = ( +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/main_map/maintenance/deck_one/aft/port) +"qoV" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "qpe" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -12933,48 +14353,16 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/chemistry) -"qqg" = ( -/obj/machinery/smartfridge, -/turf/simulated/wall, -/area/hydroponics) -"qqq" = ( -/obj/machinery/door/window/westright{ - dir = 4; - name = "Bar"; - req_access = list(25); - req_one_access = list(25) - }, -/obj/machinery/door/window/eastleft{ - dir = 8; - name = "Kitchen"; - req_one_access = list(28) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +"qpu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"qqz" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "qqH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "qqI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel, @@ -12983,6 +14371,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) +"qrv" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "qsJ" = ( /obj/machinery/atmospherics/pipe/tank{ dir = 4 @@ -12995,6 +14387,15 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) +"qti" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one/port) "quf" = ( /obj/structure/railing{ dir = 4 @@ -13010,6 +14411,12 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"quu" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "quX" = ( /obj/structure/sink{ dir = 8; @@ -13027,9 +14434,10 @@ /obj/random/bedsheet, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) -"qwr" = ( -/turf/simulated/floor/tiled/monotile, -/area/space) +"qvM" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "qws" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -13066,10 +14474,9 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) -"qye" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/medical/medbay) +"qzb" = ( +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "qAb" = ( /obj/structure/railing{ dir = 1 @@ -13079,6 +14486,20 @@ }, /turf/simulated/open, /area/maintenance/security/port) +"qAf" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/light/no_nightshift, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "qAk" = ( /obj/machinery/door/airlock/engineering{ name = "Hangar Substation" @@ -13089,6 +14510,18 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) +"qAC" = ( +/obj/structure/cable/green, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"qAV" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"qAZ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "qBt" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 1 @@ -13102,6 +14535,12 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"qBT" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "qCD" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/warden) @@ -13114,6 +14553,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"qDl" = ( +/obj/structure/sink{ + pixel_y = 22 + }, +/obj/structure/mirror{ + dir = 4; + pixel_y = 33 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) +"qDv" = ( +/turf/simulated/wall/prepainted/medical, +/area/main_map/hallway/deck1) "qDZ" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/red, @@ -13121,12 +14579,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/security/tactical) -"qEJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one) "qGh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -13150,31 +14602,17 @@ /obj/machinery/appliance/cooker/fryer, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"qHB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/machinery/conveyor{ - dir = 4 - }, -/obj/map_helper/conveyor/belt{ - id_tag = "cargo_mailroom"; - name = "Cargo Mail belt" +"qGY" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Atmospherics"; + req_access = list(24) }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) +"qHF" = ( +/obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) -"qHI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/quartermaster/delivery) "qHN" = ( /obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite{ @@ -13191,25 +14629,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/security/lobby) -"qJr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area) -"qJL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "qKB" = ( /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) -"qKW" = ( -/turf/simulated/wall/r_wall, -/area/main_map/maintenance/atmospheric_substation/medical) "qLP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -13219,18 +14641,27 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"qLX" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/briefingroom) "qMn" = ( /obj/structure/bed/chair/comfy/teal{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) -"qMA" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +"qMJ" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "qMK" = ( /obj/fiftyspawner/glass, /obj/fiftyspawner/glass, @@ -13238,13 +14669,7 @@ /obj/structure/table/steel, /obj/item/tool/wrench, /turf/simulated/floor/airless/ceiling, -/area/maintenance/solars) -"qMQ" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) +/area/space) "qNT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -13264,19 +14689,29 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"qPx" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "qPG" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(30,47,77) }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) -"qPO" = ( -/obj/structure/marker_beacon/red, -/turf/simulated/floor/reinforced/airless, -/area/space) "qPR" = ( /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"qQe" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "qQh" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -13284,6 +14719,20 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"qQL" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"qQN" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "qRq" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -13311,14 +14760,6 @@ }, /turf/simulated/floor/wood, /area/bridge/hallway) -"qRz" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) "qSq" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -13347,6 +14788,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"qVc" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qVQ" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/firedoor/multi_tile, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "qWs" = ( /obj/structure/table/marble, /obj/machinery/microwave, @@ -13358,12 +14812,53 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1) -"qXI" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 +"qWW" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/machinery/light/no_nightshift{ + dir = 4 }, -/turf/simulated/floor/carpet, -/area/crew_quarters/heads/hop) +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"qWZ" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_one/aft/port) +"qXa" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) +"qXB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/crew_quarters/bar) "qYb" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -13379,15 +14874,36 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/main_map/Hangar_bay/deck1/a) -"qZW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"qYm" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) +"qYq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"qZw" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled, +/area/security/security_equiptment_storage) +"rat" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/main_map/Hangar_bay/deck1; + base_turf = /turf/simulated/floor/reinforced; + landmark_tag = "escape_station"; + name = "Escape Shuttle Euthenia" + }, +/turf/simulated/floor/reinforced, +/area/main_map/Hangar_bay/deck1) "raE" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -13416,21 +14932,15 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"rdj" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "rdI" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_one/starboard) -"rdN" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/holodeck_control) "rel" = ( /obj/structure/railing{ dir = 4 @@ -13444,19 +14954,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics) -"rez" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"reA" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock101"; - name = "Toilet 2" +"rfm" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/open, +/area/main_map/maintenance/deck_one) +"rfA" = ( +/obj/structure/closet/secure_closet/hos, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/heads/hos) "rgs" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -13465,12 +14972,10 @@ /obj/machinery/smartfridge/drinks, /turf/simulated/wall, /area/crew_quarters/bar_backroom) -"rhm" = ( -/obj/machinery/camera/network/medbay{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/medical/medbay) +"ric" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/lab) "riq" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck1/a) @@ -13485,7 +14990,7 @@ /turf/simulated/floor/airless, /area/space) "riy" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -13518,9 +15023,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) -"rkk" = ( -/turf/simulated/floor/tiled/white, -/area/space) +"rkp" = ( +/obj/item/chess/wqueen, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "rkK" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -13535,6 +15041,23 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) +"rkO" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) +"rlz" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/solar, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rlV" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "solar_dock"; @@ -13548,6 +15071,18 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/maintenance/solars) +"rlW" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/heads/hor) +"rmS" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "rnD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -13564,6 +15099,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) "rpT" = ( @@ -13577,15 +15113,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"rqc" = ( -/obj/effect/floor_decal/techfloor{ - dir = 5 - }, -/obj/machinery/holoplant, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/north_bump, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/lab) "rqo" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -13600,29 +15127,13 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"rqS" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 5 - }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 - }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 +"rtf" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "rtx" = ( /obj/machinery/computer/robotics, /obj/effect/floor_decal/corner/purple{ @@ -13633,37 +15144,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"ruc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"ruS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/rnd/research/researchdivision) "ruW" = ( /obj/structure/table, /turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) -"rvm" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"rvu" = ( -/obj/landmark/spawnpoint/job/xenobotanist, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "rws" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -13704,6 +15188,18 @@ /obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled, /area/medical/surgery2) +"rwX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "rxc" = ( /obj/structure/closet/secure_closet/medical3, /obj/effect/floor_decal/industrial/outline/blue, @@ -13715,22 +15211,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"rxD" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/space) "rxT" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -13738,16 +15223,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"ryG" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 33 - }, -/turf/simulated/floor/tiled/white, -/area/space) +"ryY" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "rzB" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -13771,6 +15250,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"rAC" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mechbay"; + name = "Mech Bay" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/robotics/mechbay) "rBT" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -13794,22 +15281,24 @@ }, /obj/item/storage/firstaid/adv, /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"rBZ" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/security/upper) "rDl" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"rEi" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-8" +"rDD" = ( +/obj/structure/cable/green{ + icon_state = "0-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "rEB" = ( /obj/structure/table/rack/steel, /obj/structure/window/reinforced{ @@ -13837,29 +15326,12 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"rEI" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_9) -"rFO" = ( -/obj/machinery/holopad, -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) -"rGc" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 1 +"rFf" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/port) +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "rHa" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -13872,23 +15344,12 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/starboard) "rHt" = ( /obj/landmark/spawnpoint/job/chef, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"rIz" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/port) -"rJq" = ( -/obj/structure/bed/chair/comfy/orange{ - dir = 4 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_6) "rJs" = ( /obj/structure/grille, /obj/structure/girder/reinforced, @@ -13901,11 +15362,6 @@ }, /turf/simulated/floor/plating, /area/medical/medbay) -"rKf" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) "rKn" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -13937,14 +15393,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) -"rLF" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "armorylight"; - name = "Light Armory Acccess" - }, -/turf/simulated/floor/reinforced, -/area/security/armoury) "rMT" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -13973,6 +15421,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"rNF" = ( +/obj/landmark/spawnpoint/overflow/station, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/Hangar_bay/deck1) "rOn" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14088,17 +15540,47 @@ "rWs" = ( /obj/machinery/light/small, /turf/simulated/floor/airless, -/area/maintenance/solars) +/area/space) +"rWu" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/obj/machinery/camera/network/medbay, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "rWS" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"rXj" = ( +/obj/structure/bed/chair/comfy/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_1) "rXs" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"rYF" = ( +/obj/structure/noticeboard{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "rZZ" = ( /obj/machinery/atmospherics/valve/open{ dir = 4; @@ -14117,12 +15599,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/forward/starboard) -"scw" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2-4-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "scJ" = ( /obj/structure/table/steel_reinforced, /obj/item/defib_kit/loaded{ @@ -14141,17 +15617,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"scS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"sde" = ( -/obj/machinery/cryopod/robot/door/shuttle, -/turf/simulated/floor/tiled/techmaint, -/area/space) "sdf" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -14175,6 +15640,13 @@ /obj/item/storage/box/beakers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"sdW" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "sft" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -14182,6 +15654,15 @@ /obj/landmark/spawnpoint/job/detective, /turf/simulated/floor/carpet, /area/security/detectives_office) +"sfx" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "siz" = ( /obj/machinery/deployable/barrier, /obj/effect/floor_decal/corner/blue/full{ @@ -14215,10 +15696,25 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/main_map/Hangar_bay/deck1/a) -"sll" = ( -/obj/structure/disposalpipe/sortjunction/untagged/flipped, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/port) +"skp" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"sks" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"sky" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "sly" = ( /obj/machinery/door/airlock/glass/research{ name = "Xenoflora Research"; @@ -14258,22 +15754,21 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"soC" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/bed/chair/comfy/beige{ - dir = 8 +"sob" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/wall, +/area/main_map/maintenance/deck_one/port) +"spj" = ( +/obj/structure/sink{ + pixel_y = 22 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"spg" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/mirror{ + dir = 4; + pixel_y = 33 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "spk" = ( /obj/structure/filingcabinet, /turf/simulated/floor/wood, @@ -14289,6 +15784,22 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/substation/command) +"sqt" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "sqC" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -14302,16 +15813,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"sqY" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) "sre" = ( /obj/structure/railing/grey{ dir = 8 @@ -14321,30 +15822,22 @@ }, /turf/simulated/floor/crystal, /area/space) -"srv" = ( -/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/red, -/area/tether/surfacebase/security/lobby) -"srO" = ( -/obj/structure/railing{ +"ssy" = ( +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +/turf/simulated/floor/airless/ceiling, +/area/space) "ssY" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) +"stN" = ( +/obj/structure/table/marble, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "swc" = ( /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/techfloor, @@ -14381,6 +15874,15 @@ /obj/machinery/botany/extractor, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"sxK" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "syo" = ( /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 4 @@ -14444,19 +15946,16 @@ "sCK" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/forward/port) -"sDo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"sCY" = ( +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck1/fore) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) +"sDn" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "sEf" = ( /obj/structure/table/rack/steel, /obj/structure/window/reinforced, @@ -14485,6 +15984,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"sEn" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "sFq" = ( /obj/machinery/recharger/wallcharger{ pixel_x = -22 @@ -14515,14 +16018,6 @@ "sGy" = ( /turf/simulated/open, /area/tether/surfacebase/security/hallway) -"sGJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "sGW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -14530,6 +16025,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/warden) +"sIE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "sJc" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -14573,6 +16074,16 @@ /obj/machinery/appliance/cooker/oven, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"sKm" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1) "sMN" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/catwalk, @@ -14580,7 +16091,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/hallway/deck1) "sMU" = ( /obj/structure/flora/pottedplant/largebush, @@ -14605,6 +16116,16 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) +"sNR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "sOK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -14634,7 +16155,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) "sQu" = ( @@ -14645,12 +16166,20 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/dark, /area/security/warden) +"sRa" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "sRV" = ( /obj/machinery/door/airlock/glass/security{ id_tag = "detdoor"; @@ -14665,24 +16194,29 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/security/forensics) -"sSs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"sSM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/lab) "sTr" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/solars) -"sUR" = ( -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/security/port) "sVe" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/riot_control) +"sVt" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) "sVE" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -14696,12 +16230,43 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"sWj" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) "sWI" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -14711,12 +16276,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_one/port) -"sYi" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) "sYj" = ( /obj/machinery/door/airlock/glass/security{ name = "Observation"; @@ -14725,6 +16284,28 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/security/hallway) +"sYv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"sYA" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "sYI" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/main_map/hallway/deck1/fore) @@ -14754,10 +16335,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"sZd" = ( -/obj/structure/bed/chair/comfy/brown, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "sZh" = ( /obj/machinery/mech_recharger, /obj/machinery/camera/motion/security{ @@ -14765,10 +16342,6 @@ }, /turf/simulated/floor/reinforced, /area/security/tactical) -"sZJ" = ( -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/space) "sZY" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -14786,9 +16359,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_4) -"tai" = ( -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) "tay" = ( /obj/structure/table/steel_reinforced, /obj/item/stack/nanopaste{ @@ -14797,6 +16367,13 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/dark, /area/medical/medbay) +"taF" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) "taY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14810,12 +16387,6 @@ /obj/structure/bed/chair/sofa/blue/corner, /turf/simulated/floor/carpet/arcadecarpet, /area/main_map/maintenance/deck_one/port) -"tcC" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "tdp" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Solar Farm - SMES 1" @@ -14825,6 +16396,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/solars) +"tdu" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/monowhite, +/area/main_map/maintenance/deck_one/starboard) "tdE" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -14913,6 +16488,15 @@ /obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/Hangar_bay/deck1/a) +"thb" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "thD" = ( /obj/structure/table/woodentable, /obj/item/book/manual/standard_operating_procedure, @@ -14930,7 +16514,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "tim" = ( /turf/simulated/wall/r_wall, @@ -14987,6 +16571,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) +"tlO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "tmc" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15022,6 +16612,12 @@ /obj/structure/window/basic, /turf/simulated/open, /area/crew_quarters/bar) +"tmB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "tnf" = ( /obj/structure/filingcabinet, /obj/machinery/light/no_nightshift{ @@ -15029,10 +16625,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officeb) -"tnz" = ( -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) "tnL" = ( /obj/structure/sign/directions/medical, /obj/structure/sign/directions/engineering{ @@ -15050,12 +16642,17 @@ /turf/simulated/floor/wood, /area/bridge/hallway) "toK" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) +"tpE" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/starboard) "tqf" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 1 @@ -15065,15 +16662,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"tqx" = ( -/obj/structure/sign/department/armory{ - pixel_y = 32 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +"tsi" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/turf/simulated/floor/tiled/red, -/area/space) +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "tti" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -15093,11 +16688,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"ttC" = ( -/obj/effect/floor_decal/corner/mauve/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor/grid, -/area/rnd/lab) "ttV" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -15120,12 +16710,22 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, /turf/simulated/open, /area/crew_quarters/kitchen) -"tvI" = ( -/obj/structure/sign/greencross, -/turf/simulated/wall/prepainted/medical, -/area/medical/medbay) +"tvw" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck1) +"tvL" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "twi" = ( /obj/item/suit_cooling_unit{ pixel_y = -5 @@ -15169,6 +16769,15 @@ }, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) +"twy" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "txe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -15178,6 +16787,37 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"txV" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) +"tye" = ( +/obj/machinery/door/airlock/glass_external/public, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck1) +"tyw" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"tza" = ( +/obj/machinery/door/airlock/sandstone{ + name = "Command Showers" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/bridge/hallway) "tzW" = ( /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -15185,6 +16825,9 @@ /obj/structure/ladder, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/port) +"tAa" = ( +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "tAj" = ( /obj/structure/sign/deck1{ pixel_x = 32 @@ -15204,7 +16847,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/heads/cmo) "tBJ" = ( @@ -15231,6 +16874,13 @@ }, /turf/simulated/floor/plating, /area/medical/medbay_emt_bay) +"tCA" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "tCK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, @@ -15276,13 +16926,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"tFf" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, -/area/medical/reception) "tFr" = ( /obj/structure/table/hardwoodtable, /obj/item/flashlight/lamp{ @@ -15290,18 +16933,29 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/tether/surfacebase/security/iaa/officeb) -"tGW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"tGS" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/disposaloutlet{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "tHh" = ( /turf/simulated/floor/wood, /area/crew_quarters/bar) +"tHw" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/security/detectives_office) "tHR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -15309,8 +16963,20 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"tIV" = ( +/obj/structure/bed/chair/wheelchair/dolly{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/starboard) +"tJe" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/turf/simulated/floor/lino, +/area/security/detectives_office) "tJt" = ( /turf/simulated/wall/r_wall, /area/security/warden) @@ -15330,12 +16996,76 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"tKY" = ( +/obj/machinery/door/airlock/glass/medical{ + id_tag = "MedbayFoyer"; + name = "Treatment Center" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "tLm" = ( /obj/machinery/camera/motion/security{ dir = 8 }, /turf/space, /area/space) +"tMe" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) +"tMp" = ( +/obj/machinery/door/airlock/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/bar) +"tMv" = ( +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/lino, +/area/security/detectives_office) +"tMx" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) +"tMz" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "tMD" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -15367,6 +17097,10 @@ }, /turf/simulated/floor/crystal, /area/space) +"tPa" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "tPj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, @@ -15474,10 +17208,6 @@ }, /turf/simulated/floor/tiled/red, /area/tether/surfacebase/security/lobby) -"tSb" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor/plating, -/area/space) "tSd" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/map_helper/airlock/atmos/chamber_pump, @@ -15497,10 +17227,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"tSm" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "tUH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -15510,6 +17236,23 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"tUX" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/obj/machinery/turnstile{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "tVx" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -15526,12 +17269,6 @@ "tVC" = ( /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) -"tVX" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "tWe" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15545,6 +17282,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"tWF" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "tWN" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/surgery, @@ -15554,10 +17295,6 @@ /obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"tXs" = ( -/obj/machinery/vending/nifsoft_shop, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/bar) "tYO" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15575,20 +17312,32 @@ }, /turf/simulated/floor/tiled, /area/medical/reception) -"tZN" = ( -/obj/machinery/door/airlock/maintenance, -/obj/map_helper/network_builder/power_cable/green/auto, +"tZG" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/aft/port) -"uaP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/area/tether/surfacebase/security/hallway) +"tZK" = ( +/obj/structure/cable/green{ + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"uaF" = ( +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/port) +/area/quartermaster/delivery) "uaR" = ( /obj/structure/sign/deck/first, /turf/simulated/wall/prepainted/civilian, @@ -15612,7 +17361,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "ubn" = ( @@ -15645,6 +17394,29 @@ "ucz" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_one/port) +"ucA" = ( +/obj/effect/floor_decal/corner/paleblue/bordercee{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"ucC" = ( +/obj/structure/filingcabinet/tall, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/security/lobby) "ucH" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, @@ -15660,6 +17432,24 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) +"uda" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/lobby) "udq" = ( /obj/structure/table/rack/shelf/steel, /obj/item/gun/energy/taser, @@ -15673,10 +17463,15 @@ /obj/item/melee/baton/loaded, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"uei" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"udA" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, /turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) +"udV" = ( +/turf/simulated/floor/reinforced/outdoors, /area/space) "ueD" = ( /turf/simulated/wall/prepainted/engineering, @@ -15688,6 +17483,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"ueW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "ufm" = ( /obj/machinery/computer/prisoner{ dir = 1 @@ -15761,6 +17565,13 @@ "uig" = ( /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/captain) +"uka" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "ukl" = ( /obj/machinery/ai_status_display{ pixel_y = 32 @@ -15796,21 +17607,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"ukO" = ( +/obj/machinery/holopad, +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) +"ukP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/security/iaa/officea) +"ulz" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole/right, +/obj/effect/floor_decal/techfloor/hole, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "umo" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"umz" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "umB" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officea) @@ -15883,6 +17703,31 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) +"uoU" = ( +/obj/machinery/door/window/brigdoor/southleft{ + dir = 8; + name = "Security Reception" + }, +/obj/structure/table/steel, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"upt" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/main_map/hallway/deck1/fore) "upV" = ( /obj/machinery/recharge_station, /obj/machinery/light/no_nightshift, @@ -15920,24 +17765,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/crew_quarters/bar) -"usl" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) -"usz" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/shower{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/space) "usE" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -15959,6 +17786,30 @@ /obj/machinery/suit_storage_unit/medic, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"usR" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mechbay"; + name = "Mech Bay" + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = 6; + req_access = list(29,47); + req_one_access = list(47) + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = -5; + req_access = list(29,47); + req_one_access = list(47) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/robotics/mechbay) "utf" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -15969,19 +17820,8 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"uti" = ( -/obj/structure/table/marble, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) -"utj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "utn" = ( -/obj/machinery/power/apc/critical/south_bump, +/obj/machinery/power/apc/critical/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -16007,6 +17847,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"uwq" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/wall/prepainted/civilian, +/area/holodeck_control) "uxD" = ( /obj/machinery/vending/blood, /turf/simulated/floor/tiled/dark, @@ -16048,6 +17894,30 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/command) +"uAb" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/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 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "uAq" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/door/blast/shutters{ @@ -16082,34 +17952,49 @@ "uBX" = ( /obj/structure/table/marble, /obj/item/retail_scanner/civilian, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "bar"; + name = "Bar counter shutters"; + pixel_x = -24; + pixel_y = 10 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) "uCf" = ( /obj/machinery/vending/cola, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) -"uCs" = ( -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) "uCC" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/security/port) -"uDl" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +"uDw" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) +/obj/effect/floor_decal/spline/plain, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "uDy" = ( /obj/machinery/computer/ship/navigation{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"uDN" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "uDX" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_9) @@ -16132,16 +18017,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) -"uEQ" = ( -/obj/structure/bed/chair/comfy/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/mob/living/simple_mob/humanoid/clown, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_1) "uFv" = ( /obj/structure/table/rack/shelf/steel, /obj/item/gun/energy/laser, @@ -16157,54 +18032,12 @@ /obj/item/retail_scanner/medical, /turf/simulated/floor/tiled, /area/medical/reception) -"uGa" = ( -/turf/simulated/floor/tiled/steel_grid, -/area/space) -"uGe" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"uGi" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) -"uGj" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/noticeboard{ - dir = 4; - pixel_x = -32 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) "uGn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/security/lobby) -"uHi" = ( -/obj/machinery/holopad, -/turf/simulated/floor/lino, -/area/main_map/maintenance/deck_one/aft/port) "uHB" = ( /obj/structure/railing{ dir = 4 @@ -16219,10 +18052,13 @@ /obj/structure/closet/crate/corporate/nanotrasen, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"uIm" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/forward/port) +"uIo" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "uIq" = ( /obj/structure/closet/wardrobe/red, /obj/effect/floor_decal/industrial/outline/yellow, @@ -16285,6 +18121,11 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"uKi" = ( +/obj/structure/table/woodentable, +/obj/item/paper_bin, +/turf/simulated/floor/lino, +/area/security/detectives_office) "uKM" = ( /obj/structure/ladder, /obj/structure/bookcase, @@ -16295,12 +18136,18 @@ icon_state = "1-2" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/carpet, /area/security/warden) -"uMn" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/space) +"uMf" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "uNR" = ( /obj/machinery/computer/operating{ dir = 4 @@ -16313,8 +18160,7 @@ /area/main_map/maintenance/deck_one/port) "uQj" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/defib_kit/loaded, @@ -16343,6 +18189,12 @@ }, /turf/simulated/floor/plating, /area/medical/reception) +"uRc" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "uRi" = ( /obj/structure/sign/directions/medical{ dir = 4; @@ -16383,6 +18235,15 @@ /obj/structure/sign/warning/caution, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora_storage) +"uTa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "uTg" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/hor) @@ -16459,35 +18320,20 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"vbQ" = ( +/obj/structure/table/marble, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/chemical_dispenser/catering/bar_soft, +/turf/simulated/floor/wood, +/area/crew_quarters/bar_backroom) "vbU" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) -"vcD" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 1 - }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) -"vdj" = ( -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/medical/surgery2) "vdr" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ @@ -16533,12 +18379,16 @@ }, /area/holodeck_control) "vfz" = ( -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) +"vfS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1/fore) "vgc" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) @@ -16586,21 +18436,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"vhG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/lobby) -"vhU" = ( -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_one/aft/port) "viM" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -16637,6 +18472,11 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_one/starboard) +"vjr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "vjE" = ( /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, @@ -16652,32 +18492,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) -"vkf" = ( -/obj/machinery/door/airlock/glass/medical{ - id_tag = "MedbayFoyer"; - name = "Treatment Center" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/reception) -"vkl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"vkG" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1) +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/Hangar_bay/deck1) "vkV" = ( /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/chemistry) @@ -16708,6 +18529,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora) +"vmt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) "vmy" = ( /obj/structure/railing{ dir = 8 @@ -16717,6 +18551,13 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"vmT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "vns" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16727,22 +18568,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) -"vnT" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, +"voh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay) -"von" = ( -/obj/structure/cable/green, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"voS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "voW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -16750,7 +18597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "vpq" = ( /obj/structure/cable/heavyduty{ @@ -16761,6 +18608,26 @@ }, /turf/simulated/floor/reinforced, /area/space) +"vpH" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) +"vpO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science"; + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/lab) "vqk" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/masks{ @@ -16786,12 +18653,11 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay) "vql" = ( -/obj/machinery/power/apc/direction_bump/north, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "2-8" }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/security/upper) @@ -16825,39 +18691,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"vsX" = ( -/obj/structure/catwalk, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "vsZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/security_equiptment_storage) -"vtd" = ( -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 5 - }, -/obj/machinery/door/airlock/glass{ - name = "Medbay Lobby" +"vtk" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/medical/reception) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "vtL" = ( /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, @@ -16913,6 +18757,21 @@ }, /turf/simulated/floor/tiled, /area/medical/reception) +"vvk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) "vvO" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/tiled, @@ -16933,6 +18792,11 @@ /obj/landmark/spawnpoint/job/head_nurse, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) +"vwZ" = ( +/obj/structure/railing, +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/glass/reinforced, +/area/hydroponics) "vxh" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -16960,12 +18824,29 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) -"vze" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +"vzn" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0; + dir = 4 }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"vzt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/aft/port) +/area/main_map/hallway/deck1/fore) +"vzz" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "vzP" = ( /obj/structure/closet/walllocker/emerglocker/north, /obj/effect/floor_decal/corner/white/border{ @@ -16977,11 +18858,10 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_one/port) -"vBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +"vBd" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/delivery) "vCf" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/landmark{ @@ -17007,12 +18887,30 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"vEd" = ( +/obj/machinery/smartfridge{ + dir = 8 + }, +/turf/simulated/wall, +/area/hydroponics) +"vEK" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1) "vEL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) +"vEM" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/rift/station/fighter_bay/hangar) "vEY" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -17025,16 +18923,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"vFe" = ( -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy{ - dir = 1 +"vFn" = ( +/obj/structure/railing{ + dir = 4 }, -/obj/effect/mist, -/turf/simulated/floor/water/pool, -/area/space) +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "vFR" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/meter, @@ -17050,29 +18944,9 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"vIq" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "armoryriot"; - name = "Emergency Armory Access" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/security/riot_control) -"vIA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/west, -/turf/simulated/floor/reinforced, -/area/security/tactical) +"vGQ" = ( +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) "vJd" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -17083,25 +18957,23 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) +"vJe" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armoryriot"; + name = "Emergency Armory Access" + }, +/turf/simulated/floor/reinforced, +/area/security/riot_control) "vJv" = ( /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/security/hallway) -"vJy" = ( +"vJA" = ( +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/solar, -/turf/simulated/floor/reinforced/airless, -/area/space) -"vJO" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/purcarpet, +/turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) "vKi" = ( /obj/structure/cable{ @@ -17157,8 +19029,7 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -17173,7 +19044,7 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/maintenance/solars) -"vNv" = ( +"vNm" = ( /obj/structure/railing{ dir = 1 }, @@ -17181,7 +19052,7 @@ dir = 1 }, /turf/simulated/open, -/area/space) +/area/tether/surfacebase/security/lobby) "vNx" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -17197,41 +19068,23 @@ /obj/random/bedsheet/double, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) -"vPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) +"vOO" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_one/aft/port) "vPi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck1/fore) -"vPy" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) -"vPC" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/window/westright{ - name = "Bar"; - req_access = list(25); - req_one_access = list(25) +"vPu" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock100"; + name = "Toilet 1" }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "vPE" = ( /turf/simulated/floor/glass/reinforced, /area/tether/surfacebase/security/hallway) @@ -17244,6 +19097,26 @@ icon_state = "techmaint" }, /area/holodeck_control) +"vPY" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/hallway) +"vQe" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"vQI" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) "vQP" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -17268,6 +19141,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"vRw" = ( +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24; + pixel_y = -5 + }, +/obj/structure/bed/chair/comfy/blue, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_4) "vRx" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -17295,27 +19180,12 @@ }, /turf/simulated/floor/glass/reinforced, /area/bridge/bunker) -"vSw" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -22 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/riot_control) "vTl" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) -"vTH" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "vUe" = ( /obj/machinery/atmospherics/pipe/zpipe/down/supply{ dir = 1 @@ -17359,6 +19229,19 @@ /obj/machinery/microscope, /turf/simulated/floor/tiled/white, /area/security/forensics) +"vUJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"vUL" = ( +/obj/structure/railing, +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vUX" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/security/iaa/officecommon) @@ -17398,7 +19281,7 @@ name = "Bridge Lockdown"; opacity = 0 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/bridge/bunker) "vXp" = ( /obj/effect/floor_decal/borderfloor{ @@ -17415,17 +19298,9 @@ "vXI" = ( /turf/simulated/wall/prepainted/medical, /area/medical/reception) -"vYy" = ( -/turf/simulated/floor/plating, -/area/space) -"vYK" = ( -/obj/machinery/door/airlock/glass/security{ - name = "Warden's Office"; - req_access = list(3) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/security/warden) +"vZd" = ( +/turf/simulated/floor/tiled, +/area/crew_quarters/bar) "vZf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/effect/floor_decal/techfloor/corner{ @@ -17443,20 +19318,6 @@ }, /turf/simulated/open, /area/bridge/bunker) -"vZt" = ( -/obj/machinery/door/airlock{ - name = "Internal Affairs"; - req_access = list(38) - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/tether/surfacebase/security/iaa/officeb) -"vZK" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/main_map/hallway/deck1/fore) "was" = ( /obj/structure/catwalk, /obj/structure/ladder, @@ -17493,6 +19354,19 @@ "wbY" = ( /turf/simulated/floor/glass/reinforced, /area/medical/medbay) +"wcc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"wch" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "wdu" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/railing{ @@ -17520,6 +19394,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1) +"weS" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wfe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -17530,14 +19410,21 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/armoury) +"wgP" = ( +/obj/machinery/button/remote/airlock{ + id = "bathroomlock101"; + name = "Bathroom Lock"; + pixel_x = -20; + pixel_y = -20; + specialfunctions = 4 + }, +/obj/structure/toilet, +/turf/simulated/floor/tiled/white, +/area/bridge/hallway) "whe" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/portables_connector, @@ -17607,6 +19494,12 @@ name = "Holodeck Projector Floor" }, /area/holodeck/alphadeck) +"wiR" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/heads/hos) "wjk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -17620,15 +19513,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"wjA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/space) "wjN" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -17643,27 +19527,10 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"wkY" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/warden) -"wlo" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"wmf" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/lattice, -/obj/structure/sign/deck1{ - pixel_y = -32 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_one/forward/port) +"wlt" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck1) "wmo" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -17673,6 +19540,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) +"wmA" = ( +/turf/simulated/open, +/area/main_map/Hangar_bay/deck1) "wmH" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, @@ -17686,16 +19556,18 @@ "wnD" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay_emt_bay) -"wnS" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_one/forward/port) "wor" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = -32 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) +"wou" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/port) "woI" = ( /obj/structure/bookcase/legal/corpreg, /obj/item/book/manual/legal/cr_vol1, @@ -17723,7 +19595,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck1/fore) "wpA" = ( @@ -17776,10 +19648,30 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/aft/starboard) +"wtb" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wtd" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/forward/port) +"wtR" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "armorytactical"; + name = "Tactical Armory Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/security/tactical) "wtT" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -17794,38 +19686,38 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) -"wun" = ( -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/turnstile{ - dir = 8 +"wvm" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/security/lobby) +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wvu" = ( /obj/structure/sign/greencross, /turf/simulated/wall/prepainted/medical, /area/medical/reception) -"wwz" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"wwI" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/wood, +/area/rift/station/fighter_bay/hangar) +"wwS" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/forward/starboard) +"wxg" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/main_map/Hangar_bay/deck1) "wxQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -17838,18 +19730,6 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/surgery_hallway) -"wyb" = ( -/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/red, -/area/tether/surfacebase/security/hallway) "wyj" = ( /obj/machinery/atmospherics/component/unary/freezer{ icon_state = "freezer" @@ -17865,16 +19745,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"wyq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "wyy" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_one/aft/port) @@ -17931,6 +19801,22 @@ "wCD" = ( /turf/simulated/wall, /area/crew_quarters/recreation_area) +"wCF" = ( +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/obj/structure/cable/heavyduty{ + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"wCG" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wCI" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -17944,20 +19830,6 @@ /obj/landmark/spawnpoint/job/detective, /turf/simulated/floor/carpet, /area/security/detectives_office) -"wCM" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/obj/structure/table/standard, -/obj/random/soap, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/space) -"wDN" = ( -/turf/simulated/floor/tiled, -/area/medical/medbay) "wEc" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -17970,6 +19842,13 @@ "wEl" = ( /turf/simulated/floor/wood, /area/bridge/hallway) +"wES" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/obj/machinery/media/jukebox, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wFy" = ( /obj/structure/closet{ name = "Evidence Closet" @@ -17979,6 +19858,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/forensics) +"wHl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "wHz" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17992,33 +19880,41 @@ }, /turf/simulated/floor/carpet, /area/security/warden) -"wIf" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/beige{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +"wHU" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one/aft/port) "wIk" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) -"wJj" = ( -/obj/machinery/door/firedoor{ - dir = 2 +"wJp" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck1/fore) +"wJO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"wJm" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/space) +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced, +/area/security/tactical) "wKw" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"wKE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "wKM" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18052,45 +19948,103 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/surgery) +"wLg" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) "wLA" = ( /obj/structure/railing{ dir = 1 }, /turf/space, /area/space) -"wLS" = ( -/obj/machinery/button/remote/airlock{ - id = "bathroomlock101"; - name = "Bathroom Lock"; - pixel_x = -20; - pixel_y = -20; - specialfunctions = 4 +"wLJ" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/machinery/shower{ + dir = 4 }, -/obj/structure/toilet, /turf/simulated/floor/tiled/white, -/area/space) +/area/bridge/hallway) +"wMn" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "wMA" = ( /turf/simulated/wall{ can_open = 1 }, /area/main_map/maintenance/deck_one) +"wMF" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"wMH" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) +"wMW" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "BrigFoyer"; + req_one_access = list(38,63); + name = "Security"; + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/briefingroom) +"wNe" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "wNm" = ( /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) +"wNJ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"wOY" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "wPj" = ( /obj/structure/table/steel, /obj/item/folder/red, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"wPm" = ( -/obj/structure/table/marble, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) "wPB" = ( /turf/simulated/open, /area/main_map/maintenance/deck_one/port) @@ -18098,6 +20052,22 @@ /obj/item/stool/padded, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/bar) +"wQf" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) "wQG" = ( /turf/space/basic, /area/space) @@ -18123,13 +20093,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"wRC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"wRV" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/chair/comfy/black{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "wSp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18164,8 +20134,12 @@ /obj/machinery/door/firedoor/glass{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/hallway/deck1/fore) +"wST" = ( +/obj/structure/marker_beacon/red, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "wTD" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -18181,6 +20155,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) +"wUy" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled, +/area/rnd/research_foyer) +"wUA" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "wUW" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, @@ -18198,6 +20185,12 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) +"wXR" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/port) "wYi" = ( /obj/effect/floor_decal/corner/white/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18213,17 +20206,36 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/solars) -"wZd" = ( -/obj/structure/table/marble, -/obj/structure/table/marble, -/turf/simulated/floor/wood, -/area/crew_quarters/bar_backroom) -"xaj" = ( +"wZo" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/medical/surgery_hallway) +"wZw" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) +"wZM" = ( +/obj/structure/railing{ + dir = 1 + }, /obj/structure/railing{ dir = 4 }, -/turf/simulated/open, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"xan" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/purcarpet, +/area/crew_quarters/bar) "xbv" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -18284,6 +20296,11 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_5) +"xdn" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/lino, +/area/security/detectives_office) "xdy" = ( /obj/machinery/door/firedoor/glass, /obj/structure/table/reinforced, @@ -18326,6 +20343,41 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) +"xhM" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + id = "MedbayFoyer"; + name = "Door Switch"; + pixel_x = 27; + pixel_y = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/white, +/area/medical/medbay) +"xid" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "armoryriot"; + name = "Emergency Armory Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/security/riot_control) "xiN" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -18358,21 +20410,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) -"xjP" = ( -/obj/machinery/door/airlock/glass/medical{ - id_tag = "MedbayEmergency"; - name = "Medbay Emergency Access" - }, -/obj/machinery/door/blast/shutters{ - density = 0; +"xkQ" = ( +/obj/machinery/atmospherics/component/binary/pump{ dir = 4; - icon_state = "shutter0"; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0 + name = "Port to Isolation" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/medical/medbay) +/area/rnd/xenobiology/xenoflora_storage) +"xmr" = ( +/obj/machinery/light/small, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "xmP" = ( /obj/structure/bed/padded, /obj/random/bedsheet, @@ -18395,6 +20450,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"xnq" = ( +/obj/structure/catwalk, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/open, +/area/maintenance/security/port) +"xnC" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2-4-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xnP" = ( /obj/structure/railing{ dir = 1 @@ -18421,9 +20489,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) -"xpK" = ( -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_one/port) "xpN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18441,13 +20506,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/medbay) -"xpV" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/space) "xqQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -18470,22 +20528,6 @@ }, /turf/simulated/open, /area/rnd/robotics) -"xsW" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/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 - }, -/obj/machinery/door/airlock/glass/security, -/turf/simulated/floor/tiled/red, -/area/tether/surfacebase/security/hallway) "xuq" = ( /obj/structure/railing, /turf/simulated/floor/reinforced, @@ -18500,21 +20542,28 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/security/forensics) +"xvp" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xvs" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/lab) -"xvS" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) +"xvO" = ( +/obj/machinery/door/airlock/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/security/detectives_office) "xwj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -18575,6 +20624,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) +"xyT" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck1/fore) "xzy" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -18584,13 +20637,6 @@ /obj/structure/sign/deck/first, /turf/simulated/wall, /area/main_map/hallway/deck1) -"xAO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/dark, -/area/security/warden) "xBc" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -18604,12 +20650,18 @@ /area/rnd/lab) "xBq" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/maintenance/security/port) "xBY" = ( /obj/structure/flora/pottedplant/shoot, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) +"xCO" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "xCP" = ( /obj/structure/closet{ desc = "Dents and old flaky paint blanket this old storage unit."; @@ -18619,11 +20671,10 @@ /obj/random/plushielarge, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_one/port) -"xCR" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +"xCV" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_one) "xDi" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -18637,11 +20688,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) -"xDX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "xFr" = ( /obj/structure/railing/grey{ dir = 8 @@ -18658,6 +20704,15 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/white, /area/medical/reception) +"xFM" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_one) "xFO" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -18678,6 +20733,12 @@ "xGQ" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/hallway) +"xHN" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_one) "xHO" = ( /obj/spawner/window/low_wall/borosillicate/full/firelocks, /turf/simulated/floor/plating, @@ -18702,9 +20763,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/reinforced, /area/security/riot_control) -"xKi" = ( -/turf/simulated/floor/tiled/techmaint, -/area/space) +"xJY" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "xKq" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -18745,6 +20809,9 @@ }, /turf/simulated/floor/tiled, /area/medical/surgery) +"xLk" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research/researchdivision) "xLH" = ( /obj/structure/table/reinforced, /obj/item/folder/red_hos, @@ -18764,22 +20831,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"xLV" = ( +/obj/structure/sign/department/armory{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/tether/surfacebase/security/hallway) "xMN" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/crystal, /area/space) -"xMX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_one/forward/starboard) "xNd" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor/hole, @@ -18846,13 +20912,31 @@ /obj/structure/railing, /turf/space, /area/space) -"xVu" = ( -/obj/machinery/door/airlock/security{ - name = "Equipment Storage"; - req_access = list() +"xTr" = ( +/obj/machinery/conveyor{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/security_equiptment_storage) +/obj/map_helper/conveyor/belt{ + id_tag = "cargo_mailroom"; + name = "Cargo Mail belt" + }, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"xTE" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_one/aft/port) +"xTN" = ( +/obj/effect/floor_decal/corner/mauve/full, +/obj/structure/window/reinforced, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rnd/lab) "xWv" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -18868,21 +20952,28 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area) +"xWG" = ( +/obj/structure/railing, +/obj/structure/window/reinforced, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/open, +/area/medical/medbay) "xWT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_one) "xWZ" = ( /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"xXe" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/recreation_area) "xXn" = ( /obj/machinery/camera/network/medbay{ dir = 8 @@ -18926,9 +21017,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/lino, @@ -18937,10 +21026,26 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) -"xZI" = ( -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/tiled, -/area/space) +"xZD" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "xZX" = ( /turf/simulated/floor/glass/reinforced, /area/crew_quarters/bar) @@ -18994,6 +21099,20 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) +"ycm" = ( +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24; + pixel_y = -5 + }, +/obj/structure/bed/chair/sofa/teal/left{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_3) "ycp" = ( /obj/effect/floor_decal/corner/white/border, /obj/machinery/light/small, @@ -19002,32 +21121,13 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) -"ycs" = ( +"yed" = ( +/obj/machinery/door/airlock/maintenance/cargo, /obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/space) -"ycJ" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck1/fore) -"ycS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + icon_state = "4-8" }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) -"ydq" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/delivery) "yek" = ( /obj/structure/window/reinforced{ dir = 1 @@ -19099,6 +21199,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay) +"yjd" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/security/hallway) "ykB" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) @@ -21717,7 +23823,7 @@ wQG bmU bmU bmU -qPO +wST bmU bmU bmU @@ -21807,7 +23913,7 @@ wQG bmU bmU bmU -qPO +wST bmU bmU wQG @@ -21911,7 +24017,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22001,7 +24107,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22105,7 +24211,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22195,7 +24301,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22299,7 +24405,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22389,7 +24495,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22493,7 +24599,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22531,21 +24637,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -22583,7 +24689,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22687,7 +24793,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22722,27 +24828,27 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV fgk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -22777,7 +24883,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU wQG @@ -22881,7 +24987,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -22913,33 +25019,33 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV aBR aBR -gry -gry -gry -gry -gry -iaT -gry -gry -gry -gry -gry +fyh +fyh +fyh +fyh +fyh +hNc +fyh +fyh +fyh +fyh +fyh aBR aBR -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV bmU tLm bmU @@ -22971,7 +25077,7 @@ wQG bmU bmU bmU -lLO +udV bmU bmU bmU @@ -23074,9 +25180,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23108,31 +25214,31 @@ oPU oPU oPU oPU -lLO -lLO +udV +udV oPU oPU oPU oPU -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV nyN -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV cBZ cBZ cBZ wUW -lLO -lLO +udV +udV cZP cZP cZP @@ -23164,9 +25270,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23268,9 +25374,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23308,22 +25414,22 @@ oPU uYz uYz oPU -lLO -lLO -lLO +udV +udV +udV knG -lLO -vJy +udV +rlz hXH -von -lLO +qAC +udV knG -lLO -lLO -lLO +udV +udV +udV cBZ -hHj -vSw +lmG +kfo cBZ cBZ cBZ @@ -23358,9 +25464,9 @@ wQG wQG bmU bmU -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -23461,11 +25567,11 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -23502,19 +25608,19 @@ uYz uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ rEB vVr @@ -23551,11 +25657,11 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -23653,15 +25759,15 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -23692,31 +25798,31 @@ uYz wyy uYz uYz -uYz +rkp uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ fxW vVr rnD ogG tPj -bBN -vIA +gFh +wJO sZh iKd iKd @@ -23743,15 +25849,15 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -23846,17 +25952,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -23888,37 +25994,37 @@ uYz uYz uYz uYz -uYz +orw oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ yek vVr xOm okA xJV -fWp -nwG +wtR +bgq jnc vLX iKd -cZP -cZP -cZP -cZP -cZP +iKd +iKd +iKd +iKd +iKd mqS mqS aBR @@ -23936,17 +26042,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24038,21 +26144,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24084,19 +26190,19 @@ uYz uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ eDR tgB @@ -24108,11 +26214,11 @@ hdz jnc fSM iKd -oeC -oeC -oeC -oeC -cZP +jxs +jxs +jxs +jxs +iKd aBR aBR aBR @@ -24128,21 +26234,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24230,28 +26336,28 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz ovz -iZI -iZI -iZI -iZI -iZI -iZI -iZI +cqI +cqI +cqI +cqI +cqI +cqI +cqI ovz ovz rJs @@ -24275,70 +26381,70 @@ wyy uYz uYz uYz -uYz +juY uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO -lLO +aCm +udV +udV cBZ sVe -lLS -vIq +vJe +xid jtz sVe uFv kai jnc mpj -cZP -oeC -oeC -oeC -oeC +aav +jxs +jxs +jxs +jxs iKd -uMn -uMn -uMn -uMn -uMn -uMn -mqS -mqS -aBR -aBR -aBR -aBR -aBR -aBR -aBR -aBR -aBR -aBR -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +xGQ +xGQ +xGQ +xGQ +xGQ +xGQ +laz +laz +cWt +cWt +cWt +cWt +cWt +cWt +cWt +cWt +cWt +cWt +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -24422,21 +26528,21 @@ bmU bmU bmU bmU -lLO -gry -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +fyh +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -24466,25 +26572,25 @@ uYz uYz uYz wyy -uYz +cCn uYz uYz uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO -lLO +aCm +udV +udV rPq hoS tWe @@ -24495,46 +26601,46 @@ tDi ovX jnc mpj -cZP -oeC -oeC -oeC -oeC +aav +jxs +jxs +jxs +jxs iKd -dpB -dpB -dpB -dpB -dpB -uMn -uMn -uMn -uMn -uMn -oFr -oFr -oFr -oFr -uGa -uGa -uGa -uGa -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -gry -lLO +eks +eks +eks +eks +eks +xGQ +xGQ +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +gjE +sEn +sEn +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +fyh +udV bmU bmU bmU @@ -24616,21 +26722,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -24666,19 +26772,19 @@ uYz uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -jch -vJy +aCm +rlz apD -jch -lLO -lLO +aCm +udV +udV rPq kuK tJW @@ -24690,45 +26796,45 @@ vQP eYC bTt iKd -oeC -oeC -oeC -oeC +jxs +jxs +jxs +jxs iKd -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -uGa -uGa -uGa -uGa -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +eks +eks +eks +eks +eks +eks +eks +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +cPn +uIo +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -24810,21 +26916,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -24848,31 +26954,31 @@ wyy wyy wyy wyy -wyy -wyy -wyy -wyy -wyy -wyy -wyy -wyy -wyy +vdN +qoN +qoN +qoN +qoN +qoN +qoN +qoN +qoN uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -vJy +qAC +rlz hXH -von -oeA +qAC +kpK apD -von -lLO -lLO +qAC +udV +udV rPq una tJW @@ -24880,8 +26986,8 @@ sOK udq qot iKd -nzi -nzi +mqZ +mqZ iKd iKd iKd @@ -24889,40 +26995,40 @@ iKd iKd iKd iKd -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -aBR -bCn -bCn -bCn -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +eks +eks +eks +eks +eks +eks +eks +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +cWt +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -25004,21 +27110,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25041,82 +27147,82 @@ pwO pwO pwO pwO +pwO +pwO +qoN uYz uYz -wyy uYz uYz uYz uYz -uYz -uYz -wyy +qoN uYz uYz oPU -lLO -lLO -vJy +udV +udV +rlz apD -von -oeA +qAC +kpK hXH -von -oeA +qAC +kpK apD -jch -lLO -lLO +aCm +udV +udV rPq -hlb -fLR +fuO +cyF sOK jXb qot -oxz -dRw -esd -jew -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -mTt -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +vPY +mfP +pZZ +igz +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +eks +eks +eks +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -25196,23 +27302,23 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25237,82 +27343,82 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz -wyy +qoN uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO -lLO +aCm +udV +udV rPq sqC tJW sOK glV pGe -dpB -dpB -gCL -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -mTt -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO +fgg +fgg +sJp +fgg +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +xGQ +xGQ +xGQ +pJd +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV bmU bmU bmU @@ -25388,25 +27494,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25431,84 +27537,84 @@ uYz pwO uYz uYz -wyy +qoN +ekO uYz uYz uYz uYz -uYz -uYz -wyy +wHU +qoN uYz uYz oPU -lLO -lLO -oeA +udV +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO -lLO +aCm +udV +udV rPq fox tJW sOK aZQ pGe -dpB -dpB -gCL -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -oFr -oFr -oFr -oFr -mTt -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +fgg +fgg +sJp +fgg +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +xGQ +vJv +vJv +wwI +vGQ +vGQ +vGQ +vGQ +vGQ +vGQ +lHx +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU bmU bmU @@ -25581,26 +27687,26 @@ bmU bmU bmU bmU -lLO -lLO -gry -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +fyh +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV ovz bJT bJT @@ -25625,29 +27731,29 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz +qoN wyy -wyy -wyy +vdN oPU oPU -lLO -vJy +udV +rlz apD -von -oeA +qAC +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO +aCm +udV jny rPq fox @@ -25655,55 +27761,55 @@ tJW sOK osD rPq -tqx -gCL -gCL -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -uMn -uGa -aBR -mTt -mTt -aBR -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -gry -lLO -lLO +xLV +sJp +sJp +fgg +xGQ +eks +eks +eks +eks +xGQ +eks +eks +eks +eks +eks +vJv +lQr +myV +gqS +vGQ +vGQ +cWt +lHx +lHx +cWt +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +fyh +udV +udV bmU bmU bmU @@ -25775,26 +27881,26 @@ bmU bmU bmU bmU -lLO -vTH +udV +eZR lMW -dBY -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +eZR +pnO +mjM +udV +udV +mrH +qdw +qdw +qdw +qdw +qdw +qdw +qdw +qdw +qdw ovz bJT bJT @@ -25819,85 +27925,85 @@ wyy vdN wyy wyy -wyy -uYz +qoN uYz uYz uYz uYz uYz -wyy -uYz uYz +qoN uYz +pwO +pwO oPU -lLO -vJy +udV +rlz apD -jch -oeA +aCm +kpK hXH -jch -vJy +aCm +rlz apD -jch -lLO +aCm +udV jny gdi fvI tJW riS vDb -rLF -nSu -xKi -xKi -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -dpB -nxk -dpB -dpB -dpB -uMn -uGa -lMW -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -vTH +lGU +oDt +vJv +vJv +fgg +xGQ +xGQ +vJv +xGQ +xGQ +xGQ +fgg +fgg +fgg +fgg +fgg +vJv +lQr +pJd +cdY +vGQ +vGQ +qzb +qzb +qzb +qzb +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +eZR lMW -dBY -lLO +mjM +udV bmU bmU bmU @@ -25969,26 +28075,26 @@ bmU bmU bmU bmU -lLO -vTH +udV +eZR lMW -dBY -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26013,36 +28119,36 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz -wyy +qoN uYz uYz -uYz -pyu -lLO -vJy +pwO +vOO +udV +rlz apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -von -lLO +qAC +udV jny siz tEC tDT wfe dcS -nzG +bYV jGp lQr vJv @@ -26059,39 +28165,39 @@ vJv vJv vJv vJv -vJv -fgg -fgg -uMn -uGa -jUd -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -vTH +lQr +pJd +pJd +pJd +gjE +bkY +qzb +qzb +qzb +qzb +lCI +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +eZR lMW -dBY -lLO +mjM +udV bmU bmU bmU @@ -26163,26 +28269,26 @@ bmU bmU bmU bmU -lLO -vTH -peB -avn -gry -jCH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +eZR +pnO +kUD +fyh +kiR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26207,29 +28313,29 @@ uYz pwO uYz uYz -wyy +qoN uYz uYz uYz uYz uYz uYz -wyy +qoN uYz uYz -uYz -pyu -lLO -vJy +pwO +vOO +udV +rlz apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -von -lLO +qAC +udV tJt qCD qCD @@ -26239,53 +28345,53 @@ eby qCD vJv lQr -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv -vJv +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr +lQr fgg fgg -uMn -uGa -sYi -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -umz -gry -jCH -lLO -dBY -lLO +pJd +gjE +eQf +vEM +vEM +vEM +vEM +tCA +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +wZM +fyh +kiR +udV +mjM +udV bmU bmU bmU @@ -26357,26 +28463,26 @@ bmU bmU bmU bmU -lLO -vTH -peB -peB -peB -peB -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +eZR +pnO +pnO +pnO +pnO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26401,29 +28507,29 @@ uYz pwO uYz uYz -wyy -wyy -wyy -wyy -wyy -joZ -joZ -joZ -joZ -joZ +qoN +ekO +uYz +uYz +uYz +uYz +wHU +qoN uYz -pyu -lLO -vJy +uYz +pwO +vOO +udV +rlz apD -von -oeA +qAC +kpK hXH -von -oeA +qAC +kpK apD -von -lLO +qAC +udV tJt sQG bAe @@ -26434,15 +28540,15 @@ iac vJv lQr ogl +ivI +ivI ogl +jxY +qLX ogl -ogl -idb -idb -ogl -ogl -ogl -ogl +ivI +ivI +ivI ogl cQb gxY @@ -26450,36 +28556,36 @@ gxY gxY dxU fgg -uMn -uGa -sYi -lMW -lMW -lMW -lMW -lMW -lMW -btn -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -lLO -lLO -lLO -lLO -dBY -lLO +pJd +gjE +sEn +sEn +sEn +sEn +sEn +sEn +sEn +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +udV +udV +udV +udV +mjM +udV bmU bmU bmU @@ -26552,25 +28658,25 @@ bmU bmU bmU bmU -lLO -tcC -tcC -tcC -qfC -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +aYP +aYP +aYP +gSE +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26595,29 +28701,29 @@ uYz pwO uYz uYz -wyy +qoN +uYz +uYz uYz uYz uYz -pwO -fQI -tAj -mEw -mEw -joZ uYz -pyu -lLO -vJy +qoN +wyy +wyy +vdN +oPU +udV +rlz apD -von -oeA +qAC +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO +aCm +udV tJt cyQ jtU @@ -26627,7 +28733,7 @@ ohL hMD lQr lQr -ogl +ivI rXs rXs dgp @@ -26637,42 +28743,42 @@ rUU khH khH dsB -ogl +ivI vJv sJp xGQ sYj xGQ cxT -uMn -cjx -btn -btn -btn -btn -jBk -jBk -jBk -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -bMX -tcC -tcC -tcC -lLO +pJd +dlQ +dlQ +dlQ +udA +dlQ +dlQ +dlQ +dlQ +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +xvp +aYP +aYP +aYP +udV bmU bmU bmU @@ -26748,23 +28854,23 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26789,29 +28895,29 @@ uYz pwO uYz uYz -wyy -uYz -uYz -uYz +qoN pwO +pwO +tAj +mEw +mEw joZ -joZ -joZ -joZ -joZ +qoN +uYz uYz -pyu -lLO -oeA +pwO +vOO +udV +kpK apD -jch -oeA +aCm +kpK hXH -jch -oeA +aCm +kpK apD -jch -lLO +aCm +udV tJt dPZ cNI @@ -26821,7 +28927,7 @@ jkh qCD vJv lQr -ogl +ivI rXs dVH dft @@ -26831,40 +28937,40 @@ alY wPj wPj bGk -ogl +ivI vJv sJp xGQ sGy wbO -nOl -nOl -nOl -kRe kij kij kij -jBk -srO -gXp -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO +kij +kij +kij +kij +dlQ +oaW +lCI +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV bmU bmU bmU @@ -26944,21 +29050,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -26983,29 +29089,29 @@ uYz pwO uYz uYz -wyy -uYz +qoN +qGY +qoN +qoN +qoN +qoN +qoN +qoN uYz uYz pwO -wyy -uYz -uYz -uYz -wyy -kOz -oPU -lLO -oeA +vOO +udV +kpK apD -jch -vJy +aCm +rlz hXH -jch -oeA +aCm +kpK apD -jch -lLO +aCm +udV tJt isN sGW @@ -27015,7 +29121,7 @@ pcu cUx vJv lQr -ogl +ivI lbc dft dft @@ -27025,38 +29131,38 @@ tQB bdd bdd rOA -ogl +ivI vJv sQu xGQ sGy wbO -nOl kij kij -kRe kij kij kij -jBk -srO -gXp -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +kij +kij +dlQ +fcC +lCI +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -27138,21 +29244,21 @@ bmU bmU bmU bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27188,21 +29294,21 @@ kyq kyq kyq kyq -oPU -lLO -oeA +vOO +udV +kpK apD -jch -vJy +aCm +rlz hXH -von -oeA +qAC +kpK apD -von -lLO +qAC +udV tJt cSh -xAO +gDS unR tjI ufm @@ -27225,32 +29331,32 @@ sJp xGQ sGy wbO -nOl kij kij -kRe kij kij kij -jBk -oih -oih -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +kij +kij +dlQ +lSP +lSP +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -27333,20 +29439,20 @@ bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27361,8 +29467,8 @@ bJT riq riq tim -nGm -nGm +lhu +ukP umB pcd umB @@ -27372,31 +29478,31 @@ kyq uYz uYz wyy -uYz -uYz -uYz -uYz -wyy -uYz -uYz -uYz -uYz +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ +qWZ kyq oPU -lLO -oeA +udV +kpK apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -von -lLO +qAC +udV tJt pxs -wkY +omZ uKN wHz jzJ @@ -27414,8 +29520,8 @@ dft dft aZm ogl -eMT -tnz +vJv +hEZ xGQ xGQ wbO @@ -27423,27 +29529,27 @@ ftC kRe kRe kRe -kij -kij -kij -jBk -alN -alN -jBk -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +kRe +kRe +kRe +dlQ +aZi +ohi +dlQ +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -27527,20 +29633,20 @@ bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT mmw @@ -27556,20 +29662,20 @@ riq riq tim nBE -nGm +ukP umB umB umB egZ -wyy -tZN -wyy -wyy -wyy -wyy -wyy -wyy -wyy +heZ +hJO +heZ +loW +loW +loW +loW +loW +loW wyy uYz wyy @@ -27577,19 +29683,19 @@ wyy uYz kyq oPU -lLO -vJy +udV +rlz apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -von -lLO +qAC +udV tJt -vYK +qCD qCD qCD qCD @@ -27599,45 +29705,45 @@ eMT dDn ogl rXs -oEF +gfX dft jxY nUG utf wmH -wmH -fzx +etO +cnV ogl vJv sJp xGQ kij kij -nOl kij kRe kij kij kij kij +kij nwB pal pQm boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -27721,20 +29827,20 @@ bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27750,20 +29856,20 @@ hky gJU tim egZ -beR +owN khr khr egZ egZ -tai -jxN -tai -wyy -bdb -jLH -tSm -tSm -wyy +mbE +dzd +jwH +loW +tJe +eNZ +koG +nXm +loW uYz uYz uYz @@ -27771,17 +29877,17 @@ wyy uYz kyq oPU -lLO -vJy +udV +rlz apD -von -oeA +qAC +kpK hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV jny noW noW @@ -27807,31 +29913,31 @@ sJp xGQ kij kij -nOl kij kRe -kRe -kRe -pOh -kRe +kij +kij +kij +kij +kij nwB kWi eRN rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -27903,32 +30009,32 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -27937,60 +30043,60 @@ bJT bJT bJT cbf -lMW -lMW +wmA +wmA cbf riq pDr lNy dRQ -gyO +nwT eTp eTp vUX kTs -tai -jxN -vze -pyu -ndV -fxL -tSm -bNz -wyy +jwH +dzd +iUP +tHw +wzR +tMv +nXm +eDE +loW uYz uYz uYz wyy uYz -kyq +ijP oPU -lLO -vJy +udV +rlz apD -von -oeA +qAC +kpK hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV jny noW noW noW noW -sUR -cxT +noW +mgA vJv lQr ogl +ivI +ivI ogl -ogl -ogl -idb -lnR +jxY +wMW ogl ogl ogl @@ -28001,31 +30107,31 @@ sJp xGQ kij kij -nOl kij kRe kij kij kij kij +kij nwB whm pgT rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28097,32 +30203,32 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz bJT bJT @@ -28131,63 +30237,63 @@ bJT bJT bJT cbf -lMW -lMW +wmA +wmA cbf riq pDr lNy woI -gyO -gyO -gyO -gyO -ozJ -jxN -jxN -jxN -gmr -ndV -uHi -tSm -dpc -wyy +nwT +lZM +iuI +ncf +lTE +dzd +vjr +vjr +xvO +gqK +erB +uKi +wzR +loW uYz tzX uYz wyy -uYz -kyq +eVK +lqe oPU -lLO -vJy +udV +rlz apD -jch -vJy +aCm +rlz hXH -von -oeA +qAC +kpK apD -jch -lLO +aCm +udV jny noW noW noW noW -sUR +noW xGQ vJv -lQr -vJv +qju vJv vJv vJv +bNE vJv lQr vJv vJv -eMT +fZS vJv vJv vJv @@ -28195,31 +30301,31 @@ sQu xGQ kij kij -nOl kij kRe kij kij kij kij +kij nwB -kWi +acq eRN rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28291,32 +30397,32 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -wJm -wJm -wJm -wJm -wJm -lLO +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR ovz ovz ovz @@ -28325,55 +30431,55 @@ cbf cbf ovz nMe -hMl -hMl +mND +tvw mZp vqN -bBH +eSY lNy tQp -gyO +nwT fjn fjn -vUX +lCX kTs -tai -tai -vze -pyu -ndV -dpc -dpc -dpc -wyy +pnj +jwH +tMx +tHw +hCZ +wzR +wzR +wzR +loW uYz uYz uYz wyy uYz -kyq +ijP oPU -lLO -vJy +udV +rlz apD -jch -vJy +aCm +rlz hXH -von -oeA +qAC +kpK apD -von -lLO +qAC +udV jny noW noW noW noW -sUR +noW xGQ -vJv -lQr -lQr +nIK +tZG +qQe lQr lQr lQr @@ -28381,39 +30487,39 @@ lQr lQr lQr vJv -eMT +vJv vJv vJv vJv whV cxT -nOl -nOl -nOl -nOl -ftC -nOl -nOl -nOl -nOl -pLJ +kij +kij +kij +kRe +kRe +kRe +kRe +kRe +kRe +nwB kWi eRN rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28485,192 +30591,6 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -aBR -dpB -dpB -dpB -dpB -dpB -dpB -dpB -qwr -qwr -des -qwr -utj -nLu -nLu -vZt -qSq -qSq -nLu -nLu -oSp -tai -iUL -iUL -qdS -iUL -iUL -iUL -xNk -xNk -xNk -xNk -xNk -uYz -kyq -oPU -lLO -vJy -apD -jch -vJy -hXH -von -oeA -apD -von -lLO -jny -noW -noW -noW -noW -sUR -xGQ -xGQ -vJv -vJv -sJp -vJv -vJv -sJp -nIe -kGt -nIe -nIe -nIe -nIe -vJv -whV -xGQ -kij -iAT -nOl -kij -kRe -kij -kij -kij -kij -nwB -tQs -bZY -rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -wLA -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -"} -(50,1,1) = {" -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG -wQG wQG wQG wQG @@ -28682,6 +30602,125 @@ wQG bmU bmU bmU +xRY +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +orZ +orZ +orZ +orZ +orZ +orZ +orZ +lTm +lTm +qVQ +lTm +qBT +nLu +nLu +oqF +qSq +qSq +nLu +nLu +nHK +jwH +iUL +iUL +bHe +iUL +iUL +iUL +xNk +xNk +xNk +xNk +xNk +uYz +kyq +oPU +udV +rlz +apD +aCm +rlz +hXH +qAC +kpK +apD +qAC +udV +jny +noW +noW +noW +noW +noW +xGQ +xGQ +vJv +vJv +xGQ +jHV +mCJ +xGQ +nIe +kGt +nIe +nIe +nIe +nIe +vJv +whV +xGQ +kij +iAT +kij +kij +ftC +kij +kij +kij +kij +pLJ +tQs +bZY +rgs +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +wLA +bmU +bmU +bmU +bmU +bmU +bmU bmU bmU bmU @@ -28690,46 +30729,113 @@ bmU bmU bmU bmU +bmU +bmU +bmU +bmU +bmU +"} +(50,1,1) = {" +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +bmU +bmU +bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -dpB -dpB -dpB -dpB -dpB -dpB -qwr -qjv -lBm -lBm -aVt +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +orZ +orZ +orZ +orZ +orZ +orZ +lTm +gNX +esp +esp +mzs nLu ghU -ceY +mrp oWl oWl oWl nLu -tai -tai +pnj +jwH iUL aqK -jML +bPh amv lZc thD @@ -28741,43 +30847,43 @@ xNk uYz kyq oPU -lLO -vJy +udV +rlz apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV jny noW noW noW noW -sUR +noW noW xGQ vJv vJv -sJp +xGQ vJv vJv -sJp -nIe +xGQ +tYS iTv syo tYS -tYS +rBZ nIe ocX vVg xGQ -kRe -kRe -nOl +kij +kij +kij kij kRe kij @@ -28788,20 +30894,20 @@ nwB jHs wRf boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -28873,57 +30979,57 @@ wQG wQG wQG wQG -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU xRY -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -dpB -dpB -dpB -dpB -dpB -dpB -qwr -utj -aBR -qwr -qwr +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +orZ +orZ +orZ +orZ +orZ +orZ +lTm +vkG +mrH +rmS +lTm nLu -ceY -ceY +iYM +mrp oWl dUW oWl nLu -tai -tai +pnj +wlt iUL ksA -gqK +rkO fZn sft hqk @@ -28935,32 +31041,32 @@ xNk xNk kyq oPU -lLO -vJy +udV +rlz apD -von -vJy +qAC +rlz hXH -von -vJy +qAC +rlz apD -jch -lLO +aCm +udV fsW edq edq edq edq -sUR +noW noW xGQ vJv vJv -sJp -vJv -vJv -sJp -nIe +xGQ +ocP +ocP +xGQ +dYv vql szT tYS @@ -28970,8 +31076,8 @@ vJv whV xGQ kij -nOl -nOl +kij +kij kij kRe kij @@ -28982,20 +31088,20 @@ nwB fxM eMv boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO wLA bmU bmU @@ -29067,45 +31173,45 @@ wQG wQG wQG wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -aOe -dpB -dpB -dpB -dpB -aOe -wJm -aBR -mTt -mTt -cZI -kkJ -dpB -acO -fHf -qwr -utj -mTt -qwr -qwr +eZR +pnO +mjM +kGv +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +eMO +eMO +mrH +mtV +orZ +wxg +tlO +lTm +qBT +eMO +lTm +lTm nLu tnf oWl @@ -29113,11 +31219,11 @@ tFr avO gvh nLu -tai -tai +pnj +jwH iUL nLj -gqK +glF dhu dhu dqF @@ -29129,8 +31235,8 @@ jlB xNk kyq oPU -lLO -lLO +udV +udV ewo mFI mFI @@ -29138,25 +31244,25 @@ dYM mFI mFI rit -lLO -lLO +udV +udV fsW iUN hmK osi edq -sUR +noW noW xGQ +cRj vJv -vJv -ayA -ocP -ocP -ayA -nIe +xGQ +xGQ +xGQ +xGQ tYS -iNp +tYS +hhN fFi tYS nIe @@ -29164,7 +31270,7 @@ uoP aeQ xGQ kij -nOl +kij kij hRN hRN @@ -29173,24 +31279,24 @@ hRN hRN hRN hRN -fBA -ggJ +prO +cmQ boy -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29261,45 +31367,45 @@ wQG wQG wQG wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -nHZ -qwr -utj -mTt -qwr -qwr +eZR +pnO +mjM +bkH +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +tmB +lTm +qBT +eMO +lTm +lTm nLu emJ oWl @@ -29307,14 +31413,14 @@ nqz keY qKB nLu -tai -tai +pnj +jwH iUL xYN -gqK -oqR -gqK -gqK +cnb +boO +xdn +xdn sRV ggi aiT @@ -29323,42 +31429,42 @@ cnv xNk kyq oPU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV giU -lLO -lLO +udV +udV sWI gSb hmK hmK aAL -sUR +noW noW xGQ vJv vJv -ayA -ayA -ayA -ayA +xGQ +xGQ +xGQ +xGQ nIe nIe -oBU +qXa nIe nIe nIe -eMT -vPf +vJv +iFJ xGQ kij -nOl +kij kij hRN boG @@ -29366,25 +31472,25 @@ hlQ qDc iiE qjL -gnB +cSk leK ukn rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29442,58 +31548,58 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -nHZ -qwr -utj -mTt -eZw -eZw +eZR +pnO +mjM +maf +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +tmB +lTm +qBT +eMO +cbZ +cbZ nLu aTE nEv @@ -29501,8 +31607,8 @@ qKB oNl aWt nLu -tai -tai +pnj +jwH iUL gTl wzR @@ -29517,34 +31623,34 @@ wFy xNk jLN oPU -lLO -lLO -lLO -lLO -gry -gry -gry -lLO +udV +udV +udV +udV +fyh +fyh +fyh +udV giU -lLO -lLO +udV +udV sWI cBe hmK hmK edq -sUR +noW noW xGQ vJv vJv vJv vPE -vPE +bel vPE vJv vJv -ceP +qaA vJv vJv vJv @@ -29552,7 +31658,7 @@ vJv whV xGQ kij -nOl +kij kij hRN kDw @@ -29560,25 +31666,25 @@ sJi ciy ukF xcD -ruS +itm iJo eMv rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29636,58 +31742,58 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -aOe -aBR -oco -oco -aBR -aPE -dpB -iKu -mMO -qwr -utj -aBR -nxk -nxk +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +rat +kOR +kOR +kOR +mrH +rNF +rNF +mrH +qMJ +orZ +qvM +aNE +lTm +qBT +aLc +heZ +heZ nLu nLu nLu @@ -29695,8 +31801,8 @@ nLu nLu nLu nLu -tai -tai +pnj +jwH iUL ksA wzR @@ -29711,23 +31817,23 @@ xNk xNk kyq oPU -lLO -lLO -lLO -vTH +udV +udV +udV +eZR lMW lMW lMW -dBY +mjM giU -lLO -lLO +udV +udV fsW bNd hmK wYy edq -sUR +noW noW xGQ vJv @@ -29738,7 +31844,7 @@ vPE vPE vPE vJv -mHM +qcv gxY gxY gxY @@ -29746,11 +31852,11 @@ gxY eqB xGQ kij -nOl kij +cvu hRN -gnB -cnu +xLk +anl nbK pxD pxD @@ -29758,21 +31864,21 @@ hRN oih oih hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -29830,67 +31936,67 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -aOe -aBR -oco -oco -aBR -kkJ -dpB -iKu -wRC -qwr -utj -rKf -qwr -qwr -tai -tai -tai -tai -tai -tai -tai -tai -tai +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +rNF +rNF +mrH +vFn +orZ +qvM +vmT +lTm +qBT +jvh +jwH +mbE +jwH +jwH +mbE +oDG +faE +faE +faE +dux +jwH iUL uRF wzR @@ -29905,17 +32011,17 @@ xNk uYz kyq oPU -lLO -lLO -lLO -vTH +udV +udV +udV +eZR lMW lMW lMW -dBY +mjM giU -lLO -lLO +udV +udV fsW edq mmM @@ -29932,7 +32038,7 @@ vPE vPE vPE vJv -wwz +kUO nxa nxa nxa @@ -29940,33 +32046,33 @@ nxa nxa fXo kij -nOl kij +eBW hRN nRO mXs -srO +gQw rQY rQY pxD erm erm hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU wQG wQG @@ -30024,67 +32130,67 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -fDC -qwr -utj -rKf -qwr -qwr -tai -tai -tai -tai -tai -tai -tai -tai -tai +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +pBW +lTm +qBT +fUl +jwH +jwH +jwH +jwH +jwH +pnj +jwH +jwH +qoV +jwH +jwH iUL iUL lRN @@ -30099,17 +32205,17 @@ xNk uYz kyq oPU -iXB -iXB -lLO -lLO -lLO -lLO -lLO -lLO +pTi +pTi +udV +udV +udV +udV +udV +udV giU -lLO -lLO +udV +udV sWI acd sBQ @@ -30126,7 +32232,7 @@ vPE vPE vPE vJv -wyb +ofT nxa npj pyj @@ -30134,33 +32240,33 @@ ckx bGr fXo kij -nOl kij +iTi hRN nJF jQV -srO +gQw rQY rQY hRN pxD pxD hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30218,63 +32324,63 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -dpB -dpB -gBp -sde -dcp -dcp -mKV -auW -qwr -qwr -fDC -qwr -utj -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +crH +bvZ +bvZ +tye +iCg +lTm +lTm +pBW +lTm +qBT +aLc +heZ +heZ +heZ +heZ +jwH +pnj +heZ wyy wyy wyy @@ -30286,24 +32392,24 @@ uYz uYz uYz uYz -uYz -uYz +wyy +ege kyq kyq kyq kyq oPU -pzF -pzF -lLO -lLO -lLO -lLO -lLO -lLO +bLP +bLP +udV +udV +udV +udV +udV +udV ewo -eDU -eDU +nQB +nQB fIK apn kSv @@ -30320,7 +32426,7 @@ vPE vPE vPE vJv -mHM +qcv fwY vsZ mPX @@ -30328,33 +32434,33 @@ mwK cEi fXo kij -nOl kij +iTi hRN dwN xgU -rvm -rvm +jNK +rQY rQY rQY rQY rQY rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30412,84 +32518,84 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -wJm -aOe -dpB -dpB -dpB -dpB -wJm -aOe -aBR -mTt -mTt -cZI -aPE -dpB -acO -oGk -qwr -utj -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +eMO +eMO +mrH +uMf +orZ +wxg +dwU +lTm +vkG +aLc +jwH +jwH +jwH +heZ +jwH +pnj +heZ uYz uYz uYz uYz +wyy uYz uYz uYz uYz uYz uYz +wyy uYz kyq uYz uYz -uYz +pwO oPU -fsW -edq -edq +aBR +nxk +nxk iDV nae osx @@ -30513,8 +32619,8 @@ ccE ccE ccE ayA -gIA -xsW +yjd +uAb nxa iEd iRG @@ -30522,33 +32628,33 @@ jqy ybO fXo kij -nOl kij +eBW hRN fgQ vgu -gFU -gFU +nfd +rQY rQY rQY rQY rQY rgs -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30606,85 +32712,85 @@ bmU bmU bmU bmU +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG +wQG bmU bmU bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -bmU -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -dpB -dpB -dpB -dpB -dpB -feG -qwr -utj -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz -uYz +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +orZ +orZ +orZ +orZ +orZ +lPc +lTm +qBT +aLc +jwH +jwH +jwH +heZ +jwH +pnj +aCV +pwO +pwO +pwO +pwO +vdN +pwO +pwO +pwO +pwO +pwO +pwO +vdN +pwO kyq uYz ueD -iDv +xTE ueD -fsW -iOF +aBR +ssy dVR -edq +nxk nTJ osx osx @@ -30697,18 +32803,18 @@ qQh rAs sBQ edq -ari +xnq lAy aZH pYk bdQ -lMW -lMW -lMW -lMW -axd +tAa +tAa +tAa +tAa +fYm nZH -srv +pym nxa gsh iRG @@ -30716,33 +32822,33 @@ jqy oIS fXo kij -nOl -myy -eZK +kij +epn +eky kqA xNd -srO +gQw rQY rQY rQY rQY rQY hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM bmU bmU bmU @@ -30823,62 +32929,62 @@ bmU bmU bmU bmU -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -wJm -dpB -dpB -dpB -dpB -wJm -lLO -qcx -dpB -lTD -ycs -ycs -ycs -ycs -mvR -lBm -aVt -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +moV +orZ +ePS +mCD +mCD +mCD +mCD +cSD +esp +mzs +aLc +jwH +jwH +jwH +jwH +jwH +pnj +heZ uYz uYz uYz uYz +wyy uYz uYz uYz uYz uYz uYz +wyy uYz kyq iAC ueD uYz -uYz -fsW -qof -qof -qof +kTu +aBR +byk +byk +byk osx osx lOT @@ -30896,13 +33002,13 @@ qAb ibZ ibZ bdQ -lMW -lMW -lMW -lMW -axd +tAa +tAa +tAa +tAa +fYm nZH -dho +aeH nxa tml lJV @@ -30911,33 +33017,33 @@ ihS fXo cVp ioD -eBY +jQD hRN dPY clr -srO +gQw rQY rQY rQY rQY rQY hRN -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV bmU bmU bmU @@ -31016,64 +33122,64 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -aOe -wJm -wJm -wJm -wJm -aOe -lLO -aBR -dpB -eBr -daD -xZI -gRF -dpB -wjA -tGW -qwr -aBR -oFr -oFr -vhU -vhU -tai -tai -wyy -uYz -uYz +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +mrH +orZ +twy +oHh +qaC +jMX +orZ +hbt +oxj +lTm +aLc +jwH +jwH +jwH +heZ +jwH +pnj +heZ uYz uYz uYz uYz +wyy uYz uYz uYz uYz uYz uYz +wyy uYz kyq ltc ueD uYz tzX -fsW +aBR qMK cAp -edq -osx +nxk +nTJ osx nTJ fsW @@ -31090,15 +33196,15 @@ ari ari kTQ bdQ -lMW -lMW -lMW -lMW -axd +tAa +tAa +tAa +tAa +fYm nZH -srv +pym nxa -jqy +qZw hVr bia vMp @@ -31107,8 +33213,8 @@ gwD gwD gwD gwD -hYb -iPA +ric +vpO pbB waR waR @@ -31116,23 +33222,23 @@ waR waR pbB gwD -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV bmU bmU bmU @@ -31209,24 +33315,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -aEl -lLO -lLO -aEl -lLO +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf abf uYR @@ -31235,15 +33341,15 @@ aLc xDi xDi xDi -jCL -sac +sKm +qYm jPP heZ heZ heZ aNY -vjE -vjE +cQj +iLb heZ heZ heZ @@ -31284,15 +33390,15 @@ fWj bdQ bdQ bdQ -mzA -lMW -lMW -lMW -ejG +lyo +tAa +tAa +tAa +pRN nZH -srv +pym nxa -xVu +lqo hgy hgy fXo @@ -31310,24 +33416,24 @@ mJY vJd bXm gwD -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV bmU bmU wQG @@ -31402,25 +33508,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf clX ijT @@ -31429,7 +33535,7 @@ jUJ xPR jwH jwH -vkl +dvN xPR hBs xPR @@ -31437,9 +33543,9 @@ xPR sac xPR xPR +nID xPR xPR -fKH xPR xPR hBs @@ -31472,21 +33578,21 @@ fKH fKH xPR heZ +eri noW -sUR noW bdQ fYz eyX kNq -vNv -lMW -axd +vNm +tAa +fYm eNu tCK -psK +qAf jhN -rnV +oEv gMs rkL vbU @@ -31494,7 +33600,7 @@ aKB nBL wEc lnG -ttC +xTN vCY uzc phT @@ -31504,25 +33610,25 @@ lHC eWM eja wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -31596,25 +33702,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf nzv ijT @@ -31623,17 +33729,17 @@ ivd xPR jwH jwH -hPH -bFU -fhS -wpV -wpV -iHS -wpV -wpV -wpV -wpV -wpV +ojk +aJv +ktz +gef +gef +tJO +gef +gef +jSV +gef +gef dKa gef ika @@ -31672,15 +33778,15 @@ xBq bVx gss gyF -ecf -vNv -lMW -axd +ucC +vNm +tAa +fYm nOk tNF -sqY +kil jhN -bNS +dAO oow adI iwo @@ -31698,25 +33804,25 @@ ksg xvs csa wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -31790,38 +33896,38 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf oJX ijT oJX heZ xPR -jwH +qoV jwH xPR xPR qWt xPR -xPR +oZS sac xPR xPR @@ -31830,20 +33936,20 @@ xPR xPR lFP xPR -qWt -xPR +oiy xPR xPR xPR xPR xPR xPR +oZS xPR qWt xPR xPR vjE -xPR +oZS xPR qWt xPR @@ -31854,7 +33960,7 @@ pIj xwj xPR xPR -xPR +oZS qWt xPR xPR @@ -31862,19 +33968,19 @@ xPR heZ uCC isr -sUR +noW bdQ bph pPz vqV -vNv -lMW -axd +vNm +tAa +fYm hBh nZH -vhG -iAt -fmV +giZ +aHo +nEd fnl aHl leZ @@ -31892,25 +33998,25 @@ tPS nIE lWV wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -31984,26 +34090,26 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -abf +udV +udV +udV +udV +eZR +pnO +mjM +udV +udV +mrH +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +kOR +ryY oJX ijT oJX @@ -32023,7 +34129,7 @@ xPR uaR fsn gWg -dQt +fUK fsn xDi xDi @@ -32034,7 +34140,7 @@ heZ heZ heZ heZ -aCV +pgW heZ heZ heZ @@ -32056,7 +34162,7 @@ xPR heZ noW noW -sUR +noW bdQ tRj pPz @@ -32066,7 +34172,7 @@ qIk jXY nWO nZH -fCM +eUT jhN ekw dhe @@ -32077,7 +34183,7 @@ nBL eAA csM hSk -obR +oPt ksU uuZ tKE @@ -32086,25 +34192,25 @@ gJV bRU rqo wbF -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -rez -rez -lLO -rez -vTH -peB -dBY -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +uRc +uRc +udV +uRc +eZR +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32178,27 +34284,27 @@ bmU bmU bmU bmU -lLO -lLO -lLO -vsX -peB -peB +udV +udV +udV +oFJ +pnO +pnO abf -oJC +nBi abf abf abf abf -lLO -lLO -lLO -lLO -lLO -lLO -lLO +kOR +kOR +kOR +kOR +kOR +kOR +kOR abf -oJX +aRW ijT oJX lFl @@ -32212,23 +34318,23 @@ ucz oJX oJX heZ -vjE -vjE +cQj +qYm fsn hEo pgu tVC -hEo +bmI hEo hEo hEo hEo jKW lXs -sAV -eYq lXs -oaB +lXs +lXs +lXs lXs niL akX @@ -32241,8 +34347,8 @@ sac sac ktG heZ -tSb -vYy +eYq +dxb heZ xPR xPR @@ -32250,7 +34356,7 @@ xPR heZ noW noW -sUR +noW bdQ mZY pPz @@ -32260,7 +34366,7 @@ nZH mdn nZH nZH -srv +pym jhN iGH eWL @@ -32271,7 +34377,7 @@ akc tdT ePK gwD -rqc +nXT bXS pbB qBt @@ -32280,25 +34386,25 @@ bmX jUb xXy gwD -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV uSR gnD gnD dCH gnD uSR -peB -dBY -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32372,12 +34478,12 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf oJX oJX @@ -32409,7 +34515,7 @@ heZ xPR xPR xDi -nsj +nxh qLP ijW axh @@ -32417,9 +34523,9 @@ hEo hEo hEo hEo -aXw -oaB -oaB +kYZ +lXs +lXs kOT eJj cWf @@ -32431,12 +34537,12 @@ cWf gnV lXs heZ +oKE xPR -xPR -lFP +jwg heZ -jAA -vYy +sAV +lXs heZ sac sac @@ -32454,7 +34560,7 @@ aiR amC epg epg -lPW +uda jhN bke gMs @@ -32465,8 +34571,8 @@ gwD gwD gwD gwD -hYb -iPA +sSM +vpO xXS xdy wjN @@ -32487,12 +34593,12 @@ vRh jyh rZZ qTg -ozZ -dBY -lLO -lLO -lLO -lLO +nch +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32566,12 +34672,12 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf oJX oJX @@ -32583,7 +34689,7 @@ oJX oJX oJX oJX -oJX +lFl oJX oJX oJX @@ -32600,28 +34706,28 @@ ucz oJX oJX heZ -hzX +aFP hzX xDi sdK tUH sAh oml -sZd +evz sdK -nMa +bgf hEo jKW +faG lXs -oaB tSh lwU -lXs -lXs +mis +sAV niL tSh lXs -lXs +quu voW cWf cfT @@ -32629,8 +34735,8 @@ gef gef qNT cfT -uei -fCh +heq +gnV heZ jwH dsx @@ -32640,15 +34746,15 @@ aZH urI ari bdQ -dDE -pTE -kBW -kiK -kiK -wun -kBW -iyd -cBJ +txV +uoU +txV +chC +chC +tUX +txV +vzn +sWj aKB auP gsu @@ -32663,8 +34769,8 @@ hpV aHZ xXS gbT -dDz -dDz +lFK +lFK dQq lvJ tNx @@ -32681,12 +34787,12 @@ jyG hvt tjJ qTg -peB -dBY -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32760,14 +34866,14 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf -oJC +ghd abf abf oJX @@ -32777,8 +34883,8 @@ oJX oJX oJX xCP -oJX -oJX +lFl +aRW oJX oJX ijT @@ -32810,21 +34916,21 @@ niL bLI niL niL -jWJ -jWJ -jWJ -jWJ -kuH -jWJ -jWJ +dhS +dhS +dhS +dhS +fCG +dhS +dhS sAV heZ hzX hzX hzX heZ -oVy -scS +wcc +jzc heZ dsx dsx @@ -32842,7 +34948,7 @@ dAw iSe dre ylO -ycS +vmt aKB fQp wTD @@ -32875,12 +34981,12 @@ iMf kLM pez qTg -ozZ -dBY -lLO -lLO -lLO -lLO +nch +mjM +udV +udV +udV +udV bmU wQG wQG @@ -32954,14 +35060,14 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -vTH -peB +udV +udV +udV +udV +eZR +pnO abf -oJX +ucz oJX oJX oJX @@ -32971,7 +35077,7 @@ oJX oJX oJX fkA -oJX +lFl oJX oJX oJX @@ -32991,7 +35097,7 @@ heZ hzX hzX fsn -hEo +meL cZW gAl lKP @@ -33001,26 +35107,26 @@ xxI sMU lKP lXs -oaB lXs lXs -jWJ -aMO -kMt -ydq -nlf -sZJ -jWJ +lXs +dhS +mpC +vPu +qrv +fsi +vzz +dhS wMA heZ hzX hzX hzX heZ -qmY -jou +qAZ +mpd heZ -dsx +hml dsx dsx xDi @@ -33069,12 +35175,12 @@ bom rLE xKT qTg -peB -dBY -lLO -lLO -lLO -lLO +pnO +mjM +udV +udV +udV +udV bmU wQG wQG @@ -33149,28 +35255,28 @@ bmU bmU bmU bmU -lLO -lLO -lLO -vTH -peB +udV +udV +udV +eZR +pnO abf -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX +ucz +ucz +ucz +ucz +ucz +ucz +ucz +ucz +ucz +ucz +bvW +ucz +ucz +ucz ijT -oJX +oEB lFl oJX oJX @@ -33194,25 +35300,25 @@ wQM xcH rbW lKP -oaB -oaB lXs lXs -jWJ -kaB -kaB -ryG -sSs -fKV -jWJ +lXs +tPa +dhS +jGu +jGu +spj +sIE +oZK +dhS uKM heZ hzX hzX hzX heZ -vYy -pOo +lXs +ueW heZ dsx dsx @@ -33241,12 +35347,12 @@ wqv pCS pbO gwD -hYb -iPA +ric +vpO xXS gbT gbT -nGd +pif gul eel eel @@ -33263,11 +35369,11 @@ tti gzy rcl qTg -ozZ -dBY -lLO -lLO -lLO +nch +mjM +udV +udV +udV bmU bmU wQG @@ -33344,10 +35450,10 @@ bmU bmU bmU bmU -lLO -lLO -vTH -peB +udV +udV +eZR +pnO abf abf abf @@ -33359,11 +35465,11 @@ oJX oJX oJX oJX +lFl oJX oJX oJX -oJX -ijT +lWs lFl lFl kvj @@ -33386,27 +35492,27 @@ ufA tYO wdB xfr -bgk +kxQ lKP -oaB lXs lXs lXs -jWJ -wLS -reA -pTU -oir -fKV -jWJ +hYL +dhS +wgP +gWj +eHz +eaF +oZK +dhS niL heZ heZ heZ heZ heZ -vYy -pOo +dxb +ueW heZ hMF dsx @@ -33434,7 +35540,7 @@ aKB heZ pgW kXJ -gbT +wLg ncr guH phO @@ -33457,10 +35563,10 @@ pqg qTg qTg qTg -peB -dBY -lLO -lLO +pnO +mjM +udV +udV bmU bmU bmU @@ -33539,17 +35645,17 @@ bmU bmU bmU bmU -lLO -vTH -peB -coX -bkx +udV +eZR +pnO +thb +clv abf abf abf abf -oJX -oJX +lFl +lFl lFl lFl lFl @@ -33573,7 +35679,7 @@ orj hEo hEo hEo -eYG +hEo cZW gAl lKP @@ -33582,14 +35688,14 @@ cPo cPo iEZ lKP -oaB +lXs lXs kPF kPF kPF hmh hmh -hmh +jGu tdZ jGu gUS @@ -33598,9 +35704,9 @@ gUS gUS gUS gUS -nxk -vYy -pOo +niL +lXs +ueW heZ pnj xPR @@ -33649,11 +35755,11 @@ mqQ lzL hYD qTg -gNQ -lLO -peB -dBY -lLO +akR +udV +pnO +mjM +udV bmU bmU bmU @@ -33734,10 +35840,10 @@ bmU bmU bmU bmU -lLO -tcC -tcC -tcC +udV +aYP +aYP +aYP abf oJX oJX @@ -33745,12 +35851,12 @@ abf oJX oJX abf -hMx +pQn fzo qAk fzo -fzo -fzo +wXR +wXR qYb uRl vAd @@ -33776,11 +35882,11 @@ mxc mxc mxc mxc -oaB +lXs lXs kPF nHL -nHL +moz nHL qxh hmh @@ -33788,13 +35894,13 @@ wpZ sJv pbI gbt +wiR ntn -ntn -ntn +rfA gUS -vYy -vYy -qZW +lXs +lXs +voW cfT ijo jum @@ -33829,7 +35935,7 @@ ncr vCf gbT onU -oMz +rAC jGR aOO gul @@ -33840,13 +35946,13 @@ kjj eCl rpT gdf -fzY -xCR +xkQ +wKE qTg -tcC -tcC -tcC -lLO +aYP +aYP +aYP +udV bmU bmU bmU @@ -33929,9 +36035,9 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV abf oJX oJX @@ -33942,14 +36048,14 @@ abf lFl lFl lFl -oJX -oJX -oJX -oJX +lFl +gnq +lFl +lFl lFl alH alH -alH +qti alH wPB rVb @@ -33963,14 +36069,14 @@ xZj riy rVb cZW -gAl +nGw mxc vse nvx jta -rJq +brn mxc -oaB +lXs lXs kPF tBe @@ -33986,16 +36092,16 @@ pvV pvV qlB gUS -vYy -vYy -xKi +dxb +lXs +dxb heZ jwH xPR pbZ wep dsx -dsx +nXR dsx jwH sac @@ -34004,14 +36110,14 @@ uSC dzd jwH ePj -uSC +mVD jwH jwH sac xPR xPR xPR -qWt +oiy xPR fKH xPR @@ -34021,9 +36127,9 @@ jBS dOS gbT ncr -eSr -onU -oLz +njl +wUy +usR psH uhO gul @@ -34037,9 +36143,9 @@ axb ftD wCI qTg -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -34125,7 +36231,7 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX @@ -34135,10 +36241,10 @@ oJX oJX oJX oJX +lFl oJX -oJX -oJX -oJX +ucz +igq oJX lFl lFl @@ -34164,7 +36270,7 @@ pvU iuK eFc mxc -oaB +lXs lXs kPF eRO @@ -34180,13 +36286,13 @@ ntn ntn ieg gUS -vYy -nxk -wJj -heZ -heZ -heZ +lXs +niL +lDo heZ +xDi +xDi +xDi heZ heZ heZ @@ -34210,7 +36316,7 @@ heZ slE heZ kXJ -gbT +wLg gbT gbT gbT @@ -34319,7 +36425,7 @@ bmU bmU bmU bmU -lLO +udV abf abf abf @@ -34329,9 +36435,9 @@ oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX oJX @@ -34344,7 +36450,7 @@ rVb bBy abO rVb -uEQ +rXj wtT ofv cQx @@ -34358,15 +36464,15 @@ hwv cOV nJA mxc -oaB -lXs +pzf +kQJ kPF hmh hmh hmh hmh hmh -hKm +cJK wSp pbI pbI @@ -34374,34 +36480,34 @@ pbI pbI pbI gUS -jWJ -jWJ -xKi -vYy -sYi -xaj -xaj -xaj -xaj -xaj -xaj -xaj +dhS +dhS +xCO +bSb +rfm +rFf +rFf +qkx +rFf +rFf +rFf +rFf heZ -nzJ -dzd +qci +uDN dzd heZ -pQv +qAV pQv pQv pQv jVi -hzX +aFP hzX nxk uVV gDQ -lJR +jSR nxk jOg aEg @@ -34513,19 +36619,19 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX oJX @@ -34552,42 +36658,42 @@ wIk wIk xBY mxc -oaB -lXs +pzf +xmr uTg fBj -fBj +rlW fBj oEe oUS wEl qRu gBz -kaB -wCM -usz -ktt -vFe -uCs -jWJ -xKi -vYy -cNl -apA -apA -apA -apA -apA -apA -apA -ivd +jGu +brX +agF +wLJ +dmV +ckq +dhS +sks +xCV +rtf +pzf +pzf +pzf +pzf +pzf +pzf +pzf +cab jwH jwH jwH -ivd -jdS -jdS -jdS +cab +pQv +pQv +pQv pQv jVi hzX @@ -34595,10 +36701,10 @@ hzX nxk sre tOq -kPH +lYx nxk pQv -jdS +pQv nRV eAb oVR @@ -34614,11 +36720,11 @@ pPC nRV pQv rdI -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -34711,15 +36817,15 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX -oJX -oJX -oJX +sob +ucz +ucz oJX fWS oJX @@ -34746,8 +36852,8 @@ nUD nUD nUD nUD -oaB -lXs +pzf +rfm uTg sPX qte @@ -34757,31 +36863,31 @@ byq gnZ gcs qxv -kaB -mKx -rkk -jrb -vcD -mlU -jWJ -xKi -vYy -cNl -apA -kKP -bCn -bCn -bCn -bCn -bCn +jGu +qDl +lQP +ulz +aSr +axU +dhS +wMn +xCV +rtf +pzf +kQJ +xHN +xHN +xHN +xHN +xHN heZ jwH jwH jwH heZ +qdT pQv pQv -jdS pQv jVi hzX @@ -34792,7 +36898,7 @@ cmR xMN nxk pQv -jdS +sDn nRV vmk gXq @@ -34808,8 +36914,8 @@ cPr oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -34905,15 +37011,15 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX oJX @@ -34927,7 +37033,7 @@ bvn gNG oSK clq -ngh +mhf vRx kLp wnn @@ -34937,11 +37043,11 @@ gAl nUD qvi nsF -cqQ +euS aax nUD -oaB -lXs +pzf +rfm uTg jJP fBj @@ -34951,19 +37057,19 @@ oUS wEl mOW rQh -omH -pZb -gyH -xpV -vFe -uCs -jWJ -xKi -vYy -cNl -apA -sYi -lMW +tza +oER +wch +sYA +dmV +ckq +dhS +sks +xCV +rtf +pzf +rfm +fOY hzX hzX heZ @@ -34971,11 +37077,11 @@ heZ oNv jwH jwH -jwH +wlt heZ sVE pQv -jdS +pQv pQv jVi jVi @@ -34986,7 +37092,7 @@ lpN ofJ nxk pQv -jdS +pQv nRV nRV nRV @@ -35002,8 +37108,8 @@ qws oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35099,15 +37205,15 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX +ucz oJX oJX uyJ @@ -35134,15 +37240,15 @@ oSi dNL sPs nUD -oaB -lXs +pzf +rfm uTg oUS oUS oUS oUS oUS -wEl +oHN ewE hDc hDc @@ -35152,16 +37258,16 @@ hDc hDc hDc hDc -xKi -vYy -cNl -apA -sYi -lMW +sks +xCV +rtf +pzf +rfm +fOY hzX hzX xPR -sac +iXQ xPR xPR xPR @@ -35169,7 +37275,7 @@ xPR heZ gaL pQv -jdS +pQv pQv pQv pQv @@ -35180,7 +37286,7 @@ nxk nxk nxk pQv -jdS +pQv pQv pQv pQv @@ -35196,8 +37302,8 @@ qws oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35293,23 +37399,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX -oJX -oJX -oJX -oJX -oJX -sll -oJX -oJX -oJX -oJX +ucz +ucz +ucz +ucz +fcR +ucz +ucz +ucz +ucz oSK pYy tjp @@ -35328,11 +37434,11 @@ eTH hzV uXb nUD -oaB -lXs +pzf +rfm dsN gqX -qXI +iUY fLu aig ocr @@ -35340,22 +37446,22 @@ wEl qRu hDc dLJ -uig +dZj uig uig uig uig hDc -xKi -vYy -cNl -apA -sYi -lMW +sks +xCV +rtf +pzf +rfm +fOY hzX hzX xPR -sac +cQj xPR xPR xPR @@ -35363,21 +37469,21 @@ xPR heZ pQv pQv -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS -jdS +pQv +pQv +pQv +pQv +pQv +nov +pQv +pQv +pQv +pQv +pQv +pQv +pQv +pQv +pQv pQv nRV oOj @@ -35390,8 +37496,8 @@ nIb nRV pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -35487,23 +37593,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX +lFl oJX +sCY oJX -lFl -lFl -lFl -lFl -aKS -lFl -lFl -lFl oJX +qnA +adB +qnA +oJX +oJX +ucz oSK viM coC @@ -35522,8 +37628,8 @@ vgc vgc ppG nUD -oaB -lXs +pzf +rfm dsN nUE hBb @@ -35540,24 +37646,24 @@ oQw sGj iDo hDc -xKi -vYy -iAi -apA -usl -xaj -pHy -nxk -nxk -nxk -nxk -nxk -wDN -wDN -afM -afM -afM -afM +poE +xCV +iYZ +pzf +sxK +rFf +tyw +niL +niL +niL +niL +niL +xPR +xPR +heZ +heZ +heZ +heZ hSM hSM gTv @@ -35571,7 +37677,7 @@ jwS jwS jwS jwS -jdS +pQv pQv nRV kGP @@ -35584,8 +37690,8 @@ mbb oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35681,23 +37787,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX -oJX -oJX -lFl lFl -lFl -kvj -qHB -kvj -lFl -lFl -oJX +qnA +qnA +kao +qnA +lTf +tGS +lTf +qnA +qnA +ucz oSK oSK oSK @@ -35708,7 +37814,7 @@ oSK oSK oSK oSK -qLP +mKt hpH odi odi @@ -35716,8 +37822,8 @@ odi odi odi odi -oaB -lXs +pzf +rfm dsN eUu fLu @@ -35732,40 +37838,40 @@ uig uig oMB uig -uig +mQo hDc -xKi -xKi -apA -apA -apA -apA -vYy -vYy -vYy -jAA -tSb -nxk -wDN -wDN -wDN -ocd -wDN -wDN +sks +xCV +pzf +pzf +pzf +pzf +xCO +sfx +skp +qbU +lHp +niL +xPR +xPR +xPR +vEK +xPR +xPR hSM -hjv +bRr tzW vdr quX umN jwS -vdj +emI bLT bjV waD fin jwS -jdS +pQv pQv nRV dxK @@ -35778,8 +37884,8 @@ itg oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -35875,28 +37981,28 @@ bmU bmU bmU bmU -lLO +udV abf oJX -leG -dHn -dHn -dHn -leG -xpK -xpK -rIz +kFg +cXs +cXs +cXs +kFg +oxY +oxY +vQe +cpB +xTr +uaF +bYo +qnA ucz -gSx -ucz -rGc -lFl -oJX jvs faD cpF jvs -oQh +ycm cvX ykB bUx @@ -35910,16 +38016,16 @@ toK aTd peW odi -oaB -lXs +pzf +rfm dsN ocr ocr ocr ocr ocr -fKr -aRn +oHN +qRu dhS dhS dhS @@ -35928,24 +38034,24 @@ oMB uig uig hDc -xKi -xKi -apA -apA -apA -apA -xKi -xKi -xKi -xKi -xKi -nbN -wDN -wDN -wDN -wDN -wDN -rhm +vpH +oaB +pzf +pzf +pzf +pzf +vpH +dJz +ivs +ivs +oaB +kub +xPR +xPR +xPR +xPR +uTa +fGz hSM tWN tzW @@ -35959,11 +38065,11 @@ uNR bLT lZk jwS -jdS +pQv pQv nRV aRD -rvu +nsv atn nhh rHa @@ -35972,8 +38078,8 @@ swy oSa pQv oGO -lLO -lLO +udV +udV bmU bmU bmU @@ -36069,23 +38175,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX -dHn -wPB -wPB -wPB -dHn -xpK -xpK -rIz -ucz -gSx +cXs +npe +npe +npe +cXs +oxY +oxY +qHF +cpB +xTr +uaF +bYo +lTf ucz -rGc -lFl -oJX jvs eXA qoC @@ -36104,11 +38210,11 @@ ttV mYB vTl odi -iQA -lXs +pzf +rfm bqC pUp -pUp +egH pUp wUb vqH @@ -36124,9 +38230,9 @@ mES mES mES mES -jWJ -wlo -nxk +kob +ixc +niL afM afM hsS @@ -36134,12 +38240,12 @@ hsS iuY hsS hsS -hsS -qye -hsS -wDN -wDN -wDN +qDv +pgW +qDv +xPR +uTa +xPR hSM xLj fCJ @@ -36153,11 +38259,11 @@ nxn xnn jAs jwS -gRZ +iLB jVi nRV jjL -lOo +cVt elt ubn dmf @@ -36166,8 +38272,8 @@ fUW nRV pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36263,23 +38369,23 @@ bmU bmU bmU bmU -lLO +udV abf -oJX -dHn -wPB -wPB -wPB -xpK -xpK -xpK -rIz -ucz -gSx -ucz -rGc lFl -oJX +cXs +npe +npe +npe +vBd +oxY +oxY +qHF +cpB +xTr +uaF +bYo +lTf +ucz jvs aGN tmn @@ -36298,8 +38404,8 @@ nnM adb cal odi -iQA -lXs +kub +niL bqC nsR sBy @@ -36319,8 +38425,8 @@ lkm fhX mES mES -xKi -vYy +xCO +bSb hsS hsS lIw @@ -36328,11 +38434,11 @@ uxD iyQ dpu tay -hsS -iWI -tvI -xjP -xjP +qDv +oNp +kkd +nLr +bMn hsS hSM jZX @@ -36347,7 +38453,7 @@ hNa umD lRX jwS -jdS +pQv pQv nRV nRV @@ -36360,8 +38466,8 @@ nRV nRV deI rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36457,23 +38563,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX -dHn -wPB -wPB -wPB -xpK -xpK -xpK -rIz -ucz -gSx +cXs +npe +npe +npe +vBd +oxY +oxY +qHF +oIP +xTr +oIP +bYo +lTf ucz -rGc -lFl -oJX jvs bKp mTw @@ -36489,10 +38595,10 @@ gAl odi fRE iBF -bvw +hOp tBJ odi -iQA +lXs lXs bqC uzi @@ -36513,8 +38619,8 @@ uDy iRS xWZ mES -xKi -vYy +wMn +xCV hsS enF vsV @@ -36522,12 +38628,12 @@ vsV vsV vsV qeW -hsS -hsS -hsS +qDv +qDv +qDv fwZ gDe -azc +gfn hSM hSM hSM @@ -36541,21 +38647,21 @@ nJl cjB nJl jwS -jdS pQv -qKW +sDn +aNW cFD kKe -qKW +aNW +pQv pQv -jdS pQv pQv pQv pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36651,23 +38757,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX -dHn -wPB -wPB -wPB -dHn -xpK -xpK -rIz -ieA -gSx +cXs +npe +npe +npe +cXs +oxY +oxY +qHF +cko +xTr +oIP +bYo +lTf ucz -rGc -lFl -oJX jvs jvs jvs @@ -36686,7 +38792,7 @@ uDX uDX uDX uDX -iQA +lXs lXs bqC bqC @@ -36707,10 +38813,10 @@ oPo oPo gir mES -xKi -vYy +sks +xCV hsS -noo +gtn lyW tdU frw @@ -36735,21 +38841,21 @@ fdk wxQ vwI ano -jdS pQv -qKW +pQv +aNW cFD cFD -qKW +aNW +pQv pQv -jdS pQv pQv pQv pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -36845,28 +38951,28 @@ bmU bmU bmU bmU -lLO +udV abf oJX -leG -dHn -dHn -dHn -leG -xpK -xpK -rIz -ucz -gSx +kFg +cXs +cXs +cXs +kFg +oxY +oxY +qHF +oIP +xTr +oIP +bYo +lTf ucz -rGc -lFl -oJX hKl mTA kNp hKl -oQE +vRw uRw eqb chW @@ -36880,14 +38986,14 @@ pat hrP ekp uDX -iQA -oaB +lXs +lXs bTF ktR rVu ktR wNm -oaB +lXs hvC pkl fLP @@ -36901,8 +39007,8 @@ oPo pyf hqQ mES -xKi -vYy +sks +xCV hsS scJ dtR @@ -36934,16 +39040,16 @@ bxu isn lNA cFD -qKW -pQv -jdS -pQv -pQv +aNW pQv pQv +jVi +jVi +jVi +jVi rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37039,23 +39145,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -xpK -xpK -oJX +qnA +tZK +xJY +qWW +oIP +lsF +oIP +bYo +qnA +ucz hKl vzP ycp @@ -37072,16 +39178,16 @@ hdr dRI xyl jwl -rEI +nIH uDX -dQg -lXs +cPk +qQL niL ktR ktR ktR niL -oaB +lXs hvC uzR hvC @@ -37095,8 +39201,8 @@ oPo pyf snQ mES -xKi -vYy +sks +xCV hsS rxc pGd @@ -37108,36 +39214,36 @@ wbY wbY wbY oVV -bPn -avz -iXz -fdk -ajY -aeM -nks -fdk -fdk -kzO -gMZ -pvd -nks -fdk +elf +uDw +sky +wZo +iey +kTW +iYL +wZo +wZo +sNR +lfz +bAg +iYL +vQI ano icH pQv -qKW +aNW iOk vUe -qKW -pQv -jdS -pQv -pQv -pQv +aNW pQv +sDn +jVi +bjM +bjM +tIV rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37233,23 +39339,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX +qnA +qnA +yed +qnA +qnA +adB +qnA +qnA +qnA +ucz hKl iIt wYi @@ -37275,9 +39381,9 @@ gEp gEp gEp emW -oaB -oaB -oaB +wZw +lXs +lXs hvC hvC mES @@ -37289,8 +39395,8 @@ oPo oPo msK mES -xKi -vYy +sks +xCV hsS bbh xjA @@ -37302,7 +39408,7 @@ wbY wbY wbY oVV -qqz +wQf fRG ifZ pWk @@ -37319,19 +39425,19 @@ ano ano icH kYl -qKW -qKW -qKW -qKW -kYl -jdS -kYl +aNW +aNW +aNW +aNW kYl pQv +jVi +jLV pQv +jLV rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37427,23 +39533,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +lFl oJX +ijT oJX oJX -oJX -oJX -oJX -oJX -oJX -oJX -oJX +pUm +ucz +ucz +ucz +ucz hKl kQy agy @@ -37455,23 +39561,23 @@ aQa cOt hKl cZW -gAl +nGw uDX ixM dSS dSS dSS uDX -dQg -lXs +wHl +nCv emW ftR ftR ftR emW -oaB lXs -oaB +lXs +lXs lXs lXs mES @@ -37483,8 +39589,8 @@ oPo oPo xJO mES -xKi -rxD +sks +wNe hsS vqk pGd @@ -37496,7 +39602,7 @@ wbY wbY wbY pyo -kPZ +blY fEO gBi qxm @@ -37518,14 +39624,14 @@ pQv pQv jVi pQv -jdS -pQv pQv +tpE pQv +jLV pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -37621,23 +39727,23 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +sob oJX +ijT oJX oJX +ucz oJX -oJX -oJX -oJX -igr -igr -igr +lFl +lFl +lFl hKl hKl hKl @@ -37656,16 +39762,16 @@ uDX uDX uDX uDX -dQg +kuJ lXs emW +gKt ftR -ftR -ftR +mry emW -oaB lXs -oaB +lXs +lXs lXs lXs mES @@ -37677,20 +39783,20 @@ oPo oPo kJX mES -xKi -cNl +sks +rtf hsS -mGL +ejn dtR kFJ fVL nEF pZE -cGd -djK -mxr +wAu +nPU +byb oud -uGe +lxm wkU hjR xpP @@ -37712,13 +39818,13 @@ bPc vjf jVi pQv -jdS -pQv -pQv -pQv pQv +jVi +ajP +jLV +jVx rdI -lLO +udV bmU bmU bmU @@ -37815,33 +39921,33 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +lFl oJX +ijT oJX oJX +ucz oJX +lFl +clX oJX oJX -oJX -igr -qbd -sCK -sCK -wnS -wmf +gPj +aRg wCD hEo bYD eof eof tVC -bak +tVC xWA rjo qlJ @@ -37859,7 +39965,7 @@ hso emW kRJ lXs -oaB +lXs lXs lXs mES @@ -37871,8 +39977,8 @@ oPo oPo mRl mES -xKi -xKi +kHm +xCV hsS xXt lyW @@ -37880,13 +39986,13 @@ sJG frw sJG pZE -wAu -nPU -byb +iHo +lGR +xWG oud -uGe +lxm wkU -rVt +lZd nPU nPU nPU @@ -37899,20 +40005,20 @@ qne mNL tCg qne -icH +sVt pQv pQv pQv pQv jVi pQv -jdS -pQv -pQv pQv +jVi +nfJ pQv +tdu rdI -lLO +udV bmU bmU bmU @@ -38009,26 +40115,26 @@ bmU bmU bmU bmU -lLO +udV abf oJX oJX oJX oJX oJX +lFl oJX +ijT oJX oJX +ucz oJX -oJX -oJX -oJX -igr -wtd -sCK -sCK -sCK -mbz +lFl +nzv +wou +fzo +fzo +fLd wCD hEo kjl @@ -38044,16 +40150,16 @@ hEo hEo hEo niL -oaB -oaB -dwD +lXs +lXs +lZx hso hso hso emW itl lXs -oaB +lXs lXs lXs mES @@ -38065,8 +40171,8 @@ eHd eHd mES mES -xKi -vYy +vpH +oaB hsS bOP ifB @@ -38078,7 +40184,7 @@ vsV vsV vsV neO -vnT +poA bIO rVt nPU @@ -38093,20 +40199,20 @@ qne mGl qne qne -ciA -jdS -jdS -jdS -jdS -gRZ -jdS -jdS pQv pQv pQv pQv +pQv +gRZ +pQv +pQv +jVi +his +jLV +eQj rdI -lLO +udV bmU bmU bmU @@ -38210,19 +40316,19 @@ abf abf abf oJX +lFl oJX +mqr +wXR +wXR +wXR +wXR +wUA +wXR +bts oJX oJX -oJX -oJX -oJX -ucz -cPY -riK -sCK -sCK -sCK -pOc +ipY wCD hEo hEo @@ -38247,7 +40353,7 @@ ozC nHo eYq lXs -oaB +lXs lXs mES mES @@ -38259,7 +40365,7 @@ mES mES mES mES -dwD +opN emW hsS hsS @@ -38267,14 +40373,14 @@ hsS rKv vGz vGz -eNJ -gru -dDa -qRz -kwb -mXv +atW +chG +sdW +gvY +sqt +ucA nww -rVt +xpP nPU nPU nPU @@ -38284,14 +40390,14 @@ jHC vEL usE qne -lLO +udV rdI -jdS -jdS +qdT pQv pQv pQv pQv +sDn jVi pQv pQv @@ -38398,35 +40504,35 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV abf abf abf abf abf oJX +sCY oJX oJX -oJX -igr -riK -riK -riK -riK -uaP -xXe -vBA -vBA -mUN -psN -iDB -qJr -kDy -pch -rdN +lFl +ucz +ucz +rDD +wXR +voS +gfK +eip +eip +kUm +daB +owP +mfw +mSq +uwq +hhH bwN hLw pxE @@ -38440,8 +40546,8 @@ hso hso emW sAV -oaB -oaB +lXs +lXs lXs mES bqt @@ -38451,7 +40557,7 @@ eHd qfM hso vLQ -hso +ocY oEo hso hso @@ -38461,7 +40567,7 @@ hsS cnD vGz vGz -pcR +gKZ lXK gHd dJT @@ -38478,22 +40584,22 @@ uqB qxy buO kss -lLO +udV rdI -jdS pQv pQv pQv pQv pQv +qAV rdI rdI rdI rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -38592,28 +40698,28 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV abf abf abf abf abf -vtV -mYx -vtV -vtV -vtV -vtV +abf +uRl +abf +abf +abf +abf oly hEo -hEo +wOY dUF tVC nVP @@ -38633,10 +40739,10 @@ hXO hso hso emW -lXs -oaB +wZw lXs lXs +faG mES cuX bmy @@ -38644,18 +40750,18 @@ jUE eHd qfM uBh -uBh -uBh -uBh -uBh -hso -hso +aAR +vfS +vzt +hJF +akH +cOg hso hsS yhU vGz vGz -pcR +gKZ lXK xbY dJT @@ -38672,7 +40778,7 @@ jHC jHC buO kss -lLO +udV rdI cHK rdI @@ -38681,13 +40787,13 @@ rdI rdI rdI rdI -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -38786,31 +40892,31 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV abf abf -vtV -riK -vtV -oSj -oSj -vtV +abf +ucz +abf +gjO +gjO +abf oly oly oly oly -cnj -eQJ +kIO +jZH pch pch pch @@ -38824,11 +40930,11 @@ pch pch pch pam -gpm +kLy ibx emW lXs -oaB +lXs niL niL mES @@ -38838,19 +40944,19 @@ mES vWz qfM oMV -oMV +taF piS oMV -oMV +taF piS mMY -hso +tWF hsS pxq vuU vuU -pyL -ezf +iKe +xhM xXn pTe vxh @@ -38866,22 +40972,22 @@ xjg fQC wzi qne -lLO +udV rdI -jdS +pQv rdI rdI rdI -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -38980,24 +41086,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vtV -riK -vtV -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +abf +tvL +abf +udV +udV aBR byk byk @@ -39018,7 +41124,7 @@ wif wif pch gLE -cam +tMz dsv cGO hhb @@ -39029,8 +41135,8 @@ lXs lXs niL lXs -oaB -emW +lXs +ajH uBh uBh lMo @@ -39043,7 +41149,7 @@ vXI vXI fFj dkJ -vkf +tKY vXI vXI vXI @@ -39060,22 +41166,22 @@ qne kss qne qne -lLO +udV rdI -jdS +pQv rdI -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39175,23 +41281,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -vtV -riK -vtV -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +abf +ucz +abf +udV +udV aBR byk byk @@ -39212,18 +41318,18 @@ wif wif pch uBh -bFy -pWL +ncc +crA emW lXs -qEJ +oaM niL lXs lXs lXs niL lXs -oaB +lXs emW uBh uBh @@ -39237,10 +41343,10 @@ uAq xNZ eym eym -uGi +fhg xNz -dkJ -puH +vXI +hwV eKy bat mnb @@ -39251,24 +41357,24 @@ hUY qHN uhv phl -lLO -lLO -lLO -lLO +udV +udV +udV +udV oGO -jdS +pQv oGO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39371,25 +41477,25 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -uIm -riK -uIm -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +iyD +ucz +iyD +udV +udV +udV +udV +udV +udV xFO hso hti @@ -39406,18 +41512,18 @@ wif wif pch uBh -bFy +ncc dwV emW lXs -qEJ +oaM niL lXs lXs lXs niL lXs -oaB +lXs emW syC syC @@ -39431,7 +41537,7 @@ vXI eyW iIu iIu -hRq +jYI lsP dkJ aHx @@ -39440,27 +41546,27 @@ cwJ uFA vXI whN -jqj +jaq rWS drX cvm phl -lLO -lLO -lLO -lLO +udV +udV +udV +udV oGO -jdS +pQv oGO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39567,23 +41673,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -uIm -riK -uIm -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +iyD +ucz +iyD +udV +udV +udV +udV +udV +udV xFO erM hRb @@ -39600,18 +41706,18 @@ wif wif pch hso -bFy +ncc hXO emW -lXs -qEJ +lph +xFM niL lXs lXs lXs niL lXs -oaB +lXs emW emW emW @@ -39621,11 +41727,11 @@ mSC emW mMY hso -jYU +chn tqf iIu qwH -iFS +gRV xLM dkJ lbG @@ -39634,25 +41740,25 @@ vvi bqB vXI phn -kQx +hfn mna ljR sdR oiY -lLO -lLO -vTH -lLO +udV +udV +eZR +udV oGO -jdS +pQv oGO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -39764,22 +41870,22 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -uIm -riK -uIm -lLO -lLO -lLO -vTH +udV +udV +udV +udV +udV +iyD +ucz +iyD +udV +udV +udV +eZR lMW lMW sYI -hso +wMH nbZ pch wif @@ -39797,29 +41903,29 @@ xrX eHE kAx emW -lXs -qEJ niL +gii niL -kcG +niL +iFo niL niL lXs -oaB lXs lXs +oug lXs lXs lXs lXs emW -mMY -hso -vtd -gvf -iIu -tFf -gMF +mEL +xyT +eqV +mVg +qQN +jNO +anf xLM dkJ mDV @@ -39828,23 +41934,23 @@ tPB xGy vXI dvm -fzJ +hAg rqp drX cHm oiY cKt -lLO -vTH -bCq +udV +eZR +mSl rdI -jdS +pQv rdI -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -39959,17 +42065,17 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -vtV -riK -vtV -lLO -lLO -lLO -vTH +udV +udV +udV +udV +abf +ucz +abf +udV +udV +udV +eZR lMW lMW sYI @@ -39988,29 +42094,29 @@ wif wif pch hso -vPi +nkZ hXO emW lXs -qEJ -oaB -xWT -xWT +oaM +lXs +mEB +jms xWT xWT xWT mfl -cWf -cWf +vUJ +enK cWf cWf gnV -lXs +niL emW -mMY +pAo hso vXI -orW +rWu iIu iIu hRq @@ -40022,7 +42128,7 @@ fSs dkJ vXI uIR -mna +fGn laC xob prA @@ -40034,10 +42140,10 @@ rdI rdI cHK rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -40153,19 +42259,19 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -vtV -mYx -vtV -vtV -vtV -vtV -vtV -vtV -vtV +udV +udV +udV +udV +abf +uRl +abf +abf +abf +abf +abf +abf +abf sYI hso hso @@ -40182,14 +42288,14 @@ wif wif pch ozC -iMj +oVF aSR emW lXs oaM lXs lXs -oaB +lXs mmy mmy mmy @@ -40197,12 +42303,12 @@ jzA mmy mmy lXs -lXs -aBe -lXs -emW -mMY +qAZ +qYq +niL hso +pAo +tWF vXI iAH iIu @@ -40216,22 +42322,22 @@ eym gqE vXI kxm -gXK +oUf qpe vkV vkV phl -xFO -bzo -eBM +oGO +rdI +knI +pQv pQv pQv -jdS rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -40347,19 +42453,19 @@ wQG wQG bmU bmU -lLO -lLO -lLO -lLO -vtV -riK -sCK -sCK -sCK -igr -sCK -sCK -sCK +udV +udV +udV +udV +abf +ucz +oJX +igq +oJX +lFl +oJX +oJX +oJX emW hso hso @@ -40376,14 +42482,14 @@ wif wif pch hso -vPi +nkZ hXO emW pzf mvn lXs lXs -oaB +lXs mmy oJp hoO @@ -40393,9 +42499,9 @@ mmy lXs lXs aBe -lXs -emW -mMY +niL +eow +eIE hso vXI ykH @@ -40410,22 +42516,22 @@ pDj mJE vXI iaK +iwG hso hso -hso -hso -hso -hso -emW -eBM +jVi +pQv +pQv pQv +knI pQv -jdS +pQv +sDn rdI -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -40542,18 +42648,18 @@ wQG bmU bmU bmU -lLO -lLO -lLO -vtV -riK -sCK -sCK -qbd -igr -sCK -sCK -sCK +udV +udV +udV +abf +ucz +oJX +oJX +clX +lFl +oJX +oJX +oJX cyg hso hso @@ -40570,26 +42676,26 @@ wif wif pch hso -vPi -hXO +nkZ +eOb emW pzf cZb lXs lXs -oaB +lXs mmy edA edA ldC nxm mmy -lXs -lXs -aBe eYq +lXs +gov +niL emW -mMY +pAo hso vXI xFE @@ -40604,21 +42710,21 @@ erU ucH vXI tMD +iwG hso -hso -hso -hso -hso -hso -emW +oEo +jVi +pQv +pQv +pQv +pQv pQv pQv pQv -jdS rdI -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -40736,18 +42842,18 @@ wQG bmU bmU bmU -lLO -lLO -lLO -vtV -riK -sCK -sCK -wtd -igr -sCK -sCK -sCK +udV +udV +udV +abf +ucz +oJX +oJX +nzv +lFl +oJX +oJX +oJX ruW hso hso @@ -40764,26 +42870,26 @@ wif wif pch hso -bFy +ncc hXO emW lXs lXs lXs lXs -oaB +lXs mmy edA -edA -ldC +ddp +vwZ nxm mmy -lXs +sAV lXs aBe -sAV +lXs emW -mMY +pAo hso vXI qGO @@ -40798,21 +42904,21 @@ fat jHD vXI hso +iwG hso -hso -hso -hso -hso -hso -dwD -jdS -jdS -jdS -jdS +qpu +jVi +qdT +pQv +pQv +pQv +pQv +pQv +pQv rdI -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -40930,21 +43036,21 @@ wQG bmU bmU bmU -lLO -lLO -lLO -vtV -riK -sCK -sCK -sCK +udV +udV +udV +abf +ucz +oJX +oJX +oJX emW emW emW emW emW -cXP -cXP +anX +nSq pch pch pch @@ -40958,7 +43064,7 @@ pch pch pch hso -bFy +ncc hXO tnL emW @@ -40969,7 +43075,7 @@ kPV mmy kMU hCC -qqg +vEd mmy mmy emW @@ -40977,36 +43083,36 @@ emW wSO emW emW -pRy -uBh +pAo +hso vXI wvu uQP uQP vXI -rqS -kNS +xZD +peD vXI uQP uQP wvu dFP hso +iwG hso -hso -hso -hso -hso -hso -emW -sVE +qpu +jVi +pQv +pQv +pQv +pQv pQv pQv pQv rdI -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -41125,22 +43231,22 @@ bmU bmU bmU bmU -lLO -lLO -vtV -riK -riK -riK -riK +udV +udV +abf +ucz +ucz +ucz +ucz dwD hso vLQ +ocY hso -qMQ hso hso -qMQ hso +ocY hso hso hso @@ -41149,29 +43255,29 @@ hso ozC hso vLQ +ocY hso -qMQ uBh -bFy +ncc dwV -qMQ hso +ocY vLQ hso ozC hso -qMQ +hso uBh tOi uBh -uGj +rYF hso ozC hso uot -vLQ -qMQ -mMY +pnl +hso +pAo hso hso hso @@ -41186,20 +43292,20 @@ hso ozC hso hso +iwG hso -hso -hso -hso -hso -hso -emW +qpu +jVi +pQv +pQv +sVE gaL pQv pQv pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -41319,10 +43425,10 @@ bmU bmU bmU bmU -lLO -lLO -vtV -sCK +udV +udV +abf +oJX emW emW emW @@ -41346,7 +43452,7 @@ koc nPp nPp nPp -sDo +igS mpQ rSP nPp @@ -41365,7 +43471,7 @@ hBV gHy koc hBV -bve +ivv cLa cLa cLa @@ -41374,26 +43480,26 @@ cLa cLa cLa cLa -hso -hso -hso -ozC -hso -hso -hso -hso -hso -hso -hso -hso -emW -emW -emW -emW +mAY +cLa +cLa +wJp +cLa +cLa +dlF +cLa +gzI +jVi +ePF +jVi +jVi +jVi +jVi +jVi pQv rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -41513,10 +43619,10 @@ bmU bmU bmU bmU -lLO -lLO -vtV -vtV +udV +udV +abf +abf bzo ftR ftR @@ -41525,14 +43631,14 @@ hso hso muM hso +lZv hso hso hso hso hso hso -ycJ -muM +sRa hso ozC hso @@ -41544,7 +43650,7 @@ uBh woZ afq hso -spg +ncO hso ozC hso @@ -41559,24 +43665,24 @@ hso uot muM afq -lZv -hso -hso -hso +cex hso hso hso +pqV hso hso hso hso +muM hso +pqV ozC hso hso +iwG hso -hso -hso +vPi hso hso hso @@ -41586,8 +43692,8 @@ ftR bzo rdI rdI -lLO -lLO +udV +udV bmU bmU bmU @@ -41708,9 +43814,9 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV bzo ftR ftR @@ -41718,19 +43824,19 @@ emW hso hso emW -emW -dwD -emW -emW -emW -emW -emW -emW +igr +anp +igr +igr +igr +igr +igr +igr ast ast ast -cNQ -cNQ +lnA +aDs ast ast itJ @@ -41738,39 +43844,39 @@ ast ast nmI rDl -hBO +tMp rDl ort -nPJ +upt fgF fgF fgF fgF fgF -vZK +ihC ort rDl hZr rDl nmI -mIH -emW -emW -emW -emW -emW -emW -emW -emW -emW -emW -emW -emW -nHo -hso -hso +gWt +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +pNn +jLk hso +iwG hso +vPi hso hso hso @@ -41778,9 +43884,9 @@ emW ftR ftR bzo -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -41902,9 +44008,9 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV bzo ftR ftR @@ -41912,17 +44018,17 @@ nHo hso hso emW -tSb -xKi -vYy -vYy -vYy -vYy -gfx -vYy +qbd +kUQ +sCK +sCK +sCK +sCK +jzh +sCK ast otO -dIr +pZe ayu qWs tuS @@ -41932,39 +44038,39 @@ alC mGJ bbX eol -oUt -cIK +cuD +tsi ort -dKt -uDl -uDl -uDl -uDl -uDl -jhy +kmY +lxZ +nbe +lxZ +nbe +nbe +pdh ort -biS +fdu vEY -cIK +iLN nmI -kuG -pjR +hyj pjR +eiY pjR pNn saW pjR pjR -pjR +wwS jDS pjR -pjR +eiY pjR pNn hso +iwG hso -hso -hso +vPi hso hso hso @@ -41972,9 +44078,9 @@ emW ftR ftR bzo -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -42096,24 +44202,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -bzo +udV +udV +udV +qaJ hso hso pKS hso hso emW -jAA -xKi -vYy -vYy -vYy -vYy -gfx -vYy +wtd +hBJ +sCK +sCK +sCK +sCK +jzh +sCK ast fcj qPR @@ -42126,8 +44232,8 @@ eKU iup wPI lYl -jUI -fIh +exf +qVc uYU vmy umM @@ -42137,28 +44243,28 @@ vmy umM vmy rTZ -ntf +lJb cjI fJC nmI -kuG +hyj pjR pjR pjR pNn kxq pjR -pjR -pjR +kMQ +gue jDS pjR -cGb -cGb -xvS -hso -hso -hso +pmi +mjs +pGm +xyT +gDV hso +keX hso hso hso @@ -42166,9 +44272,9 @@ hso hso hso bzo -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -42291,23 +44397,23 @@ bmU bmU bmU bmU -lLO -lLO -bzo -hso +udV +udV +qaJ +pqV hso anX hso hso emW -vYy -xKi -xKi -xKi -xKi -xKi -xKi -vYy +sCK +lsH +riK +riK +riK +riK +riK +sCK ast gfV qPR @@ -42315,12 +44421,12 @@ pWr pWr pWr pWr -pWr +mlH eKU iup wPI lYl -ruc +cyz kQI xnP gxn @@ -42333,24 +44439,24 @@ gxn mLa aQe vhx -fJC +wMF nmI -kuG +hyj pjR pjR pjR pNn kxq pjR -cGb -cGb -cGb -cGb -cGb +oaw +dNX +mjs +mjs +pGK pEp ilP hso -hso +vtk oHd uCf hso @@ -42360,8 +44466,8 @@ hso hso hso bzo -lLO -lLO +udV +udV bmU bmU bmU @@ -42485,23 +44591,23 @@ bmU bmU bmU bmU -lLO -lLO -bzo +udV +udV bzo bzo bzo bzo +qaJ +qaJ bzo -bzo -aBR -aBR -aBR -aBR -aBR -vYy -vYy -vYy +vtV +vtV +vtV +vtV +vtV +sCK +sCK +sCK ast gjj rHt @@ -42514,8 +44620,8 @@ pNK iup wPI lYl -jUI -izi +exf +wRV xnP fEt bTz @@ -42525,18 +44631,18 @@ wql qlX jXW mLa -soC +wtb cjI fJC nmI -kuG -pjR +hyj +kMQ pjR pjR pNn pNn pjR -cGb +nQs pjR jDS pjR @@ -42554,8 +44660,8 @@ bzo bzo bzo bzo -lLO -lLO +udV +udV bmU bmU bmU @@ -42679,36 +44785,36 @@ bmU bmU bmU bmU -lLO -lLO -lLO -aBR -aBR -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -aBR -aBR +udV +udV +udV aBR aBR +udV +udV +udV +udV +udV +udV +udV +udV +vtV +vtV +vtV +vtV kJp eiv tAU gQF vVq qGT -dDU -obN +ocC +qPR eKU tCa -nfj +wPI lYl -jUI +exf fJC aeO vge @@ -42723,33 +44829,33 @@ lYl cjI fJC nmI -wyq -qJL -cee -fNz -hHn -fNz -fNz -sGJ -pjR +blP +fgs +iuu +pUN +kKN +pUN +pUN +vvk +lVy ilP ilP ilP ilP ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV aBR aBR -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -42873,23 +44979,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV aBR aBR -lLO -lLO -lLO -lLO -bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +bmU +udV +udV +udV +udV +udV +udV +udV kJp kJp xHO @@ -42897,27 +45003,27 @@ xHO xHO kJp ast -ast -qqq +oVB +bmu nmI -rFO -lYl -jUI -qcS +mLP +dFw +brK +fJC qdl -xZX -xZX -xZX -xZX -xZX -xZX -xZX +vZd +vZd +vZd +ukO +vZd +vZd +vZd gkF -nSy -cjI -fJC +lYl +qiH +oRI nmI -gyD +sYv pjR orT pjR @@ -42927,23 +45033,23 @@ ilP ilP ilP ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +bmU +udV +udV +udV +udV aBR aBR -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU @@ -43067,77 +45173,77 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV pNz uBX -iZQ +lQn aeT rha -nfj +wPI lYl -jUI -qcS +exf +fJC fSj -xZX -xZX -xZX -xZX -xZX -xZX -xZX +vZd +vZd +vZd +vZd +vZd +vZd +vZd nfl -nSy -cjI +lYl +rwX fJC nmI -xMX -pjR +hgD +lVy pjR pjR ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43263,34 +45369,34 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV vsN -uti +dYu noS qgB rxT wPI lYl -jUI +exf fJC qoE nuS @@ -43302,34 +45408,34 @@ xZX jjf wAO lYl -cjI +rwX fJC nmI -gyD +sYv ilP ilP dgT ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -43457,10 +45563,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43468,24 +45574,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV vsN -wPm +vbQ ogK kzy rxT wPI lYl -jUI -fIh +exf +qVc xnP fEt xcE @@ -43495,24 +45601,24 @@ wql fFc jXW mLa -ntf -cjI +aOJ +rwX fJC nmI -gyD +sYv ilP pjR pjR ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43520,10 +45626,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43651,10 +45757,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43662,23 +45768,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV pNz -wZd -bkw +qPx +lQn lQn rxT wPI lYl -dHC +gjG lPz xnP gxn @@ -43690,23 +45796,23 @@ dty gxn mLa njr -lMH -fJC +voh +wMF nmI -gyD +sYv ilP pjR pjR ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43714,10 +45820,10 @@ bmU bmU bmU bmU -lLO +udV aBR aBR -lLO +udV bmU bmU bmU @@ -43845,10 +45951,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -43856,24 +45962,24 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -pNz -pNz +udV +udV +udV +udV +udV +udV +udV +udV +udV pNz +haP lQn -iWj -nfj +lQn +rxT +wPI lYl -jUI -izi +exf +wRV quf uHB jqt @@ -43883,24 +45989,24 @@ uHB jqt uHB xwu -soC -cjI +wtb +rwX fJC nmI -lPP +hpI dMw ilP dgT ilP -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -43908,10 +46014,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -44039,10 +46145,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -44051,23 +46157,23 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV pNz -vPC -ght -pXE +rdj +lQn +lQn +rxT +nfj lYl -jUI -jYg +exf +wES pIK rKn ufL @@ -44078,22 +46184,22 @@ ufL vds cmC qbk -cjI +rwX fJC boB -cFn +cyI mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44102,10 +46208,10 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -44234,8 +46340,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44245,49 +46351,49 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV pNz uzr -ght -iTX +stN +lQn +rxT +nfj lYl -fuV -xDX -vJO -kRv -kRv -kRv -nyv -kRv -kRv -kRv -vPy -xDX -qHI -qMA -ogt -gLZ +ejM +dAH +xan +fec +fec +fec +tMe +fec +fec +fec +hhP +dAH +oMf +uka +azw +qXB mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44297,8 +46403,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44428,8 +46534,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44439,21 +46545,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV pNz uzr -ght -qcr -eDV +stN +lQn +iWj +nfj +lYl jYE tHh raE @@ -44471,17 +46577,17 @@ nWH jIs mjw mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44491,8 +46597,8 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV bmU bmU bmU @@ -44622,8 +46728,8 @@ bmU bmU bmU bmU -lLO -qPO +udV +wST bmU bmU bmU @@ -44634,21 +46740,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV pNz pNz +vsN +vsN pNz -tXs -lYl -tHh +vJA +hrb +jYE tHh rWd kZq @@ -44665,16 +46771,16 @@ bdp mVZ mjw mjw -vTH -peB -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO +eZR +pnO +mjM +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -44685,8 +46791,8 @@ bmU bmU bmU bmU -qPO -lLO +wST +udV bmU bmU bmU @@ -44828,47 +46934,47 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -bmU -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV mjw -nfj -tVX +iTX +wNJ wRi -aBL +wvm kZy -wIf -wRi -aBL +oda +bOl +wvm iBE -wIf -wRi -aBL +oda +bOl +wvm kZy -wIf +oda wRi iqc dtS mjw -lLO -vTH +udV +eZR uEb -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -45022,17 +47128,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO -lLO -bmU -lLO -lLO +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV +udV mjw mjw mjw @@ -45052,17 +47158,17 @@ qPe mjw mjw mjw -lLO -vTH +udV +eZR uEb -dBY -lLO -lLO -lLO -lLO -lLO -lLO -lLO +mjM +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -45216,47 +47322,47 @@ bmU bmU bmU bmU -lLO -gry -gry -gry -gry -gry -gry -gry +udV +fyh +fyh +fyh +fyh +fyh +fyh +fyh kAb kAb -gry -gry -gry -isf -peB -peB -peB -peB -peB -peB -peB -peB -peB -peB -peB -peB -eDy -gry -gry -gry -gry +fyh +fyh +fyh +cgX +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +pnO +vUL +fyh +fyh +fyh +fyh koY uEb -avn -gry -gry -gry -gry -gry -gry -lLO +kUD +fyh +fyh +fyh +fyh +fyh +fyh +udV bmU bmU bmU @@ -45410,21 +47516,21 @@ bmU bmU bmU bmU -vTH +eZR lMW lMW -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO uEb uEb -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO jWJ jWJ jWJ @@ -45436,21 +47542,21 @@ jWJ jWJ jWJ jWJ -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO uEb uEb -peB -peB -peB -peB -peB +pnO +pnO +pnO +pnO +pnO lMW lMW -dBY +mjM bmU bmU bmU @@ -45604,21 +47710,21 @@ bmU bmU bmU bmU -lLO -tcC -tcC -tcC -tcC -tcC -tcC -tcC +udV +aYP +aYP +aYP +aYP +aYP +aYP +aYP kAC kAC -tcC -tcC -tcC -tcC -tcC +aYP +aYP +aYP +aYP +aYP jWJ eEc eEc @@ -45630,21 +47736,21 @@ jWJ jSb jSb jWJ -tcC -tcC -tcC -tcC -tcC +aYP +aYP +aYP +aYP +aYP kAC kAC -tcC -tcC -tcC -tcC -tcC -tcC -tcC -lLO +aYP +aYP +aYP +aYP +aYP +aYP +aYP +udV bmU bmU bmU @@ -45799,20 +47905,20 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV jWJ eEc eEc @@ -45824,20 +47930,20 @@ jWJ ubb ubb jWJ -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +udV +udV bmU bmU bmU @@ -45993,20 +48099,20 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV jWJ jWJ jWJ @@ -46018,20 +48124,20 @@ jWJ ubb ubb jWJ -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -46187,20 +48293,20 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV jWJ lMW lMW @@ -46208,24 +48314,24 @@ ubb ubb ubb ubb -ubb +erP ubb ubb jWJ -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV bmU bmU bmU @@ -46382,18 +48488,18 @@ bmU bmU bmU bmU -qPO -lLO -lLO +wST +udV +udV bmU bmU bmU bmU bmU bmU -lLO -lLO -lLO +udV +udV +udV jWJ jWJ lMW @@ -46402,23 +48508,23 @@ ubb ubb ubb ubb -ubb +erP ubb ubb jWJ jWJ -lLO -lLO -lLO +udV +udV +udV bmU bmU bmU bmU bmU bmU -lLO -lLO -qPO +udV +udV +wST bmU bmU bmU @@ -46585,9 +48691,9 @@ bmU bmU bmU bmU -bLa -eDU -fRZ +wCF +nQB +lrl pby eEc wdu @@ -46601,9 +48707,9 @@ gzH lMW lDx pby -eyk -eDU -pYv +noA +nQB +mpc bmU bmU bmU @@ -46781,7 +48887,7 @@ bmU bmU bmU bmU -oAM +weS jWJ rVE mer @@ -46795,7 +48901,7 @@ xuq lMW ojb jWJ -oAM +weS bmU bmU bmU @@ -46975,21 +49081,21 @@ bmU bmU bmU bmU -oAM +weS jWJ jWJ jWJ jWJ jWJ jWJ -dNV +wCG jWJ jWJ jWJ jWJ jWJ jWJ -oAM +weS bmU bmU bmU @@ -47169,21 +49275,21 @@ bmU bmU bmU bmU -rEi -eDU -eDU -eDU -eDU -eDU -eDU -scw -eDU -eDU -eDU -eDU -eDU -eDU -hkO +dDF +nQB +nQB +nQB +nQB +nQB +nQB +xnC +nQB +nQB +nQB +nQB +nQB +nQB +dTl bmU bmU bmU @@ -47363,21 +49469,21 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO +udV +udV +udV +udV aBR -lLO -lLO -oAM -lLO -lLO +udV +udV +weS +udV +udV aBR -lLO -lLO -lLO -lLO +udV +udV +udV +udV bmU bmU bmU @@ -47559,17 +49665,17 @@ bmU bmU bmU bmU -lLO -lLO +udV +udV aBR aBR -lLO -oAM -lLO +udV +weS +udV aBR aBR -lLO -lLO +udV +udV bmU bmU bmU @@ -47753,17 +49859,17 @@ bmU bmU bmU bmU -lLO -lLO -lLO -lLO -lLO -oAM -lLO -lLO -lLO -lLO -lLO +udV +udV +udV +udV +udV +weS +udV +udV +udV +udV +udV bmU bmU bmU @@ -47949,12 +50055,12 @@ bmU bmU bmU bmU -lLO -lLO -lLO -oAM -lLO -lLO +udV +udV +udV +weS +udV +udV bmU bmU bmU @@ -48144,10 +50250,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48338,10 +50444,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48532,10 +50638,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48726,10 +50832,10 @@ bmU bmU bmU bmU -lLO -lLO -oAM -lLO +udV +udV +weS +udV bmU bmU bmU @@ -48921,8 +51027,8 @@ bmU bmU bmU bmU -lLO -oAM +udV +weS bmU bmU bmU @@ -49115,8 +51221,8 @@ bmU bmU bmU bmU -lLO -oAM +udV +weS bmU bmU bmU @@ -49309,8 +51415,8 @@ bmU bmU bmU bmU -qPO -chI +wST +hJi bmU bmU bmU diff --git a/maps/euthenia/levels/deck2.dmm b/maps/euthenia/levels/deck2.dmm index c6321dbf49..3d348c4ca2 100644 --- a/maps/euthenia/levels/deck2.dmm +++ b/maps/euthenia/levels/deck2.dmm @@ -28,13 +28,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"abD" = ( -/obj/machinery/atmospherics/component/binary/pump, -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/industrial/danger, -/obj/machinery/door/airlock/glass/atmos, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) "abL" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -55,6 +48,21 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"adg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "adh" = ( /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -73,6 +81,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"adq" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "adF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -80,15 +95,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"aem" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "aey" = ( /obj/structure/railing{ dir = 4 @@ -110,6 +116,18 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"afH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "afW" = ( /obj/machinery/atmospherics/component/trinary/filter{ filtering = "n2o" @@ -172,6 +190,17 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) +"agS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "agU" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4 @@ -194,7 +223,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) "ahy" = ( @@ -232,11 +261,6 @@ "ajb" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/cargo) -"ajf" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "ajq" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 8 @@ -244,6 +268,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"ajv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/light/small, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"ajA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "ajJ" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -256,7 +303,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) "aks" = ( @@ -285,6 +332,22 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) +"akV" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "alh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -304,14 +367,9 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) -"aln" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "alw" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -326,7 +384,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, @@ -377,6 +435,10 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"aoz" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "aoA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -389,15 +451,22 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"aoB" = ( +/obj/structure/ladder, +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "aoH" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_wing) -"apO" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) +"apQ" = ( +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -12 + }, +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/tiled, +/area/hydroponics) "aqc" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ @@ -420,7 +489,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) @@ -454,16 +523,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"arg" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"arp" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/steel, -/area/space) "arH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -512,6 +571,17 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) +"asH" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"atk" = ( +/obj/structure/catwalk, +/obj/machinery/camera/network/outside{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "atO" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -524,9 +594,27 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"atT" = ( +/turf/simulated/open, +/area/tether/surfacebase/security/lobby) "auf" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/gas_storage) +"auy" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"auF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/space) "avr" = ( /obj/structure/cable{ icon_state = "2-4" @@ -590,12 +678,41 @@ "awY" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/storage) +"axi" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"axq" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "AI Upload Access"; + req_access = list(16); + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/ai/foyer) "axC" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /turf/simulated/floor/plating, /area/maintenance/substation/security) +"axF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "axH" = ( /obj/structure/railing{ dir = 1 @@ -639,6 +756,12 @@ /obj/item/deck/cards, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"ayP" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "ayZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red, /obj/structure/cable/green{ @@ -647,9 +770,22 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"azv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "azx" = ( /obj/structure/railing{ dir = 8 @@ -667,22 +803,17 @@ }, /turf/simulated/floor/tiled/techmaint, /area/space) -"aAa" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"azL" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "aAi" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) -"aAo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "aAN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -709,24 +840,6 @@ "aCf" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/server) -"aCp" = ( -/obj/effect/floor_decal/techfloor/orange/corner{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-10" - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) -"aCC" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "aDN" = ( /obj/structure/railing, /obj/structure/railing{ @@ -734,23 +847,9 @@ }, /turf/simulated/open, /area/quartermaster/hallway) -"aDW" = ( -/obj/structure/table/hardwoodtable, -/obj/item/stamp/qm{ - pixel_x = -6 - }, -/obj/item/stamp/denied{ - pixel_x = 7 - }, -/obj/item/stamp/cargo, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "aDY" = ( /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -759,12 +858,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"aEr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/space) "aEw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/reinforced, /obj/random/tech_supply, /obj/random/tech_supply, @@ -772,12 +871,25 @@ /obj/machinery/recharger, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"aEx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "aEF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"aEL" = ( +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "aFc" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -787,6 +899,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"aFO" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "aFW" = ( /obj/structure/cable/green{ icon_state = "16-0" @@ -795,6 +913,15 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) +"aGn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "aGz" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -802,21 +929,6 @@ /obj/structure/flora/pottedplant/dead, /turf/simulated/floor/tiled/techfloor, /area/server) -"aGV" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/grass_edge/corner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research/researchdivision) "aHa" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 @@ -828,14 +940,57 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"aHc" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"aHm" = ( +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"aHu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) +"aHC" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"aHG" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "aIb" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/civilian) +"aIh" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 + }, +/obj/machinery/camera/network/engine, +/turf/simulated/floor/tiled/techfloor, +/area/space) "aIl" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) "aIF" = ( @@ -886,7 +1041,7 @@ icon_state = "1-2" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/research) "aJB" = ( @@ -924,6 +1079,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"aKi" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "aKv" = ( /obj/item/radio/intercom{ dir = 4; @@ -945,16 +1106,16 @@ /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) +"aLf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "aLu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/wall/r_wall, /area/main_map/maintenance/atmospheric_substation/ai) -"aLS" = ( -/obj/structure/closet/l3closet/janitor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "aMb" = ( /obj/structure/bed/chair/sofa/black/left, /obj/effect/floor_decal/spline/fancy/wood{ @@ -962,6 +1123,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"aMn" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "aMv" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -974,14 +1141,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"aMD" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/space) "aMU" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -1028,10 +1187,20 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"aNn" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "aNs" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -1119,13 +1288,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"aPO" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 +"aQv" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "aQy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -1144,6 +1318,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"aQM" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "aQU" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -1153,10 +1340,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"aRq" = ( -/obj/structure/wall_frame, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "aRM" = ( /obj/machinery/door/airlock/command{ id_tag = "RDdoor"; @@ -1175,6 +1358,16 @@ /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"aSD" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "aTr" = ( /obj/structure/railing{ dir = 4 @@ -1239,7 +1432,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "hanger1b"; - layer = 3.3; name = "Hanger 1 B Shutters" }, /turf/simulated/floor/reinforced, @@ -1276,6 +1468,36 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) +"aUX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"aVu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"aVx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "aWs" = ( /obj/structure/table/standard, /obj/structure/bedsheetbin, @@ -1285,6 +1507,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"aWF" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "aWG" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -1320,10 +1554,14 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) -"aYx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"aZe" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "aZm" = ( /obj/machinery/door/airlock{ name = "Restroom" @@ -1352,10 +1590,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"aZv" = ( -/obj/machinery/atmospherics/portables_connector, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "aZw" = ( /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 4 @@ -1419,15 +1653,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"baW" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"baF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"baO" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + pressure_resistance = 750; + target_pressure = 750; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"baX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/space) "bbw" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -1450,21 +1697,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"bbG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "bbH" = ( /obj/machinery/door/airlock/hatch{ name = "Main Fuel Storage" @@ -1475,17 +1707,6 @@ "bbR" = ( /turf/simulated/wall, /area/maintenance/cargo) -"bcv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/access_button/airlock_interior{ - master_tag = "engineering_main"; - pixel_x = 24 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"bcI" = ( -/turf/space, -/area/main_map/hallway/deck2/stairs) "bcK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1514,30 +1735,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"bcZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +"bdk" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"bda" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/port) +/area/main_map/maintenance/deck_two/starboard) "bez" = ( /obj/machinery/atmospherics/component/trinary/filter/mirrored{ dir = 1; @@ -1545,34 +1747,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"beG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +"bfD" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "bfJ" = ( /obj/machinery/door/firedoor, /obj/structure/catwalk, /obj/machinery/door/window/brigdoor/eastleft, /turf/simulated/floor/plating, /area/security/brig) -"bfO" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"bfR" = ( -/obj/machinery/door/airlock/glass/engineering, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) "bga" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1587,6 +1773,18 @@ /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, /area/engineering/atmos/processing) +"bgi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "bgs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -1594,11 +1792,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"bgx" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_gas) "bgG" = ( /turf/simulated/wall/r_wall, /area/security/brig) @@ -1633,6 +1826,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"bjf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"bjg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "bjD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1650,12 +1868,6 @@ /obj/machinery/mech_recharger, /turf/simulated/floor/reinforced, /area/space) -"bko" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "bkO" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 1 @@ -1689,16 +1901,34 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) +"bly" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "bmj" = ( /obj/structure/railing, /turf/simulated/open, /area/crew_quarters/bar) +"bmn" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/landmark{ + name = "morphspawn" + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "bmr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_b) "bnA" = ( @@ -1711,7 +1941,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/security) "bnI" = ( @@ -1748,30 +1978,11 @@ /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"boQ" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/monotile, -/area/space) -"boW" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2/stairs) "boX" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/forward/starboard) "bpe" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/stairs) "bpg" = ( @@ -1780,28 +1991,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) -"bqw" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"bqz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bqH" = ( /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/emergency, @@ -1881,14 +2070,31 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"bsV" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall/prepainted/security, -/area/space) -"btP" = ( -/obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall, -/area/space) +"btA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"btR" = ( +/obj/effect/floor_decal/grass_edge/corner, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research/researchdivision) "btX" = ( /obj/structure/mopbucket, /obj/item/reagent_containers/glass/bucket, @@ -1913,6 +2119,15 @@ "bvd" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay/hangar) +"bvi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "bvp" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -1924,12 +2139,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"bvR" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "bvX" = ( /obj/structure/sign/deck/second{ pixel_x = -32 @@ -1939,15 +2148,6 @@ "bvZ" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/main_map/maintenance/deck_two/forward) -"bwl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "bwo" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -1972,21 +2172,18 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"bwO" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"bwE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 10 }, /obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/air_alarm{ + pixel_y = 24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/research) "bxa" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/machinery/door/blast/regular{ @@ -1998,16 +2195,30 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/brig) +"bxe" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"bxj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "bxl" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/hallway) "bxr" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_smes) -"bxt" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bxu" = ( /obj/structure/cable/green{ icon_state = "32-8" @@ -2045,10 +2256,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"bxZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "bye" = ( /obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"bym" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "byt" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2124,33 +2353,54 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/showers) +"bzq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"bAt" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"bAM" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"bBn" = ( +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck2) "bBv" = ( /obj/machinery/light_switch{ pixel_y = -25 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"bBB" = ( -/obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/space) "bCc" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/bar_backroom) +"bCf" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "bCi" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 @@ -2160,6 +2410,40 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"bCj" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"bCs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"bCQ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "bDm" = ( /obj/structure/fitness/weightlifter, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -2167,14 +2451,34 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"bDD" = ( +"bDR" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) +"bDW" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "bEn" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -2185,26 +2489,15 @@ "bEC" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) -"bEU" = ( -/obj/structure/ladder, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "bFb" = ( /obj/machinery/door/blast/shutters{ dir = 2; id = "hanger1a"; - layer = 3.3; name = "Hanger 1 A Shutters" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"bFh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bFx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2217,10 +2510,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/station/fighter_bay/maintenance) -"bFQ" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "bGg" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2228,64 +2517,41 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two) -"bGD" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"bHo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) -"bHV" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access = list(16); - req_one_access = list() - }, -/obj/structure/cable{ - icon_state = "1-2" +"bHf" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/lobby) +"bHH" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"bHI" = ( +/obj/machinery/light/small{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/ai) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "bId" = ( /turf/simulated/open, /area/main_map/hallway/deck2/starboard_fore) +"bIg" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "bIt" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) -"bJc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) -"bJG" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) "bJL" = ( /obj/machinery/door/airlock/engineering{ name = "Hangar Substation" @@ -2295,20 +2561,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/flight_deck) -"bKa" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/shield_gen) "bKo" = ( /obj/machinery/door/airlock/maintenance/cargo, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, /area/quartermaster/foyer) -"bKr" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/main_map/maintenance/deck_two/forward/starboard) "bKM" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -2318,22 +2575,44 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/b) -"bKZ" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +"bLg" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "bLr" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"bMm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) +"bMq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "bMO" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ @@ -2349,6 +2628,31 @@ "bNf" = ( /turf/simulated/floor/plating, /area/main_map/hallway/deck2/starboard_fore) +"bNv" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/aux{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"bNB" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "bOC" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -2356,9 +2660,12 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor, /area/server) +"bPe" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/maintenance/engineering/upper) "bPl" = ( /obj/structure/railing{ dir = 4 @@ -2395,15 +2702,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"bRv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "bRB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -2411,6 +2709,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"bRJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "bRO" = ( /turf/simulated/open, /area/space) @@ -2419,6 +2732,18 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"bSN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "bSU" = ( /obj/machinery/door/airlock/research{ name = "Toxins Storage"; @@ -2437,12 +2762,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/rnd/robotics/mechbay) -"bTl" = ( -/obj/machinery/camera/network/command{ - dir = 1 - }, +"bTi" = ( +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/rnd/robotics) "bTC" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) @@ -2456,17 +2779,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) -"bUR" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 - }, -/obj/random/trash_pile, -/turf/space/basic, -/area/space) "bVM" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, /obj/machinery/meter, @@ -2475,15 +2787,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"bWe" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "bWt" = ( /obj/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"bWv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/machinery/camera/network/engineering{ + dir = 8 + }, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techfloor, +/area/space) "bWx" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -2504,18 +2833,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2/stairs) -"bXU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "bYA" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) @@ -2536,8 +2853,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -2562,6 +2878,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"bYZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) "bZc" = ( /obj/machinery/door/airlock/glass/engineeringatmos{ name = "Damage Control Storage" @@ -2575,6 +2898,25 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/hallway) +"bZe" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) +"bZB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "bZI" = ( /obj/structure/cable{ icon_state = "2-4" @@ -2596,6 +2938,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"cag" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "cal" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -2609,18 +2958,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cao" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "caB" = ( /obj/structure/grille, /obj/structure/lattice, @@ -2632,22 +2969,13 @@ /obj/item/mop, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"cbd" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"cbf" = ( +/obj/machinery/door/airlock/maintenance/engi, +/obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/structure/catwalk, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/engineering/engine_smes) "cbF" = ( /obj/structure/cable{ icon_state = "32-2" @@ -2669,22 +2997,39 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck2) -"cbU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ +"cbT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"ccc" = ( -/obj{ - name = "---Merge conflict marker---" +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"ccp" = ( +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/machinery/camera/network/civilian, -/obj/structure/flora/pottedplant/smalltree, -/turf/space/basic, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"ccq" = ( +/obj/structure/cable/heavyduty, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "ccM" = ( /turf/simulated/floor/tiled/white, @@ -2730,43 +3075,25 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"cdB" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/crew_quarters/fitness) -"cdR" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/space) -"cea" = ( -/turf/simulated/open, -/area/rnd/rdoffice) -"cef" = ( +"cdw" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"cel" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"cem" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) +"cdB" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/crew_quarters/fitness) +"cea" = ( +/turf/simulated/open, +/area/rnd/rdoffice) "cex" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2775,6 +3102,15 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_smes) +"ceE" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "ceK" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled/techfloor/grid, @@ -2789,17 +3125,34 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"cfF" = ( -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) -"cfP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"cfx" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for shutters."; + id = "hop_office_desk"; + name = "Desk Privacy Shutter"; + pixel_x = 6; + pixel_y = -29 + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"cfB" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) +"cfF" = ( /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/area/maintenance/cargo) "chl" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -2812,10 +3165,6 @@ }, /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) -"cil" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/reinforced/airless, -/area/space) "cis" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_a) @@ -2829,6 +3178,24 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"ciF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "ciH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -2845,24 +3212,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"cjl" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"cjs" = ( -/obj/structure/closet/firecloset, +"cjM" = ( +/obj/machinery/pipedispenser/disposal, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"cjy" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, -/obj/effect/floor_decal/industrial/danger{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/engineering/atmos) "ckt" = ( /obj/machinery/door/airlock{ name = "Hydroponics"; @@ -2876,10 +3229,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hydroponics) -"ckX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "clm" = ( /obj/structure/cable{ icon_state = "0-8" @@ -2893,43 +3242,35 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_smes) -"clr" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/space/basic, -/area/space) "clx" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled, /area/hydroponics) -"clM" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hangar_pad"; - name = "Hangar Bay Blast Door" - }, -/obj/machinery/atmospheric_field_generator/perma, -/turf/simulated/floor/reinforced, -/area/space) "cms" = ( /obj/machinery/camera/network/engine{ dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"cmB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"cnC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "cnF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -2953,6 +3294,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"cnQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"cnR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "coC" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 @@ -2962,7 +3318,7 @@ /area/medical/medbay2) "coG" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/bridge/meeting_room) "coN" = ( @@ -2994,20 +3350,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/cargo) -"cpo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"cqf" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"cpq" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/main_map/maintenance/deck_two/forward/starboard) "cqS" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Forward Point Defense Subgrid"; @@ -3043,10 +3391,33 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"crA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "crM" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"csx" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/plating, +/area/bridge/hop_office) "csV" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/fancy/wood{ @@ -3063,19 +3434,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"ctg" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "ctG" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass, @@ -3089,16 +3447,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"cuj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "cuq" = ( /obj/structure/table/rack, /obj/random/mre, @@ -3141,18 +3489,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"cxb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "cxc" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3186,6 +3522,17 @@ /obj/structure/sign/deck2, /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) +"cyN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/landmark/spawnpoint/job/research_director, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "cyO" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 @@ -3193,6 +3540,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"czC" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "czE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3200,6 +3556,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/starboard) +"czI" = ( +/obj/machinery/disposal, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"czO" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "czQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -3213,33 +3580,10 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"cAj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"cAo" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) +"cAp" = ( +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "cBv" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/pool/changing_room) @@ -3275,6 +3619,25 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"cCP" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"cCQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "cCV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3288,6 +3651,12 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) +"cDs" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "cDN" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 @@ -3297,11 +3666,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"cDO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "cFL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -3314,6 +3678,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"cGt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "cGQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3337,26 +3707,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"cGZ" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 - }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) "cHo" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3388,17 +3738,43 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"cHI" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "cIf" = ( /obj/machinery/door/firedoor/glass, /obj/effect/spider/stickyweb/dark, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"cIh" = ( +"cIS" = ( +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/obj/structure/lattice, /obj/structure/railing{ - dir = 8 + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/engineering/deck2/power_line) +"cIV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "cJP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -3411,7 +3787,7 @@ /area/rnd/robotics) "cJY" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/monotile, /area/security/observation) "cKi" = ( @@ -3429,12 +3805,6 @@ /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"cKL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "cKP" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -3453,15 +3823,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"cLo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "cLB" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -3473,10 +3834,18 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/medical/medbay2) -"cMd" = ( -/obj/machinery/atmospherics/component/binary/pump, +"cLR" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"cLW" = ( +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) "cMn" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(30,47,77) @@ -3487,6 +3856,18 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/rnd/xenobiology/xenoflora_storage) +"cMO" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "cMZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -3496,24 +3877,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"cNa" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"cNF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 1 +"cNB" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft) +/area/main_map/maintenance/deck_two) "cOp" = ( /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"cPe" = ( +/obj/structure/sign/deck/second, +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/lobby) "cPC" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall, @@ -3543,6 +3921,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"cQp" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "cQw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3580,15 +3964,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"cSw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"cSC" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) +"cTP" = ( +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "cUs" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3617,6 +4008,23 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"cUW" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"cUX" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "cVc" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3633,14 +4041,18 @@ "cVE" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"cWD" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 +"cWu" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/holofloor/tiled/dark, +/area/medical/medbay2) +"cWx" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 }, -/obj/structure/railing, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/area/main_map/maintenance/deck_two/aft/starboard) "cWH" = ( /obj/machinery/door/airlock/glass{ name = "Recreation Area" @@ -3675,15 +4087,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) -"cXm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +"cXA" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "cXJ" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/spray/cleaner, @@ -3701,26 +4108,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_smes) -"cXM" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ +"cYd" = ( +/obj/machinery/power/terminal{ dir = 1 }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) -"cYe" = ( -/obj/machinery/atmospherics/valve/digital, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/engineering/shield_gen) "cYp" = ( /obj/machinery/door/airlock/engineering{ name = "Security Substation"; @@ -3732,16 +4132,16 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"cYP" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck2) "cZg" = ( /obj/structure/closet/secure_closet/guncabinet/robotics, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) +"cZw" = ( +/obj/machinery/door/airlock/maintenance/command{ + name = "Command Atmospheric Substation" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/command) "cZF" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3770,6 +4170,21 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"dak" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) +"daq" = ( +/obj/structure/table/steel, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "daw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3779,6 +4194,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) +"daV" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"dbe" = ( +/obj/structure/closet/crate/biohazard, +/obj/item/nif/bad, +/obj/item/nif/bad, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "dbf" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -3786,9 +4213,12 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"dbv" = ( +"dbE" = ( +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) +/area/main_map/maintenance/deck_two/forward/starboard) "dcQ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/steeldecal/steel_decals6, @@ -3804,6 +4234,21 @@ /obj/effect/debris/cleanable/blood/oil, /turf/simulated/floor/tiled/dark, /area/rnd/robotics) +"ddd" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "ddp" = ( /obj/machinery/door/airlock/glass{ name = "Recovery Wing" @@ -3811,10 +4256,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"ddu" = ( -/obj/machinery/camera/network/outside, -/turf/simulated/floor/reinforced/airless, -/area/space) "ddw" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 @@ -3844,7 +4285,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/high/east_bump, +/obj/machinery/power/apc/high/east_mount, /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3860,18 +4301,29 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"deT" = ( -/obj/structure/railing{ - dir = 4 +"deU" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "dfM" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/atmospheric_substation/ai) "dgp" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/main_map/hallway/deck2) +"dgx" = ( +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "dhm" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/steel_grid, @@ -3882,15 +4334,27 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/showers) -"dhE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 +"dhy" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"dhF" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "dhN" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -3898,6 +4362,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"dhO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "dik" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -3978,18 +4451,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dkZ" = ( -/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 = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "dle" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4042,14 +4503,6 @@ /obj/structure/handrail, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"dmh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "dmn" = ( /obj/structure/closet/hydrant{ pixel_x = 32 @@ -4062,16 +4515,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"dmG" = ( -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - dir = 4; - target_pressure = 15000 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "dmL" = ( /obj/structure/bed/chair/sofa/black/left{ dir = 1 @@ -4090,6 +4533,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"dmT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "dnn" = ( /obj/structure/table/rack{ dir = 8; @@ -4136,10 +4588,57 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_a) +"doK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "dpw" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"dpW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"dpZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/space) +"dqD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) +"drc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "drw" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled, @@ -4150,15 +4649,21 @@ }, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos) +"drO" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) "drT" = ( /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"drX" = ( -/obj/machinery/power/thermoregulator{ - anchored = 1 +"drV" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_smes) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "dso" = ( /obj/structure/table/fancyblack, /obj/effect/floor_decal/spline/fancy/wood{ @@ -4166,21 +4671,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"dsx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "dth" = ( /obj/machinery/atmospherics/pipe/zpipe/down/supply{ dir = 8 @@ -4218,6 +4708,18 @@ }, /turf/simulated/open, /area/maintenance/engineering) +"dub" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"dug" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techfloor, +/area/space) "duK" = ( /obj/machinery/shieldgen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -4226,13 +4728,6 @@ "duL" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two) -"duQ" = ( -/obj/structure/table/bench/wooden, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/fitness) "dvl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue{ dir = 8 @@ -4257,10 +4752,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) -"dvx" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"dvX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "dwf" = ( /obj/structure/railing{ dir = 4 @@ -4277,40 +4775,14 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"dwx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "dwG" = ( /obj/machinery/computer/atmos_alert, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"dwL" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/turf/space/basic, -/area/space) "dxu" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, @@ -4344,27 +4816,12 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dzb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +"dzl" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"dzg" = ( -/obj/machinery/door/airlock/engineering{ - name = "Science Substation"; - req_one_access = list(11,24,47) - }, -/obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/machinery/door/firedoor/glass, -/turf/space, -/area/maintenance/substation/research) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "dzA" = ( /obj/machinery/power/terminal{ dir = 1 @@ -4374,15 +4831,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"dzO" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"dzY" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "dAc" = ( /obj/structure/sign/deck/second{ pixel_y = 32 @@ -4398,6 +4846,23 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"dAp" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 6 + }, +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/heads/cmo) "dAV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4410,10 +4875,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) -"dAZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "dBx" = ( /obj/machinery/button/remote/blast_door{ id = "hangar_maint"; @@ -4441,31 +4902,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"dBM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "dCk" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -4508,12 +4944,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"dDH" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) "dDV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 @@ -4541,15 +4971,15 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/server) -"dEW" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +"dFa" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) "dGb" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -4576,6 +5006,22 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"dGr" = ( +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "dGt" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -4588,6 +5034,31 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"dGE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"dGK" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"dHa" = ( +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 24 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "dHe" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -4595,38 +5066,25 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"dHw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/turf/simulated/floor/plating, +/area/space) "dHJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 8 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) -"dIk" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/zpipe/down, -/obj/machinery/atmospherics/pipe/zpipe/down/aux, -/turf/simulated/open, -/area/engineering/engine_eva) "dIo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) -"dIv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "dIE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/railing{ @@ -4659,21 +5117,18 @@ /obj/machinery/biogenerator, /turf/simulated/floor/tiled, /area/hydroponics) -"dKj" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "dKA" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, /turf/simulated/floor/reinforced, /area/space) +"dKJ" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) "dKO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -4689,17 +5144,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"dKZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel, -/area/space) "dLa" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Flight Deck Subgrid"; @@ -4716,12 +5160,6 @@ }, /turf/simulated/floor/plating, /area/space) -"dLj" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(18,47) - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck2) "dLw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4756,24 +5194,40 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"dMq" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) +"dLS" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"dLT" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "dMZ" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 }, /turf/simulated/floor/carpet, /area/medical/patient_wing) -"dNh" = ( -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2) "dNs" = ( /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) +"dNL" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"dNP" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "dOB" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/forward/port) @@ -4785,15 +5239,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/space) -"dOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/research) "dOX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -4806,19 +5251,9 @@ }, /turf/simulated/floor/reinforced, /area/space) -"dPp" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "dPv" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/medical/patient_wing) "dPw" = ( @@ -4827,6 +5262,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) +"dPy" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "dPK" = ( /turf/simulated/floor/glass/reinforced, /area/hydroponics) @@ -4836,10 +5278,46 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"dPW" = ( -/obj/effect/floor_decal/industrial/warning/corner, +"dQg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"dQn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"dQo" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/engineering/engine_room) +"dQB" = ( +/obj/structure/sign/directions/cryo, +/turf/simulated/wall/r_wall/prepainted/command, +/area/ai/foyer) +"dQE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/space) "dRL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4858,6 +5336,15 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/atmospheric_substation/medical) +"dSo" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "dSr" = ( /turf/simulated/wall, /area/main_map/hallway/deck2/stairs) @@ -4945,7 +5432,7 @@ /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay/maintenance) "dUY" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4968,6 +5455,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"dVE" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "dWc" = ( /turf/simulated/mineral/icerock/lythios43c, /area/rift/surfacebase/underground/under1) @@ -4995,18 +5488,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) -"dWR" = ( -/turf/simulated/wall/prepainted/medical, -/area/medical/patient_b) -"dWX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"dWF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/plating, +/area/space) +"dWR" = ( +/turf/simulated/wall/prepainted/medical, +/area/medical/patient_b) "dXf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -5026,15 +5520,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"dXq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) "dXu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5047,7 +5532,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/table/standard, /obj/machinery/photocopier/faxmachine{ department = "Quartermaster-Office" @@ -5055,6 +5540,19 @@ /obj/machinery/camera/network/cargo, /turf/simulated/floor/wood, /area/quartermaster/qm) +"dYc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"dYk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "dYW" = ( /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/processing) @@ -5076,6 +5574,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/server) +"dZD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "dZW" = ( /obj/structure/railing, /turf/simulated/open, @@ -5084,10 +5594,6 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/maintenance/cargo) -"eaA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "eaQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -5126,15 +5632,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/quartermaster/warehouse) -"ebD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "ebT" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -5150,25 +5647,39 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"ecb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"ecl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "ecv" = ( /obj/structure/table/bench/wooden, /obj/machinery/light/no_nightshift, /turf/simulated/floor/wood, /area/crew_quarters/showers) -"ecD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +"ecO" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/danger/corner, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"ecQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) "ecR" = ( /turf/simulated/wall/prepainted/science, /area/rnd/robotics) @@ -5225,19 +5736,19 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"efa" = ( -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 +"efw" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, -/turf/simulated/wall/r_wall, -/area/engineering/atmos) +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"efy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "efD" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northright{ @@ -5254,16 +5765,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"efN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"efP" = ( -/obj/machinery/computer/rdconsole/robotics, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) "efZ" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -5277,7 +5778,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 10 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "egw" = ( @@ -5303,6 +5804,10 @@ /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"egB" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "ehn" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 @@ -5345,10 +5850,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"eim" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "eiu" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -5407,29 +5908,6 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"ejw" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/bed/chair/comfy/teal, -/turf/space/basic, -/area/space) -"ejP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "ejQ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green, /turf/simulated/floor/tiled/techfloor, @@ -5444,13 +5922,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"ekM" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) "ekQ" = ( /obj/structure/closet{ name = "mechanical equipment" @@ -5480,6 +5951,21 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) +"eln" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"elt" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "elA" = ( /obj/structure/table/standard, /obj/item/storage/box/glasses, @@ -5494,6 +5980,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/maintenance/tool_storage) +"emf" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "emj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, @@ -5505,12 +6003,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) -"enP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "enT" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 4 @@ -5545,13 +6037,33 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) -"eqp" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/machinery/camera/network/engine{ +"eoW" = ( +/obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"epq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/hallway) +"epT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "eqt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techfloor, @@ -5575,15 +6087,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/processing) -"eqX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "eri" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5603,6 +6106,24 @@ }, /turf/simulated/floor/plating, /area/space) +"ern" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2/stairs) +"erC" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "erI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -5624,12 +6145,39 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"esP" = ( -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +"esL" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/port) +"etH" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "etU" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/main_map/maintenance/deck_two/aft/starboard) +"eus" = ( +/obj/machinery/account_database{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"evJ" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "evK" = ( /obj/structure/railing{ dir = 1 @@ -5670,25 +6218,18 @@ /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"exX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"exM" = ( +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "eyf" = ( /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) -"eys" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) "eyC" = ( /obj/machinery/atmospherics/tvalve/digital{ dir = 4 @@ -5699,28 +6240,12 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) -"ezu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "ezG" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"ezJ" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/techfloor, -/area/space) "ezV" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -5762,6 +6287,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"eBN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "eBS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5777,6 +6311,33 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) +"eBZ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck2) +"eCo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"eCF" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/pipedispenser/disposal, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "eCL" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics/mechbay) @@ -5786,17 +6347,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"eDd" = ( -/obj/machinery/shipsensors, -/turf/simulated/floor/reinforced/airless, -/area/space) -"eDq" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1 - }, -/obj/machinery/camera/network/engine, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "eDv" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Command Grid"; @@ -5812,21 +6362,9 @@ /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"eDU" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/shield_gen) "eDY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -5847,6 +6385,19 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"eEe" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "eEO" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -5866,15 +6417,6 @@ /obj/item/mmi/digital/posibrain, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"eFg" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "eFZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 10 @@ -5890,16 +6432,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) -"eGt" = ( +"eGg" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"eGv" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "eHO" = ( /obj/machinery/door/airlock/security{ name = "Observation"; @@ -5908,13 +6460,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"eId" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"eIq" = ( +/obj/structure/ladder/updown, /turf/simulated/floor/plating, -/area/space) +/area/maintenance/engineering/upper) "eIt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5940,6 +6489,10 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"eIY" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "eJd" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 8 @@ -5966,6 +6519,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"eKi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "eKD" = ( /obj/machinery/mech_recharger, /obj/mecha/combat/fighter/pinnace/loaded{ @@ -5979,62 +6538,56 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) -"eLj" = ( -/obj/structure/cable/green{ +"eKE" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"eKS" = ( +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"eLG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 9 +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "eLI" = ( /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"eLJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +"eLL" = ( +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two) -"eLM" = ( -/obj/structure/sign/directions/cryo{ +"eLZ" = ( +/obj/structure/bed/chair/comfy/beige, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/wall/r_wall/prepainted/command, -/area/space) -"eLY" = ( -/obj/structure/cable/green{ +/turf/simulated/floor/tiled/monotile, +/area/security/observation) +"eMN" = ( +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"eLZ" = ( -/obj/structure/bed/chair/comfy/beige, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/security/observation) +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "eMR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green, /obj/machinery/meter, @@ -6043,13 +6596,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"eNo" = ( -/obj/structure/sink/kitchen{ - dir = 4; - pixel_x = -12 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) +"eMX" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"eNd" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "eNw" = ( /obj/structure/railing, /obj/structure/railing{ @@ -6057,37 +6611,20 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) -"eNz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "eNA" = ( /obj/machinery/atmospherics/component/binary/pump, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"eNC" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 +"eOH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ePh" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos/gas_storage) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ePr" = ( /turf/simulated/open, /area/quartermaster/hallway) @@ -6104,6 +6641,17 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) +"ePO" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "ePY" = ( /turf/simulated/open, /area/main_map/Hangar_bay/deck2) @@ -6114,34 +6662,21 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) -"eQw" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/aux{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "eRO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 9 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"eSj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"eRT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) -"eSE" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "eSZ" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -6150,11 +6685,29 @@ }, /turf/simulated/floor/plating, /area/medical/patient_a) +"eTi" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "eTm" = ( /obj/machinery/honey_extractor, /obj/structure/railing, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/structure/window/reinforced, @@ -6207,22 +6760,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"eWH" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/aux{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"eWN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"eWy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/plating, +/area/space) "eXp" = ( /obj/item/coin/silver, /obj/item/coin/silver, @@ -6280,15 +6823,6 @@ "eYO" = ( /turf/simulated/floor/plating, /area/rnd/robotics/mechbay) -"eZu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/hallway) "eZF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6299,20 +6833,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/port) -"eZP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"eZW" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "eZY" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -6331,6 +6851,30 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"fax" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"fbe" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"fbv" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on/welded{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "fbP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6378,6 +6922,13 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"fco" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "fcp" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/freezer, @@ -6413,37 +6964,11 @@ }, /turf/simulated/floor/tiled, /area/space) -"fdb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"fds" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"fdR" = ( -/obj/machinery/door/airlock{ - name = "Auxiliary Janitorial Closet"; - req_access = list(26) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck2/stairs) +"fdX" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "fek" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -6461,6 +6986,10 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"ffC" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "ffE" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/light{ @@ -6472,6 +7001,15 @@ /obj/machinery/recharger, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"ffL" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "fgg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6503,58 +7041,88 @@ /obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"fhh" = ( -/obj/structure/stairs/spawner/east, +"fhc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) -"fhN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 5 +/area/maintenance/cargo) +"fhm" = ( +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/cargo) -"fhP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +/area/main_map/maintenance/deck_two/aft) +"fhw" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/metal{ + req_one_access = list(10); + name = "Engineering"; dir = 4 }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) +"fhN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/blue{ + dir = 5 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"fhR" = ( -/obj/machinery/atmospherics/valve{ - name = "EMERGENCY VENT TO SPACE" +/area/main_map/maintenance/atmospheric_substation/cargo) +"fhT" = ( +/obj/structure/railing{ + dir = 1 }, +/obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, -/area/engineering/atmos) +/area/medical/medbay2) "fin" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"fjG" = ( -/obj/structure/catwalk, -/obj/machinery/camera/network/outside, -/turf/simulated/floor/reinforced/airless, -/area/space) -"fjJ" = ( -/obj/structure/sign/directions/cryo, -/turf/simulated/wall/r_wall/prepainted/command, -/area/main_map/hallway/deck2) -"fjK" = ( -/obj/effect/floor_decal/techfloor/orange{ +"fjh" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"fjv" = ( +/obj/structure/bed/chair/sofa/black{ dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"fjV" = ( +/obj/structure/catwalk, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"fkD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-2" }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 +/obj/machinery/power/apc/east_mount, +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "fkE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -6564,12 +7132,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"fkK" = ( -/obj/machinery/atmospherics/component/unary/engine/biggest{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fkN" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_wing) @@ -6607,15 +7169,10 @@ }, /turf/simulated/floor/carpet, /area/medical/patient_wing) -"flI" = ( -/obj/structure/lattice, -/turf/simulated/open, -/area/hydroponics/garden) "flL" = ( /obj/machinery/door/blast/shutters{ dir = 4; id = "hanger1a"; - layer = 3.3; name = "Hanger 1 A Shutters" }, /obj/machinery/door/firedoor/glass{ @@ -6623,15 +7180,6 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"flT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) "flV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6666,6 +7214,30 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"fmt" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/command_secretary, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) +"fmu" = ( +/obj/machinery/door/airlock/atmos{ + name = "Security Atmospherics Backup"; + req_access = list(24) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "fmB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -6680,21 +7252,6 @@ "fmX" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/forward) -"fnG" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "fnJ" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/structure/cable/green{ @@ -6715,21 +7272,39 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"foC" = ( -/turf/simulated/open, -/area/medical/medbay2) -"foE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"fnN" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/window/northleft{ + dir = 8; + icon_state = "right"; + name = "Reception Window" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/window/brigdoor/eastright{ + name = "Head of Personnel's Desk"; + req_access = list(57) }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-4" }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/tiled, +/area/bridge/hop_office) +"fnS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/main_map/maintenance/deck_two) +"foC" = ( +/turf/simulated/open, +/area/medical/medbay2) "foH" = ( /obj/structure/railing, /turf/simulated/open, @@ -6749,6 +7324,12 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"fpZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "fqv" = ( /obj/structure/railing{ dir = 1 @@ -6777,22 +7358,19 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) -"frk" = ( -/obj/structure/marker_beacon/red, -/turf/simulated/floor/reinforced/airless, -/area/space) +"fre" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "frE" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) -"frN" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/closet/crate/trashcart, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "fsp" = ( /obj/machinery/button/ignition{ id = "portnacelle_igniter"; @@ -6809,7 +7387,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6879,12 +7457,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) -"fvA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "fvO" = ( /obj/structure/railing, /turf/simulated/open, @@ -6895,8 +7467,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -6924,18 +7495,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"fxF" = ( -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "fyf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7047,6 +7606,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"fDM" = ( +/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 = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "fDQ" = ( /obj/machinery/power/terminal, /obj/structure/cable{ @@ -7055,12 +7626,26 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, /area/space) +"fEg" = ( +/obj/machinery/door/airlock/maintenance/command, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "fEm" = ( /obj/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"fEE" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 4; + target_pressure = 15000 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "fEH" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -7118,15 +7703,13 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"fHl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "4-8" +"fHH" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) +/obj/landmark/spawnpoint/job/blueshield, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) "fIB" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, @@ -7138,31 +7721,32 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"fIL" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-8" + }, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "fJL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"fJR" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 8 +"fJQ" = ( +/obj/landmark/spawnpoint/job/janitor, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"fKg" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 }, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "fKn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -7189,21 +7773,12 @@ "fKt" = ( /turf/simulated/wall/prepainted, /area/rift/station/fighter_bay) -"fLc" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, +"fKM" = ( /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/space/basic, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/forward) "fLl" = ( /obj/machinery/door/airlock/maintenance/engi, /obj/structure/cable/green{ @@ -7213,6 +7788,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/hallway) +"fLD" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "fLW" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) @@ -7225,12 +7806,29 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) +"fMi" = ( +/obj/structure/sign/deck/second, +/turf/simulated/wall/r_wall, +/area/tether/surfacebase/security/lobby) "fMj" = ( /obj/effect/floor_decal/corner/green/border{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"fMC" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"fMU" = ( +/obj/landmark{ + name = "lightsout" + }, +/obj/structure/railing/grey, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) "fNq" = ( /obj/machinery/camera/network/research{ dir = 1 @@ -7238,12 +7836,16 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"fNz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/floor_decal/industrial/danger, -/obj/structure/closet/emcloset, +"fNy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) "fNA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -7284,6 +7886,20 @@ }, /turf/simulated/open, /area/security/brig) +"fOh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"fOw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "fOI" = ( /obj/machinery/door/airlock/glass/security{ name = "Observation"; @@ -7316,27 +7932,12 @@ "fPn" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/port) -"fPr" = ( -/obj/machinery/atmospherics/component/binary/pump, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"fPt" = ( -/obj/machinery/button/remote/blast_door{ - id = "hangar_pad"; - name = "Hangar Bay Blast Door Control"; - pixel_x = -24; - pixel_y = -28; - req_one_access = list(19,29,38,43,47,63,67); - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "fPv" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos) +"fPT" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "fQz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7358,6 +7959,19 @@ /obj/fiftyspawner/glass, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"fQU" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "fRg" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/freezer) @@ -7375,19 +7989,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"fSl" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/space/basic, -/area/space) +"fRK" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/medical/medbay2) +"fRS" = ( +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "fST" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7400,6 +8007,19 @@ "fTa" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) +"fTd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "fTt" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor{ @@ -7410,17 +8030,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"fTN" = ( +"fTu" = ( /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/techmaint, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) "fTQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -7452,6 +8073,14 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"fUz" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/crew_quarters/recreation_area_hallway) "fUA" = ( /obj/structure/railing, /obj/structure/railing{ @@ -7468,6 +8097,23 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"fVk" = ( +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"fVs" = ( +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" + }, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/obj/item/clothing/under/rank/medical/scrubs, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "fVD" = ( /obj/machinery/air_alarm{ dir = 8; @@ -7481,6 +8127,29 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"fWc" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -25 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"fWj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "fWB" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/reinforced/phoron, @@ -7500,6 +8169,32 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"fYa" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"fYL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) "fYS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -7528,9 +8223,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) -"fZM" = ( -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "fZN" = ( /obj/machinery/door/airlock/engineering{ name = "Civilian Substation" @@ -7547,6 +8239,9 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) +"gaG" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "gaL" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7573,10 +8268,13 @@ }, /turf/simulated/floor/plating, /area/bridge/meeting_room) -"gce" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +"gcu" = ( +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/obj/structure/railing, +/turf/simulated/floor/reinforced/overhang, +/area/space) "gcE" = ( /obj/structure/railing{ dir = 4 @@ -7587,20 +8285,13 @@ /area/rift/station/fighter_bay/hangar) "gcG" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/east_bump, +/obj/machinery/power/apc/high/east_mount, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"gdv" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, +"gda" = ( +/obj/structure/lattice, +/obj/structure/railing, +/turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) "gdJ" = ( /obj/structure/cable/green{ @@ -7629,19 +8320,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"geV" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"gfI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "gfJ" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) @@ -7663,20 +8341,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"ggs" = ( -/obj/machinery/door/airlock/lift, -/turf/simulated/floor/holofloor/tiled/dark, -/area/space) -"ggB" = ( -/obj/structure/railing{ +"ghe" = ( +/obj/structure/railing/grey{ dir = 8 }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "rd_office" - }, -/turf/simulated/open, +/turf/simulated/floor/plating, /area/rnd/research/researchdivision) +"gho" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ghs" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -7699,24 +8374,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"ghD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "ghL" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/reinforced, /area/space) +"giU" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "giW" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 1 @@ -7763,6 +8432,10 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) +"gla" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "gli" = ( /obj/structure/catwalk, /turf/simulated/open, @@ -7780,6 +8453,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"glF" = ( +/obj/machinery/camera/network/research{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "gmv" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_d) @@ -7792,6 +8474,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"gmS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) "gmW" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -7803,24 +8495,42 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"gnc" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "gnl" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"gnx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "gnF" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/starboard) -"gnV" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"gnK" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "gos" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7846,8 +8556,7 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos/gas_storage) "goM" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -7874,16 +8583,6 @@ "gpN" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"gqh" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "gqJ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7921,6 +8620,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"gsc" = ( +/obj/landmark{ + name = "morphspawn" + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"gsq" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "gsw" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -7964,6 +8678,17 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) +"gtv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "gtP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7977,50 +8702,33 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"gun" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 +"guE" = ( +/obj/structure/railing/grey{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "gvd" = ( /obj/map_helper/network_builder/power_cable/green/auto, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"gvi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +"gvn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) -"gvk" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/window/northleft{ - dir = 8; - icon_state = "right"; - name = "Reception Window" - }, -/obj/machinery/door/window/brigdoor/eastright{ - name = "Head of Personnel's Desk"; - req_access = list(57) + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/turf/simulated/floor/tiled, -/area/space) +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "gvq" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -8032,9 +8740,6 @@ "gvU" = ( /turf/simulated/wall, /area/main_map/hallway/deck2) -"gws" = ( -/turf/simulated/open, -/area/engineering/engine_eva) "gwA" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -8050,11 +8755,24 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/a) -"gwH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"gwK" = ( +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"gwN" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, /area/space) "gxy" = ( /obj/structure/railing{ @@ -8065,23 +8783,24 @@ }, /turf/simulated/open, /area/space) -"gxA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "gxE" = ( /obj/machinery/atmospherics/component/binary/pump, /obj/effect/floor_decal/corner/lightorange/bordercee, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"gyk" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +"gye" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "gys" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -8135,32 +8854,31 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"gAE" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - pressure_resistance = 750; - target_pressure = 750; +"gAu" = ( +/obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"gAR" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 +/area/maintenance/cargo) +"gBd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"gBt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/space/basic, -/area/space) +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access"; + req_access = list(5) + }, +/turf/simulated/floor/tiled/techfloor, +/area/medical/medbay2) "gBO" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -8172,18 +8890,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"gCq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "gCv" = ( /obj/machinery/atmospherics/component/unary/engine/biggest{ dir = 4 @@ -8206,6 +8912,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) +"gDA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "gDB" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/border_only, @@ -8214,10 +8929,6 @@ "gDO" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/hallway/deck2) -"gDQ" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) "gEs" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8233,16 +8944,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/starboard) -"gFh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "gGr" = ( /obj/landmark{ name = "morphspawn" @@ -8253,64 +8954,30 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"gGP" = ( -/obj/structure/closet{ - name = "robotics parts" - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/cell/high{ - maxcharge = 15000; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" +"gIq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/obj/item/healthanalyzer, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/flash/synthetic, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"gIC" = ( +/obj/structure/sign/deck2{ + pixel_y = -32 }, -/obj/machinery/camera/network/research, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "gII" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/mechanical{ @@ -8328,6 +8995,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"gKU" = ( +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "gLc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8337,10 +9007,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"gLm" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "gLs" = ( /obj/machinery/camera/network/engineering, /obj/effect/floor_decal/techfloor/orange{ @@ -8354,18 +9020,16 @@ /obj/machinery/vending/tool, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"gLP" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/medical/medbay2) "gLT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"gMD" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "gMH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8375,6 +9039,21 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"gMX" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) +"gNb" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "gNi" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/danger{ @@ -8382,6 +9061,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"gNl" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2/stairs) "gNn" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8395,6 +9078,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) +"gNs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "gND" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -8405,15 +9103,6 @@ /obj/machinery/mecha_part_fabricator, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"gOz" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/lattice, -/obj/machinery/door/firedoor/glass, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/forward/port) "gOA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8442,6 +9131,15 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) +"gOZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "gPE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8454,6 +9152,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"gPL" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/space) "gPQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8477,6 +9181,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/atmos) +"gQD" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "gQE" = ( /obj/structure/railing, /obj/structure/railing{ @@ -8484,27 +9200,26 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/port) +"gQG" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/pipedispenser, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "gQY" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/hallway/deck2/starboard_fore) -"gRG" = ( -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) -"gRV" = ( -/obj/structure/cable{ - icon_state = "4-8" +"gRp" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "gRY" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/tiled/techfloor/grid, @@ -8522,10 +9237,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"gTn" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/space) "gTr" = ( /obj/effect/floor_decal/techfloor/orange/corner{ dir = 8 @@ -8545,60 +9256,36 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"gUL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +"gTG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "gUQ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) -"gUS" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) -"gVo" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"gVq" = ( -/obj{ - name = "---Merge conflict marker---" - }, +"gWj" = ( /obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/machinery/iv_drip, -/turf/space/basic, -/area/space) -"gVs" = ( -/obj/structure/cable{ - icon_state = "1-4" + dir = 4; + pixel_x = -24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"gWB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"gWH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"gWx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/aux{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/tiled/techfloor, +/area/space) "gWM" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -8606,36 +9293,12 @@ /obj/structure/bed/chair/bay/comfy, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"gWV" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/hallway) -"gWX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) "gWY" = ( /obj/structure/toilet{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/medical/patient_d) -"gXg" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/hallway) "gXV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -8648,50 +9311,27 @@ "gYx" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/aft) +"gYG" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "gYZ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/server) -"gZp" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"gZu" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) -"gZV" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 +"gZB" = ( +/obj/machinery/light/small{ + dir = 8 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) "hak" = ( /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"hal" = ( -/obj/structure/table/steel, -/obj/item/storage/box/lights/mixed, -/obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"ham" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) "hav" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, @@ -8702,12 +9342,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) -"haR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 9 +"hbm" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/space) "hbs" = ( /obj/structure/railing, /turf/simulated/open, @@ -8736,6 +9376,10 @@ "hcm" = ( /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"hcp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hcs" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/service) @@ -8745,19 +9389,46 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"hdn" = ( -/obj/machinery/door/airlock/glass/research{ - name = "Robotics Lab"; - req_access = list(29,47) +"hdb" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) +"hdg" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"het" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"hew" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/robotics) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) +"hex" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "heV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8795,16 +9466,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"hfT" = ( -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "hfU" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/aft/starboard) @@ -8819,6 +9480,11 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) +"hhm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "hhx" = ( /obj/structure/railing{ dir = 1 @@ -8843,18 +9509,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"hie" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"hhL" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"hhR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button/airlock_interior{ + master_tag = "engineering_main"; + pixel_x = 24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/space) +"hit" = ( +/obj/machinery/atmospherics/component/binary/pump, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hiO" = ( /obj/structure/sign/directions/cryo, /turf/simulated/wall, @@ -8895,12 +9568,30 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/shield_gen) -"hkE" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2/starboard_fore) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/shield_gen) +"hkE" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2/starboard_fore) +"hkF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"hkN" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "solar_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/engineering/engine_eva) "hlp" = ( /obj/structure/railing, /obj/structure/railing{ @@ -8911,22 +9602,6 @@ "hlv" = ( /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos/gas_storage) -"hlI" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/space) -"hlM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "hmh" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/open/shower/medical, @@ -8943,6 +9618,10 @@ }, /turf/simulated/floor/reinforced, /area/space) +"hmr" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hmA" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -8961,6 +9640,15 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"hmW" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "hnb" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor{ @@ -8981,6 +9669,12 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/patient_a) +"hnr" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "hnu" = ( /obj/structure/closet/walllocker{ pixel_y = -28 @@ -8999,19 +9693,29 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"hpp" = ( -/obj/structure/grille, -/turf/simulated/floor/reinforced/airless, -/area/space) +"hpi" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/hydroponics/garden) "hpx" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/space) -"hrw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 +"hqb" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"hrq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hrE" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techmaint, @@ -9033,17 +9737,17 @@ /obj/structure/railing, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) +"htd" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "hts" = ( /turf/space, /area/space) -"htL" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"htC" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor/plating, +/area/space) "htM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -9081,24 +9785,20 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"hvz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"hvD" = ( -/obj/machinery/door/firedoor{ +"hvv" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/machinery/door/airlock/hatch, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/railing/grey{ + dir = 8 }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) +"hvV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/maintenance/cargo) "hwb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9114,15 +9814,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/rdoffice) -"hwE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "hwK" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -9145,43 +9836,20 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) -"hxh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"hxn" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/space) "hxr" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"hxA" = ( +"hyf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "hyj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9204,18 +9872,35 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"hzg" = ( -/obj/structure/cable{ +"hyv" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"hyB" = ( +/obj/structure/bed/chair/sofa/black/corner{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"hyG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/machinery/camera/network/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) +"hyW" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "hzI" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9225,27 +9910,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"hzP" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/handrail{ - dir = 8 - }, -/turf/space/basic, -/area/space) "hAa" = ( /obj/structure/fireplace, /turf/simulated/floor/reinforced, /area/medical/patient_wing) -"hAB" = ( -/obj/structure/closet, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +"hAc" = ( +/turf/simulated/open, +/area/engineering/engine_gas) +"hAy" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "hAM" = ( /obj/machinery/computer/med_data{ dir = 1 @@ -9277,10 +9958,15 @@ "hBz" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/shield_gen) -"hBW" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +"hBY" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "hBZ" = ( /obj/structure/closet/chefcloset, /obj/item/glass_jar, @@ -9302,44 +9988,69 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"hCr" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "hCF" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/stairs) -"hCY" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"hCI" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) +"hCU" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "hCZ" = ( /obj/structure/noticeboard{ pixel_y = 32 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"hDn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "hDo" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/shield_capacitor, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) +"hDs" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/super/critical/north_mount, +/turf/simulated/floor/tiled/techfloor, +/area/space) "hDF" = ( /obj/structure/catwalk, /obj/structure/ladder/up, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"hEd" = ( +"hEk" = ( /obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "hEr" = ( /obj/structure/cable{ icon_state = "1-8" @@ -9347,25 +10058,25 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"hEu" = ( -/obj/machinery/camera/network/outside{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"hFk" = ( -/obj{ - name = "---Merge conflict marker---" - }, +"hFb" = ( /obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 + dir = 1; + pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/catwalk, -/turf/space/basic, -/area/space) +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) +"hFr" = ( +/obj/machinery/button/remote/blast_door{ + id = "hangar_pad"; + name = "Hangar Bay Blast Door Control"; + pixel_x = 24; + pixel_y = -28; + req_one_access = list(19,29,38,43,47,63,67); + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_two/aft/starboard) "hFE" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9373,18 +10084,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"hGh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "hGp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9403,25 +10102,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"hHg" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" - }, -/turf/simulated/floor/plating, -/area/space) "hHh" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Engineering Subgrid"; @@ -9435,63 +10115,33 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) -"hHl" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "hHp" = ( /obj/machinery/light/no_nightshift{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"hIa" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"hHu" = ( +/obj/machinery/power/generator{ + anchored = 1; dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/port) +/turf/simulated/floor/tiled/techfloor, +/area/space) +"hHB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "hIi" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/cargo) -"hIq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) -"hIZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "hJT" = ( /obj/structure/sink{ dir = 4; @@ -9499,6 +10149,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) +"hJW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "hKb" = ( /obj/machinery/door/airlock/maintenance/command, /obj/machinery/door/blast/regular{ @@ -9525,33 +10181,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) -"hKO" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "hKW" = ( /turf/simulated/floor/plating, /area/storage/tech) -"hLM" = ( -/obj/machinery/camera/network/research{ +"hLW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) -"hMg" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "hNo" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9599,21 +10241,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/hallway/deck2) -"hNQ" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "32-8" - }, -/obj/structure/lattice, -/obj/machinery/door/firedoor/glass, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/forward/port) "hOw" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -9628,6 +10255,11 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/hallway/deck2) +"hPe" = ( +/obj/structure/cable/green, +/obj/machinery/power/apc/high/south_mount, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "hPh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9635,14 +10267,47 @@ /obj/structure/handrail, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"hPD" = ( +"hPN" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"hQe" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/engineering/atmos) +/area/space) "hQg" = ( /obj/structure/railing, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/main_map/hallway/deck2) +"hQA" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"hRe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "hRp" = ( /obj/structure/railing, /obj/structure/railing{ @@ -9676,28 +10341,14 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/hydroponics) -"hTA" = ( -/obj/effect/debris/cleanable/blood/oil, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "hTE" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/starboard) -"hUP" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/handrail{ - dir = 1 - }, -/turf/space/basic, -/area/space) +"hUa" = ( +/obj/structure/closet/l3closet/janitor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "hVr" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -9722,12 +10373,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) -"hWi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"hVQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/plating, +/area/space) "hWs" = ( /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/monotile, @@ -9738,21 +10390,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"hWL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"hYb" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/reinforced/airless, -/area/space) +"hWR" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/ai/foyer) "hYi" = ( /obj/machinery/computer/med_data{ dir = 1 @@ -9794,20 +10435,13 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/quartermaster/hallway) "hZB" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"hZL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "hZM" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 8 @@ -9821,17 +10455,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"iai" = ( -/obj/structure/cable{ - icon_state = "1-2" +"hZQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/visible/aux{ + dir = 6 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/plating, +/area/space) "iaq" = ( /obj/structure/closet/secure_closet/freezer/meat{ anchored = 1 @@ -9849,6 +10481,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"iaM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(29,47); + name = "Robotics Lab" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/robotics) "iaY" = ( /obj/structure/cable{ icon_state = "0-8" @@ -9901,13 +10546,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) -"ids" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "idO" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -9920,6 +10558,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"idR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"idZ" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "ieY" = ( /obj/landmark/spawnpoint/job/cargo_technician, /turf/simulated/floor/tiled, @@ -9948,8 +10599,23 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/turf/simulated/floor/plating, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/engineering/engine_eva) +"igf" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced, +/area/space) +"igs" = ( +/obj/structure/closet/crate/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "igE" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -9978,6 +10644,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/server) +"iho" = ( +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"ihp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"ihz" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) "ihO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/techmaint, @@ -9993,16 +10685,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"ihZ" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 - }, -/turf/space/basic, -/area/space) "iid" = ( /obj/machinery/door/airlock{ name = "Toilet" @@ -10016,12 +10698,32 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"iif" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "iit" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"iiw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "iiE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -10059,14 +10761,21 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"ijB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/landmark{ + name = "lightsout" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "ijK" = ( /obj/structure/catwalk, /turf/simulated/open, /area/quartermaster/hallway) -"ijL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "ijM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10119,12 +10828,17 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/substation/service) -"ikx" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +"ikB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) +/area/main_map/maintenance/deck_two/forward/port) "ikN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10143,26 +10857,6 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"ilo" = ( -/obj/structure/cable/heavyduty, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ilv" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/obj/structure/lattice, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/open, -/area/engineering/engine_eva) "ilF" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/plating, @@ -10176,10 +10870,23 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"imJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "inF" = ( /obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/hydroponics) +"inW" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "iow" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -10191,12 +10898,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) -"iqj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "iqp" = ( /obj/machinery/power/terminal{ dir = 8 @@ -10226,12 +10927,19 @@ }, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) -"iqJ" = ( +"iqQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "iqZ" = ( /obj/structure/cable/green{ icon_state = "32-8" @@ -10242,6 +10950,9 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/starboard) +"ish" = ( +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "isl" = ( /obj/structure/railing, /obj/structure/railing{ @@ -10249,15 +10960,26 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/xenoflora_storage) -"isE" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +"isz" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 8 +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) +"isO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) "isT" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -10293,12 +11015,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"iuv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/security) "iuP" = ( /obj/machinery/atmospherics/valve/digital, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -10318,6 +11034,49 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"ivQ" = ( +/obj/structure/catwalk, +/obj/structure/frame/computer{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"iwg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"iww" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"iwx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/aux, +/obj/machinery/pipedispenser, +/turf/simulated/floor/plating, +/area/space) +"iwO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "iwS" = ( /obj/machinery/door/airlock/glass/mining{ name = "Mining Prep Room" @@ -10337,6 +11096,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"ixk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "ixz" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) @@ -10347,7 +11112,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -10372,22 +11137,44 @@ "iyn" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/lab) -"izw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ +"iyA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light/no_nightshift{ - dir = 1 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"iAz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/area/rnd/research/researchdivision) +"izr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, /obj/effect/floor_decal/industrial/danger{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/space) +"izI" = ( +/obj/machinery/keycard_auth{ + pixel_y = -36 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -8; + pixel_y = -26 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "iAD" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ @@ -10401,29 +11188,46 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"iBN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "iCs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 8 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"iCx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "iCE" = ( /mob/living/simple_mob/animal/sif/fluffy, /turf/simulated/floor/wood, /area/quartermaster/qm) -"iDh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" +"iCV" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/engineering/engine_room) +"iDb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) "iDj" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/maintenance/deck_two/port) @@ -10442,6 +11246,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"iDw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "iDV" = ( /obj/machinery/door/airlock/maintenance/command{ name = "Command Atmospheric Substation" @@ -10454,13 +11270,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) -"iFi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/structure/sign/deck2{ - pixel_x = 32 +"iEj" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/engineering/deck2/power_line) +"iFb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"iFd" = ( +/obj/machinery/door/airlock/hatch, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "iFm" = ( /obj/machinery/air_alarm{ dir = 1; @@ -10471,6 +11300,13 @@ "iFr" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_d) +"iFH" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Atmospherics"; + req_access = list(24) + }, +/turf/simulated/floor/plating, +/area/engineering/hallway) "iGM" = ( /obj/machinery/button/remote/blast_door{ id = "fighterbaytransportexit"; @@ -10487,41 +11323,23 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"iGY" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - department = "Head of Personnel's Office" - }, -/turf/simulated/floor/wood, -/area/space) -"iHb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"iHp" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1 +"iHt" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hallway/deck2/port_fore) +"iHR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, -/obj/effect/floor_decal/industrial/danger{ +/obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "iHT" = ( /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"iIk" = ( -/turf/simulated/wall, -/area/rnd/robotics/mechbay) -"iIC" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "iIR" = ( /obj/structure/sign/warning/radioactive, /turf/simulated/wall/r_wall, @@ -10530,6 +11348,18 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"iJX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "iKb" = ( /obj/structure/table/rack/shelf, /obj/effect/floor_decal/industrial/outline/grey, @@ -10545,22 +11375,19 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rift/station/fighter_bay) -"iKv" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 1 +"iKz" = ( +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "iKN" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -10571,6 +11398,10 @@ /obj/machinery/mech_recharger, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) +"iLc" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/forward/starboard) "iLm" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10590,19 +11421,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"iLO" = ( -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/turf/simulated/wall/r_wall, -/area/engineering/atmos) "iMk" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -10627,32 +11445,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) -"iOy" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) "iOD" = ( /obj/machinery/vending/cola, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) -"iOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "iOZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -10662,6 +11458,14 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"iPj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "iPo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light_switch{ @@ -10696,13 +11500,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"iQg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "iQr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 5 @@ -10712,14 +11509,19 @@ "iQH" = ( /turf/simulated/floor/airless/ceiling, /area/engineering/engine_eva) -"iQX" = ( -/obj/machinery/door/airlock/glass/engineering, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) +"iQM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "iRV" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/computer/ship/navigation/telescreen{ @@ -10730,6 +11532,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"iSi" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "iSr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -10742,18 +11550,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) -"iSs" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "iSv" = ( /obj/machinery/door/airlock{ name = "Auxiliary Janitorial Closet"; @@ -10773,16 +11569,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"iSG" = ( -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/monotile, -/area/space) -"iSI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "iTf" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -10799,6 +11585,28 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"iTu" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"iTv" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2/stairs) "iTH" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2/port_fore) @@ -10815,41 +11623,32 @@ /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) "iUn" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "iUx" = ( /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) +"iUO" = ( +/obj/machinery/camera/network/command{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ai/foyer) "iVk" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"iVx" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/computer/roguezones, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "iVy" = ( /turf/simulated/wall/r_wall, /area/main_map/Hangar_bay/deck2/b) -"iVU" = ( -/obj/structure/cable/green{ - icon_state = "32-1" - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/lattice, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) +"iVI" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/blue, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/service) "iXE" = ( /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 2346; @@ -10893,6 +11692,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"iYj" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "iYp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -10911,6 +11716,12 @@ }, /turf/simulated/floor/wood, /area/main_map/hallway/deck2) +"iZA" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "iZH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10932,15 +11743,27 @@ }, /turf/simulated/open, /area/quartermaster/warehouse) +"iZR" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/thermoregulator{ + anchored = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/storage) "iZT" = ( /obj/machinery/cryopod/robot, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) -"jaD" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"jaI" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/engineering/deck2/power_line) +"jaY" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/blue{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) "jbn" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -10962,12 +11785,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) -"jbW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/space) +"jbt" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "jce" = ( /obj/structure/railing{ dir = 4 @@ -10980,16 +11801,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/port) -"jcG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "jcJ" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/main_map/maintenance/atmospheric_substation/research) @@ -11048,14 +11859,33 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"jfs" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +"jeF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/obj/structure/cable/green{ + icon_state = "2-5" + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"jeG" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) +"jfv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "jfM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11068,13 +11898,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_d) -"jfV" = ( -/obj/machinery/door/airlock/maintenance/engi{ - name = "Elevator Shaft Access"; - req_one_access = null - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +"jfN" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "jgk" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11124,6 +11952,12 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) +"jhY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "jis" = ( /obj/structure/cable/cyan{ icon_state = "0-8" @@ -11137,6 +11971,15 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_smes) +"jiV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "jja" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored{ dir = 8 @@ -11150,10 +11993,6 @@ /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"jjl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/blue, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/service) "jjn" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 @@ -11174,12 +12013,56 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/processing) +"jki" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) "jkA" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/observation) +"jkG" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"jkO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "jld" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/maintenance/deck_two/aft) +"jlj" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "jlk" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -11190,17 +12073,24 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) +"jlQ" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/plating, +/area/medical/medbay2) +"jmh" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/landmark/spawnpoint/job/janitor, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/cargo) "jmn" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) -"jmt" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) -"jmu" = ( -/obj/machinery/disposal, -/turf/simulated/floor/wood, -/area/space) "jmB" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -11283,9 +12173,6 @@ "jpm" = ( /turf/simulated/open, /area/crew_quarters/kitchen) -"jpB" = ( -/turf/simulated/wall/r_wall/prepainted/security, -/area/space) "jqL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -11308,6 +12195,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) +"jro" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "jru" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -11320,45 +12214,26 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) -"jrG" = ( +"jsw" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/aft/starboard) -"jsj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) -"jsE" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 +"jsB" = ( +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -24 }, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/wood, +/area/bridge/meeting_room) +"jsZ" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/forward) "jtl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -11369,11 +12244,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"jty" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "jtK" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/space) +"jub" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"jue" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "juH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -11399,6 +12290,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) +"jwx" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "jwS" = ( /obj/structure/sign/deck/second{ pixel_y = -32 @@ -11416,6 +12317,12 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"jxe" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "jxf" = ( /obj/machinery/door/blast/regular{ dir = 2; @@ -11425,21 +12332,31 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) -"jyc" = ( -/obj/effect/floor_decal/corner/paleblue/border{ +"jxT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/light/spot/no_nightshift{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) +/turf/simulated/floor/tiled/techfloor, +/area/space) "jyk" = ( /obj/machinery/shieldgen, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) +"jyB" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "jyZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -11452,21 +12369,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"jzn" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "jzo" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Cargo Substation Bypass" }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) -"jzL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2/stairs) "jzV" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -11492,15 +12407,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"jAO" = ( +/obj/landmark/spawnpoint/job/senior_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) "jAS" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) -"jBe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) "jBY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11516,6 +12430,22 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/hallway) +"jCm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "jCx" = ( /obj/structure/railing{ dir = 4 @@ -11528,12 +12458,6 @@ }, /turf/simulated/open, /area/main_map/hallway/deck2) -"jCF" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/blue{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "jCI" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ @@ -11542,12 +12466,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/bridge/bunker) -"jDF" = ( -/obj/machinery/camera/network/outside{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "jDN" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -11559,6 +12477,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"jDQ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "jDV" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -11573,6 +12498,15 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"jDW" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "jEe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -11613,16 +12547,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research/researchdivision) -"jGc" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 +"jFG" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"jFP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "jGq" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(29,47) @@ -11647,6 +12591,10 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +"jHP" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/robotics) "jHU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11658,6 +12606,12 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"jIa" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "jIs" = ( /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, @@ -11718,30 +12672,16 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"jJQ" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, +"jJO" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/skills, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"jKn" = ( +/obj/machinery/atmospherics/component/binary/pump, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) -"jKj" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/obj/structure/flora/pottedplant/flower, -/obj/structure/closet/hydrant{ - pixel_x = 32 - }, -/turf/space/basic, /area/space) -"jKM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "jKN" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/bed/chair/comfy/brown{ @@ -11764,7 +12704,7 @@ /area/engineering/hallway) "jLH" = ( /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) "jLZ" = ( @@ -11773,6 +12713,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"jMc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on/welded{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "jMj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11801,12 +12747,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"jNh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "jNj" = ( /obj/machinery/suit_cycler/engineering, /turf/simulated/floor/tiled/techfloor, @@ -11854,20 +12794,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"jOK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) -"jPu" = ( +"jPh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/air_alarm{ dir = 8; pixel_x = 25 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/forward/starboard) "jPv" = ( /obj/machinery/atmospherics/tvalve/digital, @@ -11936,6 +12873,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"jQG" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "jQI" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -11950,6 +12891,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"jQP" = ( +/obj/machinery/computer/card, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "jQS" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 1; @@ -11961,21 +12906,6 @@ "jRq" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora_storage) -"jRZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"jSg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "jSp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12003,11 +12933,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"jTc" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) "jTg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12063,6 +12988,17 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) +"jUH" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "jUK" = ( /obj/structure/table/glass, /obj/machinery/computer/skills{ @@ -12090,18 +13026,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"jWH" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"jWN" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "jXj" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/structure/cable/heavyduty{ @@ -12109,23 +13045,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"jXq" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) "jXy" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -12178,6 +13097,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"jXZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "jYD" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -12195,10 +13120,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"jZp" = ( -/obj/structure/wall_frame, +"jZU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/maintenance/cargo) +/area/main_map/maintenance/deck_two/aft) "kao" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -12240,16 +13168,22 @@ /obj/structure/filingcabinet/tall, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"kbi" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"kbz" = ( +"kbD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 5 }, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"kbE" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/mecha/combat/fighter/baron/sec/loaded{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) "kbG" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -12258,25 +13192,17 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"kbZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/structure/cable{ +"kbP" = ( +/obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) -"kce" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/area/main_map/maintenance/deck_two/forward) "kcD" = ( /obj/structure/railing, /obj/structure/railing{ @@ -12285,15 +13211,67 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"kcG" = ( -/obj/structure/cable/green{ - icon_state = "2-8" +"kcK" = ( +/obj/structure/closet{ + name = "robotics parts" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/cell/high{ + maxcharge = 15000; + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" + }, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/flash/synthetic, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/machinery/camera/network/research, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) "kcY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12304,6 +13282,13 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"kdb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "kde" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12323,12 +13308,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"kdF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "ked" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 9 @@ -12339,18 +13318,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"kev" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "kfE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 9 @@ -12363,6 +13330,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"kfR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "kgf" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -12391,25 +13364,12 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"kgy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +"kgM" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"khG" = ( -/obj/structure/sign/department/ass{ - pixel_x = 29 - }, -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) +/area/main_map/maintenance/deck_two) "kiL" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12426,15 +13386,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"kiZ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "kjn" = ( /obj/structure/railing{ dir = 8 @@ -12453,6 +13404,16 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"kjL" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"kjN" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "kjS" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor{ @@ -12469,6 +13430,26 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"kkh" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/high/north_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2/a) +"kkK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"kkZ" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "kld" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -12492,12 +13473,29 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"kmO" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/machinery/door/firedoor/glass, +"klL" = ( +/obj/structure/sign/department/ass{ + pixel_x = 29 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"kmq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, /turf/simulated/floor/plating, -/area/engineering/atmos) +/area/space) +"kmF" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "kna" = ( /turf/simulated/open, /area/rnd/research/researchdivision) @@ -12510,6 +13508,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"knr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/space) "knD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -12521,6 +13526,20 @@ /obj/item/retail_scanner/command, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"koc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/landmark{ + name = "lightsout" + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "koA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12564,9 +13583,6 @@ "kqv" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/fitness) -"kqG" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) "kqW" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -12574,10 +13590,17 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) +"kqX" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "kra" = ( /obj/structure/table/bench/wooden, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/showers) "krf" = ( @@ -12588,7 +13611,7 @@ dir = 5 }, /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) "krg" = ( @@ -12600,6 +13623,10 @@ }, /turf/simulated/open, /area/crew_quarters/recreation_area_hallway) +"kru" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/hallway) "krw" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12613,6 +13640,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/hydroponics) +"krR" = ( +/obj/structure/ladder/updown, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"kse" = ( +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) "ksv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -12625,18 +13660,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"ksw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "ksy" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -12652,6 +13675,18 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"ksY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "kti" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12670,12 +13705,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"kts" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 1 +"kto" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "ktS" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -12691,12 +13733,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"kud" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "kug" = ( /obj/structure/railing{ dir = 1 @@ -12728,16 +13764,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) -"kuQ" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck2) +"kuH" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techfloor, +/area/space) "kvJ" = ( /obj/machinery/atmospherics/tvalve/digital/bypass, /turf/simulated/floor/plating, @@ -12785,21 +13815,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"kwJ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 +"kwG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/plating, +/area/engineering/engine_room) "kwQ" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -12812,6 +13833,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"kwZ" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Elevator Shaft Access"; + req_one_access = null + }, +/turf/simulated/floor/plating, +/area/medical/medbay2) "kxi" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /turf/simulated/floor/tiled/techfloor/grid, @@ -12857,15 +13885,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"kyt" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "kyD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12902,6 +13921,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"kzM" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "kAl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -12910,6 +13936,39 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"kAn" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) +"kAD" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/head_of_personnel, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) +"kBr" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "kBt" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored{ dir = 8 @@ -12919,6 +13978,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"kBu" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on/welded{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "kBz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/danger{ @@ -12926,6 +13991,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"kBS" = ( +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kCU" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -12936,20 +14005,6 @@ /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/steel_grid, /area/rift/station/fighter_bay/maintenance) -"kDu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) "kDH" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) @@ -12978,6 +14033,25 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"kEG" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) +"kEZ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "kFe" = ( /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, @@ -13001,6 +14075,12 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) +"kHm" = ( +/obj/structure/frame/computer{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "kHs" = ( /obj/structure/table/hardwoodtable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13041,21 +14121,6 @@ "kIF" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/storage) -"kIR" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) "kIW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, @@ -13106,19 +14171,18 @@ "kKv" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/port) -"kKS" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, +"kKF" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"kKM" = ( +/obj/landmark/spawnpoint/job/senior_engineer, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"kKY" = ( -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics) +/area/engineering/hallway) +"kKX" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "kLd" = ( /obj/machinery/button/remote/blast_door{ id = "portnacelle_blastdoor"; @@ -13129,9 +14193,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"kLI" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) "kMa" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/open/shower/medical, @@ -13146,6 +14207,12 @@ /obj/landmark/spawnpoint/job/cargo_technician, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"kMo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "kMs" = ( /obj/machinery/disposal, /obj/machinery/air_alarm{ @@ -13154,19 +14221,33 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"kMV" = ( -/obj{ - name = "---Merge conflict marker---" +"kMJ" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) +"kNk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/space/basic, -/area/space) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "kNV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13214,25 +14295,40 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"kOM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "kOP" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"kPL" = ( +/obj/structure/bed/chair/sofa/black/left, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "kQm" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/crew_quarters/bar) -"kRs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"kRb" = ( +/obj/machinery/door/airlock/maintenance/engi, +/obj/machinery/door/firedoor/glass{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2/stairs) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "kRx" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 1 @@ -13249,20 +14345,6 @@ /obj/structure/table/hardwoodtable, /turf/simulated/floor/wood, /area/medical/patient_wing) -"kRX" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"kRZ" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1; - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "kSv" = ( /obj/structure/railing{ dir = 8 @@ -13331,15 +14413,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"kUE" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/space/basic, -/area/space) "kUW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13349,6 +14422,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"kUZ" = ( +/obj/machinery/pipedispenser, +/turf/simulated/floor/plating, +/area/engineering/atmos) "kVy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -13357,6 +14434,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"kWj" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "kWl" = ( /obj/machinery/air_alarm{ dir = 8; @@ -13364,6 +14445,14 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"kWq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "kWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 @@ -13382,15 +14471,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"kXX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "kYq" = ( /obj/machinery/mech_recharger, /obj/machinery/atmospherics/portables_connector{ @@ -13416,35 +14496,22 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/space) -"kYz" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 +"kYE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/space/basic, -/area/space) -"kYR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 +/obj/effect/floor_decal/techfloor/orange/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"kZY" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1 }, /obj/effect/floor_decal/industrial/danger{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"kZx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/area/space) "laL" = ( /obj/machinery/pointdefense_control{ id_tag = "forward_pd"; @@ -13452,11 +14519,6 @@ }, /turf/simulated/floor/plating, /area/space) -"lbA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "lbH" = ( /obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled/techmaint, @@ -13464,6 +14526,16 @@ "lbI" = ( /turf/simulated/floor/glass/reinforced, /area/main_map/hallway/deck2) +"lcs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/frame{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "lcP" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -13527,29 +14599,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"leE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"leN" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "leX" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Civilian Substation Bypass" }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"lfj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"lfC" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "lfF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13560,6 +14622,9 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/quartermaster/qm) +"lfV" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/hallway) "lgt" = ( /obj/machinery/atmospherics/component/quaternary/mixer{ tag_east = 2; @@ -13571,6 +14636,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"lgF" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "lgM" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 4; @@ -13579,6 +14650,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"lgP" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/atmos/gas_storage) "lht" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -13595,6 +14676,13 @@ /obj/item/material/ashtray/glass, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"lhv" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "lhz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -13626,10 +14714,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"liy" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/plating, -/area/medical/medbay2) "liO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -13683,13 +14767,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/cargo) -"lkt" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, +"lkp" = ( +/obj/structure/railing, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/medical/medbay2) +/area/main_map/maintenance/deck_two/starboard) "lkz" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -13725,6 +14807,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"llF" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) +"llM" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "lmf" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -13781,14 +14878,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) -"lpG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/deck2{ - pixel_x = 32 +"loy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "lqj" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -13799,16 +14897,60 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"lqW" = ( +"lqL" = ( /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"lrF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"lrM" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 4; + target_pressure = 15000 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "lrZ" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"lsc" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"lsl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"lsr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "lsz" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -13847,33 +14989,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"ltf" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"ltv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"ltM" = ( +/obj/structure/railing{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "lud" = ( /obj/structure/sign/warning/nosmoking_1, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, @@ -13917,13 +15041,33 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"lwH" = ( -/obj/structure/railing, -/obj/structure/railing{ +"lwD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"lwN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "lxh" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/air_alarm{ @@ -13935,6 +15079,15 @@ "lxL" = ( /turf/simulated/open, /area/main_map/maintenance/deck_two/forward) +"lxS" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "lxV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -13966,6 +15119,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) +"lzB" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/recreation_area_hallway) "lAf" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil{ @@ -13994,6 +15153,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"lAT" = ( +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/tiled/techfloor, +/area/space) "lBf" = ( /obj/structure/cable{ icon_state = "1-4" @@ -14009,6 +15172,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"lBm" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lBE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 @@ -14022,16 +15192,6 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"lBV" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/machinery/atmospherics/component/binary/pump{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "lCr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14052,10 +15212,14 @@ /obj/effect/floor_decal/corner/lightorange/bordercee, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"lDf" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) +"lDC" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "lEx" = ( /obj/machinery/gibber, /turf/simulated/floor/tiled/freezer, @@ -14090,22 +15254,29 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) +"lFB" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "lGa" = ( /turf/simulated/floor/glass/reinforced, /area/rnd/research/researchdivision) -"lGc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +"lGn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"lGC" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"lGl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel, -/area/space) +/area/main_map/maintenance/deck_two/aft/starboard) "lGK" = ( /obj/effect/floor_decal/industrial/danger, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14122,8 +15293,7 @@ /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) "lGM" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/reagent_containers/food/drinks/metaglass, @@ -14131,6 +15301,13 @@ /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"lGX" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "lHr" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -14151,15 +15328,6 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_b) -"lHx" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-8" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "lHy" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -14189,10 +15357,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"lHF" = ( -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/techfloor, -/area/space) "lHN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14214,6 +15378,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"lHW" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/wall/r_wall/prepainted, +/area/rift/station/fighter_bay/hangar) "lHZ" = ( /obj/machinery/atmospherics/tvalve/digital{ dir = 4 @@ -14239,6 +15409,17 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"lKg" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "lKt" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -14251,7 +15432,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/maintenance/substation/service) "lKT" = ( @@ -14279,6 +15460,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"lLe" = ( +/obj/machinery/camera/network/outside{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lLw" = ( /obj/structure/railing{ dir = 4 @@ -14288,15 +15475,6 @@ }, /turf/simulated/open, /area/security/brig) -"lMi" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "lMM" = ( /obj/structure/cable/heavyduty{ icon_state = "0-4" @@ -14318,6 +15496,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) +"lNs" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "lNG" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -14344,10 +15529,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"lOw" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/tiled/monotile, -/area/space) "lOA" = ( /obj/structure/sign/deck2{ pixel_y = 32 @@ -14380,6 +15561,21 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/server) +"lPV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) +"lPW" = ( +/obj/machinery/pointdefense_control{ + id_tag = "talon_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lQf" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -14392,13 +15588,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/maintenance) -"lQK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "lRb" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Science"; @@ -14439,28 +15628,6 @@ /obj/item/book/manual/standard_operating_procedure, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"lTg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) -"lTl" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "lTr" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 9 @@ -14469,44 +15636,28 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"lTs" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 4 - }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) "lTx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"lTE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"lTJ" = ( -/obj/structure/cable/green{ +"lUg" = ( +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/hallway) +"lUO" = ( +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"lUg" = ( -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/hallway) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "lVU" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -14521,6 +15672,12 @@ /obj/structure/sign/warning/nosmoking_1, /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/processing) +"lWh" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/cargo) "lWl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera/network/civilian{ @@ -14536,6 +15693,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"lWn" = ( +/obj/structure/medical_stand, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"lWu" = ( +/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 + }, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/starboard) "lXi" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -14604,16 +15781,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"lXU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) "lXX" = ( /obj/structure/table/fancyblack, /obj/effect/floor_decal/spline/fancy/wood{ @@ -14621,24 +15788,16 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"lYe" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "lYw" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/open, /area/security/brig) +"lZb" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hallway/deck2/starboard_fore) "lZt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 8 @@ -14668,16 +15827,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"mas" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +"maq" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "2-8" }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/machinery/computer/roguezones, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "maE" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored, /turf/simulated/floor/plating, @@ -14686,9 +15846,17 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +"maO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "maT" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -14702,9 +15870,11 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"mbx" = ( -/obj/machinery/computer/card, -/turf/simulated/floor/wood, +"mbj" = ( +/obj/machinery/camera/network/outside{ + dir = 10 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "mbJ" = ( /obj/machinery/door/window/brigdoor/westleft{ @@ -14713,57 +15883,53 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor/grid, /area/bridge/bunker) -"mbT" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/structure/closet, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"mcq" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/space/basic, -/area/space) "mcA" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/atmos, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"mcO" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +"mdo" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) +/obj/machinery/door/airlock/maintenance/engi, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/engineering/upper) "mdt" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/plating, /area/crew_quarters/bar) +"mdN" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"meq" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"met" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) +"meA" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "meU" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -14786,16 +15952,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"mfc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "mfd" = ( /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled, @@ -14814,16 +15970,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/server) -"mfL" = ( -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - dir = 4; - target_pressure = 15000 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "mgw" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ @@ -14834,6 +15980,10 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"mgF" = ( +/obj/structure/icecream_cart, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/freezer) "mhr" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -14866,6 +16016,12 @@ }, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) +"mjr" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "mjB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14883,6 +16039,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"mka" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/ai) "mkf" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/panic_bunker) @@ -14896,6 +16061,29 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) +"mkH" = ( +/obj/machinery/button/remote/blast_door{ + id = "mechbay-inner"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = -5; + req_access = list(29,47); + req_one_access = list(47) + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay-inner"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = 6; + req_access = list(29,47); + req_one_access = list(47) + }, +/obj/machinery/door/blast/regular{ + id = "mechbay-inner"; + name = "Mech Bay" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/mechbay) "mlD" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -14906,11 +16094,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"mlH" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/north_bump, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2/b) "mlQ" = ( /obj/machinery/door/airlock/glass{ name = "Recovery Wing" @@ -14924,10 +16107,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"mlT" = ( -/obj/structure/ladder/updown, -/turf/simulated/floor/plating, -/area/space) "mmI" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -14964,7 +16143,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) "mow" = ( @@ -14982,12 +16161,28 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"mpi" = ( -/obj/machinery/camera/network/research{ - dir = 4 +"moM" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) +"moR" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "mpH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -14998,12 +16193,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) -"mpR" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "mpU" = ( /obj/machinery/button/windowtint{ id = "booth_2"; @@ -15050,12 +16239,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/xenoflora_storage) -"mrc" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "mrU" = ( /obj/machinery/door/airlock{ name = "Bar Backroom"; @@ -15069,6 +16252,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"msa" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "mso" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15078,18 +16271,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"msO" = ( -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) -"msY" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ +"msz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/effect/floor_decal/industrial/danger{ dir = 4 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 6 +/turf/simulated/floor/tiled/techfloor, +/area/space) +"msI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/ladder/up, +/obj/structure/railing{ + dir = 8 }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"msO" = ( /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/area/rnd/research/researchdivision) "mtg" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/borderfloor{ @@ -15143,10 +16343,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -15173,6 +16370,15 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/freezer) +"muP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "mvn" = ( /obj/structure/table/reinforced, /obj/item/stamp/cargo, @@ -15205,6 +16411,13 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"mvB" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "mvH" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) @@ -15219,26 +16432,21 @@ }, /turf/simulated/wall, /area/main_map/maintenance/deck_two) -"mvW" = ( -/obj/structure/cable{ +"mwL" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/medical) +"mwQ" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"mwL" = ( -/obj/machinery/power/apc/direction_bump/west, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/medical) +/area/main_map/maintenance/deck_two/forward/port) "mwX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, @@ -15247,20 +16455,15 @@ /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2/starboard_fore) +"mym" = ( +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "myB" = ( /obj/machinery/mech_recharger, /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) -"myX" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "myY" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/security) @@ -15279,20 +16482,38 @@ }, /turf/simulated/floor/wood, /area/medical/patient_wing) -"mAp" = ( -/obj/structure/cable{ - icon_state = "1-2" +"mAe" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"mAU" = ( +/obj/structure/dogbed, +/mob/living/simple_mob/animal/passive/dog/corgi/Ian, +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) "mBg" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"mBu" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "mBy" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -15302,6 +16523,15 @@ }, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"mBM" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "mBU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15327,31 +16557,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"mCS" = ( -/obj/structure/cable/green{ - icon_state = "0-4" +"mDm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "mDY" = ( /obj/structure/grille, /obj/structure/girder/reinforced, /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) -"mEH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "mFc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -15369,7 +16588,7 @@ /area/main_map/hallway/deck2) "mGy" = ( /obj/structure/cable, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) "mGY" = ( @@ -15391,11 +16610,37 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"mHn" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/high/north_bump, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2/a) +"mHE" = ( +/obj/machinery/door/airlock/command{ + name = "Head of Personnel"; + req_access = list(57) + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge_lockdown"; + name = "Bridge Lockdown"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"mHL" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "mIl" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/plain{ @@ -15412,6 +16657,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"mIP" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"mIZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "mJl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -15422,6 +16685,18 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"mJs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "mJJ" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, @@ -15447,14 +16722,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"mLk" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, +"mKw" = ( +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"mKW" = ( +/obj/structure/door_assembly, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) "mLq" = ( /obj/machinery/door/airlock/engineering{ @@ -15482,13 +16756,20 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"mNs" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 8 +"mNS" = ( +/obj/landmark{ + name = "morphspawn" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/starboard) +"mNU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "mNW" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -15517,7 +16798,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -15539,9 +16820,26 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"mPi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"mPq" = ( +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "mPs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 @@ -15554,6 +16852,14 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) +"mQJ" = ( +/obj/structure/table/rack/shelf, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "mQU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -15598,6 +16904,17 @@ "mSp" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/medical) +"mSD" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/port) +"mSU" = ( +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/tiled, +/area/hydroponics) "mSY" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/industrial/danger{ @@ -15619,27 +16936,10 @@ /obj/structure/sign/warning/nosmoking_1, /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) -"mTG" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 9 - }, -/obj/machinery/light/no_nightshift, -/turf/simulated/open, -/area/engineering/engine_eva) "mTI" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) -"mTO" = ( -/turf/simulated/floor/tiled/monotile, -/area/rnd/research/researchdivision) "mUi" = ( /obj/machinery/door/airlock/glass/mining{ name = "Warehouse" @@ -15661,6 +16961,15 @@ "mVb" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2) +"mVr" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "mVP" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -15668,9 +16977,13 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) +"mWg" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "mWn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15684,12 +16997,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"mWI" = ( +"mWs" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "mWL" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -15709,15 +17023,6 @@ /obj/machinery/holopad, /turf/simulated/floor/wood, /area/medical/patient_wing) -"mWP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) "mWX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -15739,13 +17044,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"mXz" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "mXM" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -15756,6 +17054,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"mXP" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "mYo" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/cargo) @@ -15815,19 +17117,10 @@ }, /turf/simulated/floor/tiled, /area/space) -"mZy" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel, -/area/space) -"mZV" = ( -/obj/machinery/account_database{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/space) +"mZw" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "mZY" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/floodlight, @@ -15839,6 +17132,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"naN" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "naW" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -15856,12 +17153,6 @@ /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/hydroponics) -"nbs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "nby" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/techmaint, @@ -15893,14 +17184,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) -"ncv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, +"ncI" = ( +/obj/machinery/door/airlock/hatch, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, /area/engineering/engine_gas) "ncT" = ( /obj/structure/railing, @@ -15909,29 +17196,19 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"nda" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) "ndc" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) -"ndd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 5 +"ndz" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos) -"ndw" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/area/main_map/maintenance/deck_two/forward/starboard) "ndE" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15939,7 +17216,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) "ndO" = ( @@ -16005,40 +17282,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) -"nfh" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/port) -"nfq" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +"nfi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/space) -"ngr" = ( -/obj/structure/lattice, -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/structure/railing, -/obj/structure/railing{ +/obj/machinery/light/small{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "32-8" +/obj/effect/floor_decal/techfloor{ + dir = 6 }, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "ngt" = ( /turf/simulated/wall/prepainted, /area/hallway/primary/underone) @@ -16048,6 +17306,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) +"ngM" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ngW" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16063,6 +17328,21 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) +"nhc" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "nhm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -16118,37 +17398,26 @@ /obj/item/coin/bananium, /turf/simulated/floor/plating, /area/storage/tech) +"njw" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "nkk" = ( /obj/structure/sign/greencross, /turf/simulated/wall/r_wall/prepainted/medical, /area/crew_quarters/heads/cmo) -"nkE" = ( -/turf/simulated/wall/prepainted/civilian, -/area/crew_quarters/bar_backroom) -"nkK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +"nky" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 9 }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"nle" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/area/main_map/hallway/deck2/stairs) +"nkE" = ( +/turf/simulated/wall/prepainted/civilian, +/area/crew_quarters/bar_backroom) "nlf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16160,6 +17429,17 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"nlD" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0; + dir = 4 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "nlH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 @@ -16209,11 +17489,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"nnq" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled/monotile, -/area/space) "nnx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -16250,10 +17525,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"nnS" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) +"nnU" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "nob" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16262,33 +17540,73 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"nog" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "non" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/forward) +"not" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "noz" = ( /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) "noC" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"noG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "noL" = ( /turf/simulated/floor/plating, /area/engineering/engine_room) -"npA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +"npl" = ( +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/bar) +"npw" = ( +/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 + }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) +"npB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "npD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue{ dir = 4 }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"npE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "npK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -16303,24 +17621,9 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"nqj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "nqm" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/main_map/maintenance/atmospheric_substation/security) -"nqw" = ( -/obj/structure/sign/deck2{ - pixel_y = 32 - }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "nqE" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -16331,6 +17634,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"nrc" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "nrk" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -16357,12 +17669,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"nsB" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "ntf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -16378,6 +17684,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) +"ntR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"nud" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "nun" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 4; @@ -16407,6 +17733,13 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) +"nuZ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "nvc" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -16428,13 +17761,12 @@ "nvX" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/engineering) -"nxm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"nxj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "nxD" = ( /obj/structure/table/reinforced, /obj/fiftyspawner/rods, @@ -16442,36 +17774,28 @@ /obj/fiftyspawner/rods, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) -"nxF" = ( -/obj/effect/floor_decal/techfloor/orange{ +"nyw" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) -"nxV" = ( -/obj/machinery/keycard_auth{ - pixel_y = -36 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -8; - pixel_y = -26 +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) +"nyD" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/space) -"nyq" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "nyV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16503,6 +17827,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/maintenance) +"nzH" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "nAg" = ( /turf/simulated/floor/plating, /area/engineering/engine_gas) @@ -16515,6 +17845,21 @@ /obj/machinery/turnstile, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"nBB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "nBI" = ( /obj/structure/table/standard, /obj/machinery/vending/wallmed1/public{ @@ -16542,6 +17887,9 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"nCc" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/medical/medbay2) "nCu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -16575,20 +17923,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"nEi" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"nEo" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/open, +/area/hydroponics/garden) "nEw" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) "nEQ" = ( @@ -16635,13 +17981,16 @@ "nEZ" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) -"nGg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"nFx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "nGt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -16651,16 +18000,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"nGO" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/item/radio/intercom{ - pixel_y = -24 +"nGy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/maintenance/tool_storage) +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "nHf" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 10 @@ -16677,16 +18025,17 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_two) -"nIc" = ( -/obj/effect/floor_decal/corner/paleblue/full, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "nIe" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, /area/space) +"nIp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "nIt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16697,6 +18046,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"nIz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "nIA" = ( /obj/machinery/r_n_d/circuit_imprinter, /obj/item/reagent_containers/glass/beaker/sulphuric, @@ -16705,34 +18063,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"nIY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 +"nIL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/camera/network/engineering{ - dir = 8 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/structure/closet/firecloset, /turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"nIZ" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/main_map/maintenance/deck_two/forward/starboard) "nJy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "nJI" = ( @@ -16742,9 +18084,26 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"nJT" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "nKv" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/foyer) +"nLf" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/port) "nLn" = ( /obj/structure/railing{ dir = 8 @@ -16759,6 +18118,15 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) +"nLw" = ( +/obj/structure/table/bench/wooden, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/light/no_nightshift, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/fitness) "nLN" = ( /obj/structure/window/reinforced{ dir = 8 @@ -16791,22 +18159,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) -"nMW" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"nNl" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "nNn" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 6 @@ -16852,13 +18204,12 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"nOs" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"nOA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/plating, +/area/space) "nOP" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/briefcase/inflatable, @@ -16881,6 +18232,24 @@ }, /turf/simulated/open, /area/quartermaster/hallway) +"nPv" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/port) "nPx" = ( /obj/structure/railing, /obj/structure/railing{ @@ -16890,6 +18259,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) +"nQp" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "nQO" = ( /obj/structure/cable{ icon_state = "2-4" @@ -16904,12 +18280,12 @@ }, /turf/simulated/floor/reinforced, /area/space) -"nRU" = ( -/obj/structure/sign/deck2{ - pixel_x = 32 +"nRr" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "nRX" = ( /obj/machinery/door/airlock/glass/mining{ name = "Cargo Bay"; @@ -16919,6 +18295,19 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"nSe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "nSu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16979,6 +18368,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_d) +"nUf" = ( +/obj/machinery/door/airlock/maintenance/sec, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) "nUo" = ( /obj/structure/window/reinforced{ dir = 8 @@ -16988,14 +18388,25 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"nUu" = ( -/obj/structure/cable/green{ +"nUF" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"nUJ" = ( +/obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/space) +"nUU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "nVc" = ( /obj/machinery/vending/snack{ dir = 8 @@ -17008,6 +18419,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"nVt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "nVN" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Security"; @@ -17024,13 +18441,24 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"nVV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "4-8" +"nWb" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) +"nWv" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "nWF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -17053,6 +18481,18 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"nXi" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "nXu" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1 @@ -17080,6 +18520,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"nYU" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "nZd" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -17087,19 +18531,20 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) -"nZz" = ( -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Fighter Bay Maintenance"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/obj/machinery/door/firedoor/glass{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "nZS" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/security) +"nZT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "oac" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/fancy/wood{ @@ -17107,11 +18552,10 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"oaf" = ( -/obj/structure/dogbed, -/mob/living/simple_mob/animal/passive/dog/corgi/Ian, -/turf/simulated/floor/wood, -/area/space) +"oav" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "oaA" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ @@ -17153,22 +18597,35 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"obo" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "oce" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 }, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"ocq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "ocU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/starboard_fore) +"ocZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "odb" = ( /obj/structure/railing{ dir = 1 @@ -17197,12 +18654,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"odQ" = ( -/obj/structure/cable{ - icon_state = "1-8" +"oee" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"ofc" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ofh" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger{ @@ -17244,15 +18708,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) -"ofO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "ofZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -17265,18 +18720,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"ogh" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "ogD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -17286,12 +18729,22 @@ "ogP" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/service) +"ogY" = ( +/turf/simulated/open, +/area/rnd/robotics) "ohc" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/electrical, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"ohj" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/paleblue, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "ohk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17338,12 +18791,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"ojG" = ( -/obj/structure/sign/deck2{ - pixel_x = 32 - }, -/turf/simulated/floor/plating, -/area/maintenance/cargo) "ojQ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -17371,6 +18818,23 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"okI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"olw" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "olJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -17384,21 +18848,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"omf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"olX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "omr" = ( /obj/structure/sink{ dir = 4; @@ -17424,12 +18880,10 @@ "omU" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) -"ong" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +"onn" = ( +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "onC" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 4 @@ -17446,16 +18900,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/hallway) -"ooG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "ooK" = ( /obj/structure/dispenser{ phorontanks = 0 @@ -17469,6 +18913,45 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"opl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) +"opK" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/red/auto, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) +"opW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/steel, +/area/tether/surfacebase/security/lobby) "oqb" = ( /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 1443; @@ -17492,16 +18975,39 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/patient_b) +"oqK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"oqO" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"oqS" = ( +/obj/structure/frame{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "orw" = ( /obj/structure/ladder/updown, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"orC" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "osk" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -17580,6 +19086,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"otM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "otZ" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 @@ -17589,10 +19105,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"ouC" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/space) "ovm" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -17604,18 +19116,16 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) -"ovx" = ( -/turf/simulated/floor/tiled/steel, -/area/space) -"ovF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"ovD" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/landmark{ + name = "morphspawn" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "ovL" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -17638,13 +19148,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"owx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/obj/machinery/camera/network/engine{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "owA" = ( /obj/effect/floor_decal/industrial/danger{ dir = 5 @@ -17652,19 +19155,43 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"oxr" = ( -/obj/structure/railing{ - dir = 1 +"oxb" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"oxF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "oyt" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/starboard) +"oyG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"oyX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "ozO" = ( /turf/simulated/floor/tiled/white, /area/medical/medbay2) @@ -17699,6 +19226,20 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) +"oCD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/space) +"oCQ" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, +/obj/effect/floor_decal/industrial/danger{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "oDh" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/space) @@ -17760,9 +19301,27 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/panic_bunker) +"oEa" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/landmark{ + name = "morphspawn" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "oEd" = ( /turf/simulated/wall/prepainted/medical, /area/medical/patient_c) +"oEn" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "oEq" = ( /obj/machinery/door/airlock/command{ name = "Server Room"; @@ -17771,10 +19330,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) -"oEw" = ( -/obj/machinery/mecha_part_fabricator, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) "oEH" = ( /obj/structure/cable{ icon_state = "2-8" @@ -17788,6 +19343,14 @@ "oEJ" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/showers) +"oEN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "oFd" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -17851,10 +19414,31 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"oIq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, +"oIf" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/aft/starboard) +"oIh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/service) +"oIy" = ( +/obj/machinery/atmospherics/component/binary/pump, +/turf/simulated/floor/plating, +/area/engineering/atmos) "oIC" = ( /obj/structure/table/reinforced, /obj/item/radio/off, @@ -17883,7 +19467,7 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_c) "oJP" = ( @@ -17893,6 +19477,26 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/server) +"oJT" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on/welded{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"oKu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"oKH" = ( +/obj/structure/table/bench/wooden, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/crew_quarters/fitness) "oKI" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Mining Outpost Airlock" @@ -17904,6 +19508,27 @@ }, /turf/simulated/floor, /area/hallway/primary/underone) +"oLd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) +"oLx" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "oLz" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -17920,12 +19545,6 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2/b) -"oLS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) "oLT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17936,6 +19555,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) +"oMs" = ( +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/danger, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) "oNf" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -17994,6 +19622,13 @@ }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) +"oNH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "oNJ" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medical Maintenance Access"; @@ -18013,6 +19648,24 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"oOl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/space) +"oON" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"oOS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/space) "oOZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18028,12 +19681,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"oPE" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) "oPM" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 8; @@ -18104,6 +19751,13 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"oRM" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24) + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "oSm" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/main_map/maintenance/deck_two/aft) @@ -18123,6 +19777,21 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/foyer) +"oSI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"oTr" = ( +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "oTE" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18143,18 +19812,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) -"oUm" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "oUq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -18163,17 +19820,13 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) "oUw" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18211,19 +19864,16 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) -"oWs" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "oWw" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"oWC" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "oWO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -18238,6 +19888,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/maintenance) +"oWU" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "oXk" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 @@ -18265,11 +19932,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -18297,7 +19960,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18308,6 +19971,19 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) +"oYE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "oYL" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 @@ -18397,14 +20073,10 @@ }, /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) -"paD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +"paH" = ( +/obj/machinery/atmospherics/valve/digital, +/turf/simulated/floor/tiled/techfloor, +/area/space) "paM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -18425,9 +20097,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/engineering/hallway) -"paT" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "pbe" = ( /obj/machinery/power/smes/buildable/engine/rust, /obj/structure/cable/cyan{ @@ -18435,15 +20104,14 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_smes) -"pbq" = ( -/obj/item/clothing/under/swimsuit, -/obj/structure/cable/green{ - icon_state = "4-8" +"pbS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "pcf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18476,23 +20144,40 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) +"peI" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "pfb" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, /turf/simulated/floor/wood, /area/main_map/hallway/deck2) -"pfp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "pfY" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Forward Point Defense Substation Bypass" }, /turf/simulated/floor/plating, /area/space) +"pgc" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "pgv" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -18528,30 +20213,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"phC" = ( -/obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access = list(57) - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "bridge_lockdown"; - name = "Bridge Lockdown"; - opacity = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/space) "phS" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -18610,21 +20271,18 @@ "pjR" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/hallway) -"pkd" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) +"pko" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"pkv" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "pkG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/starboard) -"ply" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "plE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -18640,16 +20298,26 @@ }, /obj/structure/catwalk, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) "pmc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"pmf" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) +"pmh" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "pms" = ( /obj/structure/window/reinforced, /obj/machinery/portable_atmospherics/canister/phoron, @@ -18662,6 +20330,10 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"pmC" = ( +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) "pnB" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 @@ -18688,10 +20360,22 @@ }, /turf/simulated/floor/plating, /area/medical/medbay2) -"ppi" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +"poW" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/plating, +/area/bridge/hop_office) "ppn" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 @@ -18723,15 +20407,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"ppz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "ppD" = ( /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/gas_storage) @@ -18751,10 +20426,16 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "ppT" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"pqj" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "pqW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18775,11 +20456,35 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"prJ" = ( +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"psc" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "psS" = ( /obj/structure/lattice, /obj/machinery/camera/network/security, /turf/simulated/open, /area/security/brig) +"ptq" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "puk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -18793,7 +20498,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) "puw" = ( @@ -18802,6 +20507,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) +"puD" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "puR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/visible/green{ @@ -18809,24 +20520,30 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"pvT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 +"pvy" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/ai/foyer) +"pvA" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/medical/patient_wing) +"pvE" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/component/binary/pump, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"pwo" = ( -/obj{ - name = "---Merge conflict marker---" +/area/main_map/maintenance/deck_two/aft/starboard) +"pwr" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/power/smes/magical{ + output_level = 5000; + output_level_max = 5000 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/engineering/engine_room) "pwZ" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, @@ -18863,32 +20580,26 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) -"pyY" = ( -/obj/structure/cable{ - icon_state = "1-2" +"pze" = ( +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"pzb" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"pzh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"pzf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "pzv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18917,18 +20628,25 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"pzY" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "pAg" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"pAl" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 +"pAq" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "pAF" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -18974,18 +20692,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) -"pBk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"pBm" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/storage) "pBx" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/space/emergency, @@ -19036,14 +20742,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"pCZ" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "pDg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19056,6 +20754,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) +"pDC" = ( +/obj/machinery/mecha_part_fabricator, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "pDF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -19068,17 +20770,18 @@ /obj/structure/grille, /turf/space, /area/space) -"pDX" = ( -/obj/structure/railing{ - dir = 8 +"pDU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 }, -/obj/structure/railing, -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/zpipe/down{ - dir = 1 +/turf/simulated/floor/plating, +/area/space) +"pEs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 }, -/turf/simulated/open, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/techfloor, +/area/space) "pEz" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19104,12 +20807,6 @@ "pFe" = ( /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"pFp" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "pFE" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19162,17 +20859,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/hallway) -"pHj" = ( -/obj/machinery/camera/network/engineering, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) -"pHr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "pHH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/no_nightshift{ @@ -19207,17 +20893,33 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"pJy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 8 +"pIV" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/effect/floor_decal/techfloor/hole/right, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"pIY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) -"pJI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/area/main_map/maintenance/deck_two/aft) +"pJp" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "pJJ" = ( /obj/machinery/air_alarm{ dir = 8; @@ -19328,29 +21030,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) -"pPg" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/grass_edge/corner, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research/researchdivision) -"pPp" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +"pPJ" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "pPN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -19371,12 +21054,13 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) -"pQT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"pQZ" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "pRH" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, @@ -19390,6 +21074,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2/a) +"pSx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"pSH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "pSK" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ @@ -19413,6 +21117,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"pTm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "pTo" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1; @@ -19437,13 +21147,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) -"pUB" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 +"pUm" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "pVJ" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing, @@ -19461,16 +21173,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"pWd" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "pWj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"pWo" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "pWw" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -19491,6 +21202,21 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"pWH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "pWM" = ( /obj/machinery/cryopod/robot, /turf/simulated/floor/tiled/steel_grid, @@ -19498,12 +21224,6 @@ "pXb" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"pXl" = ( -/obj/item/clothing/under/swimsuit, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area_hallway) "pXq" = ( /obj/structure/sign/warning/nosmoking_1{ pixel_y = 32 @@ -19519,20 +21239,19 @@ "pXJ" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/maintenance/deck_two/aft/starboard) -"pYr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "pYz" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/barrestroom) -"pYL" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +"pZC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/starboard) +/area/main_map/hallway/deck2) "pZS" = ( /obj/machinery/door/window/northright{ name = "Air Mix Controller"; @@ -19556,14 +21275,27 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/durathread, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay) +"qau" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "qaV" = ( /obj/structure/cable/green{ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/substation/medical) +"qbb" = ( +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "qbf" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -19639,27 +21371,17 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"qdB" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "AI Upload Access"; - req_access = list(16); - req_one_access = list() - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) -"qef" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +"qeo" = ( +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/cable/green, +/obj/machinery/power/apc/south_mount, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/wood, +/area/bridge/hop_office) "qer" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "COMMAND" @@ -19686,40 +21408,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"qfO" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/storage/toolbox/mechanical, +"qfm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"qgM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/space/basic, -/area/space) -"qfW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"qgQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/forward/starboard) -"qgu" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "qgS" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -19750,6 +21463,23 @@ "qhn" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/aft) +"qho" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/server) +"qin" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "qiF" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ icon_state = "map_vent_out"; @@ -19765,6 +21495,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"qiR" = ( +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "qje" = ( /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 @@ -19781,6 +21515,10 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"qks" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck2) "qkD" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -19794,12 +21532,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"qkZ" = ( -/obj/machinery/pointdefense_control{ - id_tag = "talon_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "qlL" = ( /obj/machinery/computer/rdconsole/robotics, /turf/simulated/floor/tiled/steel_grid, @@ -19813,6 +21545,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"qlX" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "qmQ" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 6 @@ -19825,6 +21564,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/fitness) +"qoh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "qok" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass, @@ -19874,12 +21620,27 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) +"qqL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "qqS" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"qrd" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "qrC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19895,31 +21656,45 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"qsb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/space) "qsr" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"qst" = ( -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Fighter Bay Maintenance"; - req_one_access = list(19,29,38,43,47,63,67) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) "qsx" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/gas_storage) -"qsE" = ( -/obj/machinery/lathe/autolathe, +"qsD" = ( +/obj/machinery/door/blast/regular{ + id = "mechbay-inner"; + name = "Mech Bay" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) -"qtm" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/rnd/robotics/mechbay) +"qtv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "qtX" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -19961,12 +21736,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/main_map/hallway/deck2) -"qvm" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) "qvC" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -19983,30 +21752,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"qwk" = ( -/obj/machinery/button/remote/blast_door{ - id = "mechbay-inner"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = -5; - req_access = list(29,47); - req_one_access = list(47) - }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay-inner"; - name = "Mech Bay"; - pixel_x = 27; - pixel_y = 6; - req_access = list(29,47); - req_one_access = list(47) - }, -/obj/machinery/door/blast/regular{ - id = "mechbay-inner"; - name = "Mech Bay"; - dir = 4 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/mechbay) "qwl" = ( /obj/machinery/door/blast/regular{ dir = 4 @@ -20034,18 +21779,9 @@ "qwI" = ( /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) -"qxf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +"qxa" = ( +/turf/simulated/open, +/area/ai/foyer) "qxB" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/plain{ @@ -20073,6 +21809,17 @@ /obj/structure/curtain/open/shower/medical, /turf/simulated/floor/plating, /area/medical/patient_a) +"qyN" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) +"qzk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "qzN" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 8 @@ -20083,7 +21830,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) "qAa" = ( @@ -20121,12 +21868,25 @@ }, /turf/simulated/floor/airless/ceiling, /area/engineering/engine_eva) +"qBl" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "qBx" = ( /obj/machinery/atmospherics/pipe/tank/phoron{ dir = 4 }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) +"qBZ" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "qCd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -20156,6 +21916,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/space) +"qCZ" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "qDh" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donut, @@ -20195,6 +21959,13 @@ "qFk" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"qFn" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "qFt" = ( /obj/structure/railing{ dir = 1 @@ -20240,6 +22011,10 @@ }, /turf/simulated/floor/tiled, /area/space) +"qGi" = ( +/obj/structure/marker_beacon/red, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "qGs" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, @@ -20263,6 +22038,23 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) +"qGZ" = ( +/obj/structure/frame{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"qHn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "qHT" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -20275,6 +22067,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"qIl" = ( +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge/hop_office) +"qIo" = ( +/obj/structure/railing/grey, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics) "qIE" = ( /obj/machinery/light/no_nightshift, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -20288,41 +22087,24 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) -"qJg" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) "qJj" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/crew_quarters/heads/cmo) -"qJq" = ( -/obj/machinery/door/airlock/maintenance/sec, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +"qJK" = ( +/obj/structure/table/hardwoodtable, +/obj/item/stamp/qm{ + pixel_x = -6 }, -/turf/simulated/floor/plating, -/area/space) -"qJx" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ - dir = 1 +/obj/item/stamp/denied{ + pixel_x = 7 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/port) -"qJE" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1 +/obj/item/stamp/cargo, +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 24 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +/turf/simulated/floor/wood, +/area/quartermaster/qm) "qKi" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -20360,6 +22142,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"qLg" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) "qLl" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -20401,6 +22193,9 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"qLK" = ( +/turf/simulated/floor/reinforced/overhang, +/area/space) "qLM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20408,9 +22203,12 @@ /area/main_map/maintenance/deck_two/forward/starboard) "qLV" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/critical/south_bump, +/obj/machinery/power/apc/critical/south_mount, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"qLW" = ( +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "qMd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20426,19 +22224,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) -"qMk" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "qMD" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled, @@ -20465,12 +22250,17 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"qNn" = ( -/obj/structure/table/rack/shelf, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) +"qNv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "qNC" = ( /obj/machinery/air_alarm{ dir = 1; @@ -20487,6 +22277,18 @@ /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck2/port_fore) +"qPr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "qPE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20496,6 +22298,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"qQa" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"qQJ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "qRn" = ( /obj/structure/toilet{ dir = 1 @@ -20510,6 +22324,22 @@ }, /turf/simulated/open, /area/hydroponics) +"qRu" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "qRB" = ( /obj/machinery/door/airlock{ name = "Showers" @@ -20526,15 +22356,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/showers) -"qRL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "qRR" = ( /obj/structure/railing{ dir = 8 @@ -20666,46 +22487,21 @@ /obj/structure/girder/reinforced, /turf/simulated/floor/reinforced/carbon_dioxide, /area/space) -"qWL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "qWZ" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/port_fore) -"qXn" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"qXs" = ( +"qXj" = ( /obj/structure/cable/green{ - icon_state = "32-1" - }, -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/open, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "qXw" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/recreation_area_hallway) @@ -20729,15 +22525,26 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/hallway) -"qZb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +"qYj" = ( +/obj/structure/railing/grey{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/turf/simulated/open, +/area/rnd/research/researchdivision) +"qYn" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"qZw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/techfloor, +/area/space) "qZO" = ( /obj/structure/railing, /obj/machinery/camera/network/cargo{ @@ -20745,16 +22552,10 @@ }, /turf/simulated/open, /area/quartermaster/hallway) -"qZQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/rnd/rdoffice) +"qZR" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rau" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) @@ -20764,35 +22565,62 @@ }, /turf/simulated/floor/tiled/techfloor, /area/server) -"rbI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"rdq" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ +"rca" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"rcw" = ( +/obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"rdw" = ( -/obj/machinery/door/airlock/atmos{ - name = "Security Atmospherics Backup"; - req_access = list(24) +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"rcy" = ( +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"rcT" = ( +/obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/bed/chair{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) +"rcU" = ( +/obj/structure/door_assembly/medical, +/obj/structure/firedoor_assembly, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) +"rdq" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) +/area/main_map/maintenance/deck_two/forward/port) "rdE" = ( /obj/structure/railing, /obj/structure/railing{ @@ -20803,11 +22631,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/forward/port) -"rdJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "rel" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -20826,15 +22649,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"reW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor/plating, +/area/space) "rff" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) -"rfS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "rgm" = ( /obj/structure/railing, /obj/structure/railing{ @@ -20849,15 +22670,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"rgM" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "rgO" = ( /obj/machinery/door/window/survival_pod{ dir = 2; @@ -20882,9 +22694,6 @@ }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) -"rhD" = ( -/turf/simulated/floor/tiled/steel_grid, -/area/main_map/maintenance/deck_two/aft/starboard) "rhN" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -20893,6 +22702,11 @@ /obj/machinery/door/window/brigdoor/southright, /turf/simulated/floor/plating, /area/security/brig) +"rhQ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/landmark/spawnpoint/job/assistant, +/turf/simulated/floor/tiled, +/area/maintenance/tool_storage) "rhW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -20913,12 +22727,26 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"rjo" = ( +"riD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"rjq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "rjC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20948,47 +22776,24 @@ }, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/gas_storage) -"rkw" = ( -/obj/machinery/button/remote/blast_door{ - id = "hangar_pad"; - name = "Hangar Bay Blast Door Control"; - pixel_x = 24; - pixel_y = -28; - req_one_access = list(19,29,38,43,47,63,67); - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/main_map/maintenance/deck_two/aft/starboard) -"rkT" = ( -/obj/machinery/icecream_vat, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/freezer) "rlc" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"rlm" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "rlo" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) -"rly" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "rlB" = ( /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/xenoflora_storage) @@ -21007,13 +22812,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"rlY" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/space) +"rlE" = ( +/obj/effect/debris/cleanable/blood/oil, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "rms" = ( /obj/structure/table/rack{ dir = 8; @@ -21030,12 +22832,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"rnp" = ( -/obj/machinery/light/small{ - dir = 4 +"rnh" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward) +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft) "rnJ" = ( /obj/structure/cable/green{ icon_state = "32-2" @@ -21053,17 +22858,32 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/port) -"rnN" = ( -/obj/machinery/door/airlock/atmos, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) +"rnU" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "rnV" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/aft/starboard) +"rod" = ( +/obj/structure/catwalk, +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"rog" = ( +/obj/machinery/lathe/autolathe, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "rol" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -21078,18 +22898,10 @@ /obj/item/stamp/cmo, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"rot" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) +"rop" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/hydroponics/garden) "roN" = ( /obj/machinery/atmospherics/component/trinary/mixer{ dir = 4 @@ -21100,35 +22912,19 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) "rpp" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"rpC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "rpI" = ( /obj/machinery/door/firedoor{ dir = 2 }, /turf/simulated/floor/tiled/monotile, /area/security/observation) -"rqz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "rqL" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/hallway) @@ -21141,36 +22937,12 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"rrh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "rrk" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) -"rrl" = ( -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/research/researchdivision) -"rrq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "rru" = ( /obj/machinery/shower{ dir = 1 @@ -21207,6 +22979,15 @@ /obj/random/soap, /turf/simulated/floor/wood, /area/crew_quarters/showers) +"rtm" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "rtx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -21226,6 +23007,10 @@ "rui" = ( /turf/simulated/floor/wood, /area/medical/patient_wing) +"ruP" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "ruU" = ( /obj/structure/toilet{ dir = 1 @@ -21249,6 +23034,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/recreation_area_hallway) +"rwl" = ( +/obj/structure/sign/directions/cryo{ + dir = 8 + }, +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge/hop_office) "rwL" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -21302,18 +23093,18 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) -"ryt" = ( -/obj/structure/cable{ - icon_state = "4-8" +"ryu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/techfloor{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "ryw" = ( /obj/structure/table/steel, /obj/machinery/microwave, @@ -21341,6 +23132,16 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck2) +"rzB" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"rzJ" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rzN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -21357,6 +23158,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) +"rzX" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "rAa" = ( /obj/machinery/shower{ pixel_y = 16 @@ -21379,6 +23186,15 @@ }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) +"rAL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "rAO" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21392,15 +23208,6 @@ "rAT" = ( /turf/simulated/floor/tiled/techmaint, /area/quartermaster/hallway) -"rAX" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "rBj" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) @@ -21424,9 +23231,15 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"rBL" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "rCj" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 10 @@ -21446,34 +23259,38 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/storage) -"rCK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"rDa" = ( -/obj/structure/cable{ - icon_state = "4-8" +"rDc" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "hangar_pad"; + name = "Hangar Bay Blast Door" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/obj/machinery/atmospheric_field_generator/perma, +/turf/simulated/floor/reinforced, +/area/rift/station/fighter_bay/hangar) "rDn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc/high/south_bump, +/obj/machinery/power/apc/high/south_mount, /obj/structure/cable{ icon_state = "0-8" }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"rDv" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"rDw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "rDH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -21481,29 +23298,6 @@ "rDL" = ( /turf/simulated/floor/plating, /area/medical/medbay2) -"rEj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"rEo" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" - }, -/turf/simulated/floor/plating, -/area/space) "rEy" = ( /obj/structure/sign/deck/second{ pixel_y = 32 @@ -21549,43 +23343,28 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"rFX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"rGp" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 }, -/obj/structure/cable{ +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"rHc" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) -"rGd" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/cable/green{ + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"rGD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 + dir = 10 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"rHm" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/turf/simulated/floor/wood, +/area/bridge/hop_office) "rHn" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -21606,15 +23385,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"rHw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "rHE" = ( /turf/simulated/wall, /area/space) @@ -21624,26 +23394,19 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/marker_beacon/red, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"rIU" = ( -/obj/machinery/door/blast/regular{ - id = "mechbay-inner"; - name = "Mech Bay"; - dir = 4 +"rIp" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/mechbay) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "rJK" = ( /obj/structure/railing{ dir = 4 @@ -21672,6 +23435,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"rKx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "rLk" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21682,12 +23452,26 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/monotile, /area/security/observation) +"rLJ" = ( +/obj/structure/table/glass, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "rLK" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) +"rMO" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "rNk" = ( /obj/landmark{ name = "morphspawn" @@ -21754,28 +23538,36 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/critical/north_bump, +/obj/machinery/power/apc/critical/north_mount, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) +"rOV" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/landmark/spawnpoint/job/janitor, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) +"rPB" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rPD" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"rQb" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 1 +"rPS" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/window/phoronreinforced, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "portnacelle_blastdoor"; - opacity = 0 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "rQs" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/aft/port) @@ -21795,6 +23587,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"rRh" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "rRj" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -21810,6 +23609,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"rRx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"rRJ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"rRN" = ( +/obj/structure/catwalk, +/obj/machinery/camera/network/outside, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rSo" = ( /obj/machinery/computer/robotics{ dir = 8 @@ -21845,21 +23664,14 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"rTc" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"rSX" = ( +/obj/structure/catwalk, +/obj/structure/frame{ + anchored = 1; + dir = 1 }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +/area/main_map/maintenance/deck_two) "rTe" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -21902,6 +23714,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"rTX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "rUw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -21913,12 +23731,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"rUM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "rVy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -21934,15 +23746,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"rXI" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "rXS" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -21962,6 +23765,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) +"rYG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/space) "rZl" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -21986,36 +23793,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) -"saC" = ( -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/heads/cmo) "sbI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) -"scc" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/space/basic, -/area/space) "scC" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -22025,21 +23806,45 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo) +"sdd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/space) +"sdn" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"seJ" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "seT" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/meeting_room) -"sfl" = ( -/obj/structure/cable{ +"sfr" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/turf/simulated/floor/plating, +/area/bridge/hop_office) "sfY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/bluegrid, @@ -22048,13 +23853,22 @@ /obj/structure/railing, /turf/simulated/open, /area/space) -"sgT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"sgF" = ( +/obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) +/obj/structure/railing, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"sgI" = ( +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "sha" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22083,6 +23897,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) +"sij" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "siA" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -22101,18 +23919,26 @@ /obj/machinery/washing_machine, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) -"sjh" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 10 +"sjm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/aux, +/obj/machinery/camera/network/engine{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/space) +"sjO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor{ + dir = 2 }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"sjV" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "ske" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -22135,6 +23961,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) +"skX" = ( +/obj/effect/floor_decal/grass_edge/corner, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research/researchdivision) "skY" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 @@ -22142,6 +23983,19 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) +"slf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "slv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -22152,7 +24006,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/security/brig) "slU" = ( @@ -22161,6 +24015,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"smc" = ( +/obj/machinery/camera/network/research{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/black/right{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "smm" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -22173,19 +24039,52 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/hallway/primary/underone) +"smn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "smx" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"smB" = ( -/obj/machinery/door/blast/regular{ +"smE" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ dir = 4; - id = "hangar_pad"; - name = "Hangar Bay Blast Door" + name = "Maintenance Access" }, -/obj/machinery/atmospheric_field_generator/perma, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) +"smF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/wall/r_wall/prepainted, +/area/rift/station/fighter_bay/hangar) +"smH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"snb" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "snz" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/glass, @@ -22208,20 +24107,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"sop" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/computer/security/telescreen{ - pixel_y = 32 +"snV" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/space/basic, -/area/space) +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "soB" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -22230,24 +24122,6 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"soX" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"spg" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/port) "spv" = ( /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/tiled/monotile, @@ -22255,10 +24129,10 @@ "spD" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/storage) -"sqV" = ( -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +"sqC" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/starboard) "srv" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) @@ -22278,15 +24152,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"ssU" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 +"stq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "stM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22299,6 +24173,16 @@ }, /turf/simulated/floor/carpet/blue, /area/bridge/meeting_room) +"stR" = ( +/obj/machinery/camera/network/outside{ + dir = 5 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"stV" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "suA" = ( /obj/machinery/air_alarm{ dir = 1; @@ -22338,6 +24222,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"svp" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"svt" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "svx" = ( /obj/machinery/door/airlock/engineering{ name = "Hangar Substation" @@ -22347,6 +24243,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"svA" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "svO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22361,13 +24261,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/starboard) -"swr" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/robotics) "swF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22378,10 +24271,22 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"sxa" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/wood, -/area/space) +"swV" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(10) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) +"sxb" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "sxk" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -22409,12 +24314,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_two/aft) -"sxY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "sya" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22435,18 +24334,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"syA" = ( +/obj/machinery/camera/network/outside{ + dir = 5 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"syJ" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor/tiled/techfloor, +/area/space) "szC" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"sAd" = ( +"sAe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) "sAl" = ( /obj/structure/closet/firecloset, @@ -22455,10 +24363,28 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward) +"sAw" = ( +/obj/machinery/button/remote/blast_door{ + id = "hangar_pad"; + name = "Hangar Bay Blast Door Control"; + pixel_x = -24; + pixel_y = -28; + req_one_access = list(19,29,38,43,47,63,67); + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "sAF" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/port) +"sBk" = ( +/obj/machinery/camera/network/outside, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "sBz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22508,10 +24434,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"sDQ" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/research/researchdivision) "sDS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22521,6 +24443,12 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) +"sDX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "sEd" = ( /obj/machinery/camera/network/engineering{ dir = 8 @@ -22533,6 +24461,13 @@ "sEh" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_two/starboard) +"sEm" = ( +/obj/structure/closet/firecloset, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "sEr" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/patient_a) @@ -22625,6 +24560,41 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"sFF" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"sFS" = ( +/obj/machinery/door/airlock/engineering{ + name = "Science Substation"; + req_one_access = list(11,24,47) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/substation/research) +"sFU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "sGh" = ( /obj/machinery/camera/network/engineering, /obj/structure/cable/green{ @@ -22641,12 +24611,30 @@ }, /turf/simulated/open, /area/engineering/hallway) +"sGD" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Fighter Bay Maintenance"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "sGG" = ( /obj/machinery/atmospherics/component/binary/pump{ name = "Fuel Line to Thrusters" }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"sGM" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/multi_tile/metal{ + req_one_access = list(10); + name = "Engineering" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) "sGT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22659,35 +24647,43 @@ }, /turf/simulated/floor/plating, /area/engineering/hallway) +"sHd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"sHi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/blue{ + dir = 5 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "sHu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/wood, /area/medical/patient_wing) -"sIT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "sJz" = ( /obj/structure/sign/deck/second{ pixel_x = 32 }, /turf/simulated/floor/tiled/monotile, /area/security/observation) -"sKs" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "2-8" +"sKe" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "sKv" = ( /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22700,7 +24696,7 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "sKO" = ( @@ -22713,6 +24709,15 @@ /obj/item/radio/off, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"sLY" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "sMK" = ( /obj/structure/railing, /turf/simulated/open, @@ -22725,6 +24730,10 @@ /obj/machinery/door/window/brigdoor/westright, /turf/simulated/floor/plating, /area/security/brig) +"sNL" = ( +/obj/machinery/computer/rdconsole/robotics, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "sNN" = ( /turf/simulated/wall, /area/main_map/hallway/deck2/port_fore) @@ -22749,33 +24758,40 @@ /obj/machinery/shieldgen, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"sOR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 10 +"sPy" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/port) +"sPB" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) +"sQu" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos) -"sPg" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/area/main_map/maintenance/deck_two) +"sQC" = ( +/obj/structure/railing/grey{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"sPy" = ( -/obj/structure/catwalk, /turf/simulated/open, -/area/main_map/maintenance/deck_two/port) -"sQX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/area/rnd/research/researchdivision) +"sQK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"sQR" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "sRd" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -22802,6 +24818,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"sRC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "sRI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, @@ -22882,12 +24907,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"sUr" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "sUy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 6 @@ -22900,6 +24919,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) +"sUz" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "sUJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -22950,13 +24981,6 @@ }, /turf/simulated/open, /area/security/observation) -"sWo" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "sWt" = ( /obj/structure/sink{ dir = 4; @@ -22977,15 +25001,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"sWM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) - }, -/turf/simulated/floor/tiled/techmaint, -/area/medical/medbay2) "sXb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -23012,10 +25027,44 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"sXU" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2/stairs) +"sYe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "sYV" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/observation) +"sZm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) "sZN" = ( /obj/structure/railing, /obj/structure/railing{ @@ -23042,6 +25091,28 @@ /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"tbl" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"tbs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "tbN" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ @@ -23134,27 +25205,21 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"tfD" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/main_map/maintenance/atmospheric_substation/ai) -"tfH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"tfk" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) -"tfY" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/maintenance/engineering/upper) +"tfD" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/atmospheric_substation/ai) "tgc" = ( /obj/machinery/door/airlock{ name = "Secondary Janitorial Closet"; @@ -23171,14 +25236,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft) -"tgk" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, +"tgi" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/atmos/gas_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) "tgr" = ( /obj/structure/railing{ dir = 1 @@ -23200,6 +25264,17 @@ "thb" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) +"thm" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/aft/starboard) "thK" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 4; @@ -23233,6 +25308,28 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"tiT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) +"tja" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "tje" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23261,9 +25358,6 @@ "tjx" = ( /turf/simulated/floor/plating, /area/maintenance/cargo) -"tjA" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "tkb" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -23283,6 +25377,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"tkA" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"tkF" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "tkH" = ( /obj/machinery/computer/supplycomp/control{ dir = 4 @@ -23307,18 +25413,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"tlJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "tlS" = ( /obj/structure/table/reinforced, /obj/item/stack/material/plastic{ @@ -23344,25 +25438,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"tmY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/starboard) "tnf" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"tnr" = ( +/obj/structure/ladder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "tnA" = ( /turf/simulated/floor/wood, /area/crew_quarters/showers) +"toB" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "toG" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -23400,6 +25495,11 @@ /obj/effect/floor_decal/techfloor/orange/corner, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"tpv" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "tpC" = ( /obj/structure/table/steel, /obj/effect/floor_decal/techfloor, @@ -23414,18 +25514,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"tpX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/security) +"tqh" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "tqi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23441,13 +25533,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"tqn" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, +"tqy" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"trl" = ( +/obj/structure/grille, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"trp" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "trr" = ( /obj/structure/kitchenspike, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/freezer, @@ -23459,17 +25565,24 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/starboard) -"trS" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"trL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/techfloor, /area/space) +"trO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "tsq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23479,13 +25592,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"tsx" = ( -/obj/item/clothing/under/swimsuit, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/crew_quarters/recreation_area_hallway) "tsZ" = ( /obj/item/radio/intercom{ dir = 1; @@ -23497,6 +25603,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"ttc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "ttq" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -23512,31 +25626,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"ttP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 5 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "tuc" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/open, /area/main_map/hallway/deck2) -"tuk" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "tuY" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -23550,41 +25645,35 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "2-4" }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"tvN" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - frequency = 1441; - pixel_y = 22 +"tvs" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/machinery/vending/fitness, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "tvU" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"twy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"tvX" = ( +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/component/binary/pump{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) +/obj/machinery/door/airlock/hatch, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_gas) "twJ" = ( /obj/item/storage/toolbox/mechanical{ pixel_y = 5 @@ -23608,12 +25697,6 @@ }, /turf/simulated/open, /area/quartermaster/warehouse) -"txn" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/storage) "txB" = ( /obj/structure/table/rack/shelf, /obj/item/storage/backpack/parachute{ @@ -23699,13 +25782,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"tyE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "tzk" = ( /obj/structure/cable{ icon_state = "2-4" @@ -23718,13 +25794,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two) -"tzO" = ( -/obj/structure/lattice, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/space) "tzX" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -23767,10 +25836,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"tAx" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "tAC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/effect/floor_decal/industrial/danger{ @@ -23778,19 +25843,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"tAE" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"tAJ" = ( -/obj/structure/table/fancyblack, -/turf/simulated/floor/carpet, -/area/crew_quarters/bar) "tAR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, @@ -23806,17 +25858,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"tAX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"tAZ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/ai) "tBx" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23827,12 +25868,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/recreation_area_hallway) +"tCH" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "tCN" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar_backroom) +"tDc" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_two/forward/starboard) "tDw" = ( /obj/structure/railing{ dir = 1 @@ -23842,52 +25899,35 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft) -"tDB" = ( -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/industrial/danger, -/obj/machinery/door/airlock/glass/atmos, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) "tDH" = ( /obj/structure/ladder/up, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/port) +"tDN" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/research/researchdivision) "tEs" = ( /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/port) -"tEJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "tFj" = ( /obj/machinery/atmospherics/pipe/tank/phoron{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"tFl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) "tFm" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) -"tFq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/door/airlock/glass/atmos, -/obj/machinery/door/firedoor/glass, +"tFN" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) "tFR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -23908,6 +25948,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) +"tGm" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos/processing) "tGo" = ( /obj/machinery/vending/assist, /turf/simulated/floor/tiled, @@ -23915,6 +25959,13 @@ "tGw" = ( /turf/simulated/floor/wood, /area/bridge/meeting_room) +"tGN" = ( +/obj/structure/bed/chair/sofa/black, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "tHq" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) @@ -23930,6 +25981,32 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/security/observation) +"tIc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"tIw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"tIM" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/aft/starboard) "tIW" = ( /obj/structure/sign/deck/second, /turf/simulated/wall, @@ -23993,25 +26070,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/service) -"tKq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/floodlight{ - anchored = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ +"tKs" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two) "tLh" = ( /obj/structure/sign/directions/cryo{ dir = 8 @@ -24021,12 +26086,32 @@ "tLr" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay) +"tLI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/deck2{ + pixel_x = 32 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "tMn" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"tMv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "tMB" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24054,16 +26139,18 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"tNc" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "tNL" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) -"tNO" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/maintenance/tool_storage) "tNT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24073,6 +26160,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) +"tNW" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) "tOq" = ( /obj/machinery/door/airlock/atmos{ name = "Civilian Atmospherics Backup"; @@ -24090,18 +26181,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"tOR" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) "tPa" = ( /obj/machinery/door/airlock/maintenance/command{ name = "Command Atmospheric Substation" @@ -24137,42 +26216,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward) -"tPM" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "tQt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"tQB" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/space/basic, -/area/space) "tRb" = ( /turf/simulated/wall/prepainted/medical, /area/main_map/maintenance/deck_two/forward/starboard) +"tRs" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "tRL" = ( /obj/machinery/atmospherics/component/binary/pump, /turf/simulated/floor/tiled/techfloor, @@ -24195,6 +26256,17 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/aft/port) +"tSz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "tSI" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -24206,8 +26278,7 @@ /turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "tTX" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -24231,6 +26302,15 @@ /obj/fiftyspawner/glass, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) +"tUN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "tUW" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/green, /turf/simulated/floor/tiled/techfloor, @@ -24239,7 +26319,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) "tVp" = ( @@ -24254,21 +26334,24 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shield_gen) +"tVE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/space) +"tWm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/component/binary/pump, +/turf/simulated/floor/plating, +/area/space) "tWn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_c) -"tWx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "tWA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24304,22 +26387,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"tXw" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "tXx" = ( /obj/effect/floor_decal/techfloor/orange/corner{ dir = 8 @@ -24330,23 +26397,33 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) +"tXY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"tYk" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/obj/machinery/camera/network/engine{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "tYn" = ( /obj/machinery/camera/network/research{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"tZt" = ( +"tZg" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/rnd/rdoffice) +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_two/aft/port) "tZE" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research/researchdivision) -"tZK" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/reinforced/airless, -/area/space) "tZY" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -24356,19 +26433,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) -"uaa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/direction_bump/north, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/atmospheric_substation/security) "uad" = ( /obj/effect/floor_decal/corner/paleblue/bordercee{ dir = 4 @@ -24382,15 +26446,6 @@ /obj/structure/railing, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/port) -"ubz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "ubH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24419,6 +26474,37 @@ /obj/machinery/atmospherics/valve/digital, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"udK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) +"udR" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/engineering/deck2/power_line) +"uec" = ( +/obj/structure/sign/deck2{ + pixel_y = -32 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"uee" = ( +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "ueK" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24446,27 +26532,19 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) -"ugw" = ( -/obj/structure/cable{ - icon_state = "1-8" +"ugP" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor, +/area/rift/station/fighter_bay/hangar) "uhf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/maintenance) -"uht" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "uiO" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 1; @@ -24492,16 +26570,6 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled, /area/space) -"ujx" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) "ukt" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/green{ @@ -24531,8 +26599,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/showers) "ulZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/plating, @@ -24544,16 +26611,20 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"umt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +"umO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"umS" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/structure/railing, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/open, +/area/maintenance/cargo) "umZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24598,12 +26669,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"unL" = ( -/obj/structure/railing{ +"uny" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "unO" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -24614,6 +26692,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/space) +"uok" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "uoF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24641,6 +26723,17 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled, /area/space) +"uoU" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "upk" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24654,10 +26747,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 2; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/firedoor/glass{ dir = 1 }, @@ -24676,18 +26766,9 @@ }, /turf/simulated/open, /area/quartermaster/hallway) -"upx" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/space) -"upY" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) +"upG" = ( +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "uqo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24695,18 +26776,6 @@ }, /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) -"uqO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) "uqZ" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 @@ -24724,29 +26793,54 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"urK" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "usj" = ( /obj/effect/floor_decal/corner_techfloor_grid, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"usn" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"usF" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"utU" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/port) "uue" = ( /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"uuj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +"uur" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/wall/r_wall/prepainted, -/area/main_map/maintenance/deck_two/aft/starboard) -"uuF" = ( -/obj/machinery/atmospherics/component/unary/engine/biggest{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "uuJ" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/starboard) @@ -24756,12 +26850,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"uuW" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics) "uvc" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -24778,19 +26866,12 @@ }, /turf/simulated/open, /area/space) -"uvN" = ( -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ +"uvV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/turf/simulated/wall/r_wall, -/area/engineering/atmos) +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "uws" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24807,13 +26888,6 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) -"uwR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) "uwS" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -24836,6 +26910,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) +"uxd" = ( +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "uxB" = ( /obj/item/bedsheet/medical, /obj/structure/bed/padded, @@ -24856,20 +26933,34 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"uxJ" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/atmos, -/obj/machinery/atmospherics/pipe/simple/hidden/black{ +"uxL" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/railing{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "32-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) +"uyB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "uzM" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/floor_decal/industrial/warning{ @@ -24877,24 +26968,15 @@ }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) +"uzS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "uAp" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) -"uAy" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) "uBb" = ( /obj/machinery/door/firedoor/glass{ dir = 4 @@ -24937,10 +27019,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) -"uCD" = ( -/obj/structure/table/fancyblack, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/bar) +"uCJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "uDq" = ( /obj/structure/cable{ icon_state = "2-4" @@ -24955,18 +27040,25 @@ /obj/structure/railing, /turf/space, /area/space) +"uEc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "uEG" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/space) -"uEJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +"uEL" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/cargo) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "uEQ" = ( /obj/machinery/door/firedoor, /obj/structure/catwalk, @@ -24986,6 +27078,16 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/main_map/hallway/deck2) +"uEV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "uFd" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 @@ -25029,6 +27131,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/command) +"uGx" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "uHa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25058,31 +27169,63 @@ }, /turf/simulated/floor/reinforced, /area/space) +"uHf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"uHC" = ( +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) "uHH" = ( /obj/effect/floor_decal/industrial/danger{ dir = 9 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"uHU" = ( +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/storage) +"uIa" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) "uIg" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two) -"uIm" = ( -/obj/machinery/door/airlock/glass/engineering{ - name = "Engineering Hallway" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) -"uIA" = ( -/obj/structure/catwalk, -/obj/machinery/camera/network/outside{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +"uIn" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "uIR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -25104,6 +27247,9 @@ }, /turf/simulated/open, /area/security/brig) +"uJd" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/hallway) "uJn" = ( /obj/structure/railing, /obj/structure/railing{ @@ -25111,10 +27257,6 @@ }, /turf/simulated/open, /area/security/brig) -"uJw" = ( -/obj/machinery/door/airlock/maintenance/command, -/turf/simulated/floor/plating, -/area/space) "uJy" = ( /obj/structure/railing{ dir = 8 @@ -25137,15 +27279,21 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/plating, /area/main_map/hallway/deck2/starboard_fore) -"uKw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"uLe" = ( +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/structure/railing{ dir = 4 }, /turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +/area/main_map/maintenance/deck_two/starboard) +"uLw" = ( +/obj/structure/sign/deck2{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "uLA" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -25168,6 +27316,15 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_smes) +"uMl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "uMx" = ( /obj/structure/cable{ icon_state = "2-4" @@ -25210,14 +27367,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"uNG" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/research{ - name = "Robotics Lab"; - req_access = list(29,47) - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/robotics) "uNX" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -25250,6 +27399,45 @@ }, /turf/simulated/open, /area/main_map/hallway/deck2) +"uOu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"uOB" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"uOE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) +"uOT" = ( +/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/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "uQa" = ( /obj/structure/sink/kitchen{ dir = 8; @@ -25280,30 +27468,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"uSP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/engineering{ - name = "Engineering Hallway" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) -"uSU" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "uTM" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -25334,7 +27498,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ id = "hanger1b"; - layer = 3.3; name = "Hanger 1 B Shutters" }, /turf/simulated/floor/reinforced, @@ -25348,28 +27511,14 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"uVR" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/hallway) -"uWe" = ( -/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 +"uWc" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "uWs" = ( /obj/machinery/air_alarm{ dir = 8; @@ -25383,13 +27532,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"uXg" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) "uXj" = ( /obj/machinery/button/remote/blast_door{ id = "fighterbaytransportexit"; @@ -25421,12 +27563,15 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/storage) -"uXF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +"uXO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, -/area/space) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck2) "uXQ" = ( /obj/machinery/papershredder, /obj/structure/extinguisher_cabinet{ @@ -25492,12 +27637,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"vao" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "var" = ( /turf/simulated/floor/plating, /area/maintenance/substation/research) @@ -25507,36 +27646,40 @@ }, /turf/simulated/floor/tiled/techfloor, /area/bridge/bunker) -"vaM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +"vaE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"vaX" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"vbm" = ( -/obj/structure/railing{ - dir = 1 +/obj/machinery/air_alarm{ + pixel_y = 24 }, -/obj/structure/railing{ +/turf/simulated/floor/plating, +/area/maintenance/substation/security) +"vaG" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/robotics) -"vbs" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"vbk" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central3, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research/researchdivision) +"vbC" = ( +/obj/machinery/light/small{ + dir = 1 }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/starboard) "vbN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25574,26 +27717,10 @@ "vcx" = ( /turf/simulated/floor/plating, /area/maintenance/engineering) -"vdd" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_two/aft/starboard) -"vds" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/Hangar_bay/deck2) -"vdY" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/space) +"vdV" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "ved" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics) @@ -25615,11 +27742,18 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) +"vem" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/cargo) "vew" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -25667,23 +27801,6 @@ }, /turf/simulated/open, /area/security/brig) -"vfp" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/space/basic, -/area/space) "vfy" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/tiled/techfloor, @@ -25697,29 +27814,33 @@ }, /turf/simulated/floor/carpet, /area/medical/patient_wing) +"vfH" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "vgj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/security/observation) -"vgw" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/aft/starboard) -"vgx" = ( -/obj{ - name = "---Merge conflict marker---" +"vgs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-4" }, /obj/effect/floor_decal/rust, -/turf/space/basic, -/area/space) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"vgw" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "vgE" = ( /obj/structure/toilet{ pixel_y = 9 @@ -25740,12 +27861,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"vhr" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "vic" = ( /obj/item/modular_computer/console/preset/command{ dir = 8 @@ -25845,13 +27960,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"vlS" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) +"vly" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/overhang, +/area/space) "vmh" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -25859,16 +27971,23 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck2) -"vnE" = ( -/obj{ - name = "---Merge conflict marker---" +"vmM" = ( +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"vng" = ( +/obj/structure/table/rack/shelf, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 }, -/turf/space/basic, -/area/space) +/obj/item/storage/toolbox/electrical{ + pixel_y = -4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) "vnG" = ( /obj/machinery/light{ dir = 8 @@ -25905,6 +28024,13 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2) +"vph" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "vpR" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -25934,33 +28060,12 @@ }, /turf/simulated/open, /area/security/brig) -"vre" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" - }, -/turf/simulated/floor/plating, -/area/space) "vrk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"vrI" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/engineering/hallway) "vsd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloor{ @@ -25995,12 +28100,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/hydroponics) +"vtx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vtG" = ( /turf/simulated/wall/r_wall, /area/bridge/bunker) +"vtK" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "vuh" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -5 @@ -26041,18 +28158,13 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_two) -"vvd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"vuZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vvp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26063,9 +28175,13 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) +"vvz" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "vwk" = ( /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) @@ -26093,13 +28209,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"vwy" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/high/east_bump, -/turf/simulated/floor/plating, -/area/space) "vwz" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/brflowers, @@ -26108,6 +28217,12 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/patient_wing) +"vxb" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "vxl" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 @@ -26142,24 +28257,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"vyv" = ( -/obj/structure/closet/crate/trashcart, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "vyK" = ( /obj/machinery/atmospherics/component/binary/pump, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) -"vzd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/monotile, -/area/space) "vzj" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/substation/civilian) @@ -26232,29 +28333,16 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"vAK" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "vAU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rift/station/fighter_bay/maintenance) -"vBY" = ( -/obj/structure/catwalk, -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"vCf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "vCl" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -26304,10 +28392,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"vFn" = ( -/obj/machinery/atmospherics/pipe/tank, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "vFD" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -26334,6 +28418,13 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/cargo) +"vFR" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "vFV" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -26344,16 +28435,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"vFZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) "vGb" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, @@ -26378,10 +28459,12 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"vGw" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/medical/patient_wing) +"vGC" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "vGH" = ( /obj/structure/table/rack, /obj/item/stack/material/phoron{ @@ -26393,12 +28476,15 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"vGL" = ( +"vGS" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft) "vHa" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Service Substation Bypass" @@ -26424,32 +28510,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"vHM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"vHR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"vIf" = ( -/obj/structure/closet, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "vIh" = ( /obj/structure/handrail{ dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"vIm" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 4 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vIx" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 5 @@ -26465,6 +28538,16 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"vIU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "vJi" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/airless/ceiling, @@ -26479,6 +28562,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/hangar) +"vKm" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vKw" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, @@ -26550,6 +28636,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"vNc" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vNA" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -26593,37 +28683,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"vNN" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"vOl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) -"vOB" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward) -"vPn" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 10 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) +"vOZ" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "vPo" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -26638,6 +28702,17 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker/two) +"vPA" = ( +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) +"vPV" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "vQc" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -26690,6 +28765,34 @@ /obj/structure/bed/padded, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_d) +"vQM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"vRd" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"vRf" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "vRr" = ( /obj/machinery/air_alarm{ dir = 8; @@ -26705,6 +28808,13 @@ }, /turf/simulated/floor/plating, /area/medical/patient_b) +"vRW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "vSf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -26728,12 +28838,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) -"vTY" = ( -/obj/structure/cable/cyan{ - icon_state = "2-4" +"vTN" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/hallway) "vUt" = ( /obj/structure/railing, /obj/effect/floor_decal/spline/fancy/wood{ @@ -26753,12 +28864,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"vUC" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/skills, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/space) "vUV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -26806,6 +28911,16 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/reinforced/nitrogen, /area/engineering/atmos/gas_storage) +"vWD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) "vWN" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -26823,10 +28938,6 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/lab) -"vXA" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/rnd/robotics) "vXT" = ( /obj/machinery/air_sensor{ frequency = 1443; @@ -26835,15 +28946,6 @@ }, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) -"vXV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/atmospheric_substation/service) "vXZ" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -26857,22 +28959,19 @@ "vYd" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_two/forward) +"vYm" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/ai/foyer) +"vYy" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "vYK" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/barrestroom) -"vYS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"vZk" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) "vZo" = ( /obj/structure/cable{ icon_state = "1-8" @@ -26902,6 +29001,28 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_two) +"wau" = ( +/obj/structure/table/fancyblack, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"way" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "waB" = ( /obj/effect/spider/stickyweb/dark, /turf/simulated/floor/plating, @@ -26922,17 +29043,21 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos) +"waT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/hallway) "wbh" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/hydroponics) -"wbl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) "wbN" = ( /obj/structure/table/reinforced, /turf/simulated/floor/tiled/techfloor, @@ -26944,6 +29069,15 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/storage) +"wch" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "wcM" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ @@ -26953,6 +29087,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/crew_quarters/heads/cmo) +"wcZ" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "wdx" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor{ @@ -26989,6 +29129,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck2) +"weB" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "weG" = ( /obj/machinery/air_sensor{ frequency = 1441; @@ -27019,21 +29172,6 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/atmos/gas_storage) -"wgu" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"wgQ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 4 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/atmos/processing) "whq" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor{ @@ -27042,29 +29180,6 @@ /obj/machinery/door/window/brigdoor/westright, /turf/simulated/floor/plating, /area/security/brig) -"whG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) -"whH" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "whZ" = ( /obj/structure/table/rack{ dir = 8; @@ -27095,6 +29210,13 @@ }, /turf/simulated/floor/reinforced, /area/space) +"wip" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two/forward/starboard) "wiv" = ( /obj/structure/railing{ dir = 1 @@ -27134,6 +29256,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) +"wjn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/space) +"wjy" = ( +/turf/simulated/floor/plating, +/area/engineering/engine_eva) +"wjF" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) +"wjI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "wjP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -27152,6 +29299,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/port) +"wkd" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "wkn" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 8; @@ -27161,6 +29314,18 @@ }, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) +"wkt" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) +"wkI" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/space) "wkW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 5 @@ -27213,19 +29378,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck2) -"wmZ" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research/researchdivision) -"wnR" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "woy" = ( /obj/machinery/atmospherics/tvalve/digital/mirrored{ dir = 8 @@ -27259,9 +29411,13 @@ layer = 2.6 }, /obj/item/storage/toolbox/mechanical, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) +"woO" = ( +/obj/structure/janitorialcart, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck2) "woS" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 @@ -27289,18 +29445,29 @@ /obj/machinery/light, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) -"wqV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"wpK" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "portnacelle_blastdoor"; + opacity = 0; dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced/airless, +/area/engineering/atmos) +"wpT" = ( +/turf/simulated/wall, +/area/tether/surfacebase/security/lobby) +"wqf" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) +/turf/simulated/open, +/area/main_map/maintenance/deck_two/forward/port) "wqW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -27322,16 +29489,6 @@ }, /turf/simulated/floor/reinforced, /area/engineering/atmos/processing) -"wri" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "wrq" = ( /obj/machinery/button/remote/airlock{ id = "bathroomlock15"; @@ -27393,6 +29550,18 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"wtd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "wtk" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -27460,6 +29629,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"wuV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wvi" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on, +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "wvw" = ( /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, @@ -27470,11 +29661,26 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"wvD" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"wvI" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"wvJ" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) +"wvS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/space) "wvW" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -27490,25 +29696,21 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"wwj" = ( -/obj/machinery/camera/network/outside{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"wwm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"wwa" = ( +/obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/bed/chair{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck2) +/turf/simulated/floor/tiled/white, +/area/medical/medbay2) "wwF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27518,26 +29720,38 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/medbay2) +"wwM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "wwN" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"wxe" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) "wxj" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bunker) +"wxl" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) "wxo" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-5" }, @@ -27552,6 +29766,44 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft/port) +"wxB" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"wxJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/item/frame/noticeboard{ + pixel_y = 32 + }, +/obj/item/paper/pamphlet/violent_video_games, +/obj/item/paper/crumpled, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"wxM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/shield_gen) +"wxN" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/captain, +/turf/simulated/floor/carpet/blue, +/area/bridge/meeting_room) "wyl" = ( /obj/machinery/light{ dir = 4 @@ -27565,6 +29817,9 @@ /obj/machinery/vending/snack, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"wyn" = ( +/turf/simulated/floor/tiled/techfloor, +/area/ai/foyer) "wyz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -27589,12 +29844,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) -"wyS" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/space) "wzd" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/port_gen/pacman{ @@ -27617,12 +29866,22 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos) -"wzJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 9 +"wAO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/deck_two/forward/port) "wBB" = ( /obj/machinery/door/airlock/glass/engineeringatmos{ name = "Damage Control Storage" @@ -27630,6 +29889,11 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/storage) +"wBH" = ( +/obj/structure/railing, +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/plating, +/area/medical/medbay2) "wBN" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -27665,14 +29929,8 @@ }, /turf/simulated/floor/reinforced, /area/space) -"wEF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/rdoffice) "wEL" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27688,6 +29946,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/starboard) +"wER" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "wEX" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -27725,6 +29991,15 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_a) +"wGk" = ( +/obj/machinery/door/firedoor/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(24); + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) "wGn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -27745,6 +30020,41 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/civilian) +"wGw" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) +"wGH" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/atmos) +"wGP" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"wHc" = ( +/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 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "wHw" = ( /obj/machinery/door/airlock/engineering{ name = "Science Substation"; @@ -27756,14 +30066,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/research) -"wHz" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "wHB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -27776,25 +30078,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) -"wHJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) -"wHS" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "wHW" = ( /obj/machinery/mech_recharger, /obj/machinery/atmospherics/portables_connector, @@ -27841,10 +30124,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"wJc" = ( -/obj/structure/stairs/spawner/west, -/turf/space, -/area/main_map/hallway/deck2/stairs) +"wJd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) +"wJo" = ( +/obj/structure/girder/displaced, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "wJE" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/glass/reinforced, @@ -27867,19 +30162,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"wKl" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "hop_office_desk"; - layer = 3.1; - name = "HoP's Shutters" +"wKk" = ( +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_two/starboard) "wKT" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -27911,31 +30200,12 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) -"wMZ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"wNj" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"wNe" = ( +/obj/structure/railing/grey{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/rnd/research/researchdivision) "wNo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -27949,34 +30219,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck2/stairs) -"wNw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/engineering/hallway) -"wNx" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"wNB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "wNI" = ( /obj/structure/cable{ icon_state = "0-8" @@ -28044,6 +30286,13 @@ }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) +"wPE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "wPJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -28082,6 +30331,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) +"wQL" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) "wQZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -28094,14 +30349,25 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) -"wRy" = ( -/obj/structure/cable{ - icon_state = "1-2" +"wRd" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/hangar) +"wRs" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "hop_office_desk"; + layer = 3.1; + name = "HoP's Shutters" + }, +/turf/simulated/floor/plating, +/area/bridge/hop_office) "wRF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28117,6 +30383,19 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/pool/changing_room) +"wSD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "wSH" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -28137,6 +30416,26 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/security) +"wSV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wSY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2) "wTg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -28153,25 +30452,50 @@ "wTx" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) -"wUD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/turf/simulated/floor/plating, -/area/space) -"wUU" = ( +"wUu" = ( +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(10); + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) +"wUv" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) +"wUX" = ( +/obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/port) -"wVi" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wVB" = ( +/obj/landmark{ + name = "lightsout" }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/obj/effect/floor_decal/steeldecal/steel_decals_central3, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research/researchdivision) "wVC" = ( /turf/simulated/floor/plating, /area/engineering/hallway) +"wVD" = ( +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/generator{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/space) "wVH" = ( /obj/machinery/light/no_nightshift{ dir = 1 @@ -28184,18 +30508,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/main_map/maintenance/deck_two/aft/starboard) -"wVX" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "wWg" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor, @@ -28221,12 +30533,13 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"wXk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 +"wWD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/floor/tiled/steel_ridged, +/area/quartermaster/foyer) "wXn" = ( /obj/machinery/door/airlock/glass_external, /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -28235,26 +30548,6 @@ /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"wXN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"wXO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) "wXY" = ( /obj/machinery/air_alarm{ dir = 1; @@ -28269,15 +30562,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"wYf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay2) "wYV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -28288,6 +30572,22 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) +"wZD" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"wZP" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "xak" = ( /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28300,18 +30600,15 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_b) -"xbe" = ( -/obj/mecha/combat/fighter/pinnace/loaded{ - dir = 1 - }, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) +"xbc" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "xbl" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 4 @@ -28344,24 +30641,45 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"xce" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "xcp" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/pool/changing_room) -"xeg" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"xdj" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 8 }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two) +"xdH" = ( /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc/high/east_mount, /turf/simulated/floor/plating, -/area/space) -"xev" = ( -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_two/aft/starboard) +/area/maintenance/engineering/upper) +"xdU" = ( +/obj/machinery/door/airlock{ + name = "Auxiliary Janitorial Closet"; + req_access = list(26) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) +"xeG" = ( +/obj/structure/girder/displaced, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) "xeW" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -28374,12 +30692,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/research) -"xgk" = ( -/obj/structure/sign/deck2{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "xgn" = ( /obj/structure/curtain/open/shower, /obj/structure/window/reinforced{ @@ -28405,12 +30717,13 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/crew_quarters/showers) -"xgN" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 +"xgx" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "rd_office" }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +/turf/simulated/open, +/area/rnd/research/researchdivision) "xgP" = ( /obj/structure/fans/tiny, /obj/machinery/door/blast/regular{ @@ -28420,6 +30733,10 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) +"xhs" = ( +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "xhx" = ( /obj/structure/closet/secure_closet/CMO, /obj/item/cmo_disk_holder, @@ -28434,8 +30751,7 @@ /obj/item/clothing/mask/surgical, /obj/item/storage/secure/briefcase/ml3m_pack_cmo, /obj/item/clothing/accessory/poncho/roles/cloak/cmo, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -28447,26 +30763,6 @@ /obj/item/retail_scanner/medical, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) -"xhy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft/starboard) -"xhH" = ( -/obj/structure/cable{ - icon_state = "5-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck2) "xhI" = ( /obj/machinery/button/windowtint{ id = "booth_1"; @@ -28506,15 +30802,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/hallway) -"xjy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"xju" = ( +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"xjH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two/forward/starboard) +/area/space) "xjK" = ( /turf/simulated/floor/carpet, /area/medical/patient_wing) @@ -28533,6 +30834,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/flight_deck) +"xle" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "xlg" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 8 @@ -28572,6 +30878,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/open, /area/security/brig) +"xlV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research/researchdivision) "xmh" = ( /obj/structure/railing{ dir = 1 @@ -28598,17 +30915,6 @@ "xmY" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"xna" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "xnp" = ( /obj/structure/window/reinforced{ dir = 8 @@ -28618,16 +30924,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"xnG" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) +"xnP" = ( +/obj/landmark/spawnpoint/job/chief_engineer, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/hallway) "xob" = ( /obj/machinery/camera/network/research{ dir = 8 @@ -28646,6 +30946,15 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"xok" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "xoo" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 @@ -28655,6 +30964,20 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) +"xor" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/crew_quarters/bar) "xos" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger{ dir = 8 @@ -28739,12 +31062,20 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) -"xrg" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +"xqa" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/deck_two/forward) +"xre" = ( +/obj/structure/closet{ + desc = "Dents and old flaky paint blanket this old storage unit."; + name = "old locker" }, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/obj/item/clothing/suit/storage/toggle/labcoat, +/obj/item/clothing/suit/storage/toggle/labcoat, +/obj/item/clothing/suit/storage/toggle/labcoat, +/obj/item/clothing/suit/storage/toggle/labcoat, +/turf/simulated/floor/tiled/white, +/area/main_map/maintenance/deck_two/starboard) "xrk" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/steel_grid, @@ -28774,15 +31105,33 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) -"xtB" = ( -/obj/structure/cable{ - icon_state = "4-8" +"xsu" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/aft) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) +"xsM" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment, +/obj/map_helper/network_builder/power_cable/red/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck2) +"xtc" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward/starboard) "xtI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -28790,6 +31139,16 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/medical/patient_c) +"xtN" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "xul" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -28816,19 +31175,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) -"xuZ" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/turf/space/basic, -/area/space) "xvb" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing, @@ -28854,11 +31200,23 @@ /obj/effect/spider/stickyweb, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_two/forward/port) +"xwn" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "xws" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/lime/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -28871,13 +31229,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/aft) -"xxt" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research/researchdivision) "xxC" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -28898,21 +31249,11 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) -"xyr" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck2) "xyA" = ( /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/gas_storage) @@ -28939,13 +31280,6 @@ "xyQ" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) -"xyS" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_two) "xyV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -28956,6 +31290,25 @@ /obj/structure/railing, /turf/simulated/open, /area/crew_quarters/recreation_area_hallway) +"xzS" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) +"xAg" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "xAn" = ( /obj/item/storage/toolbox/emergency, /obj/item/storage/toolbox/emergency, @@ -28963,8 +31316,16 @@ /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/reinforced, /area/main_map/maintenance/panic_bunker) -"xAr" = ( -/turf/simulated/floor/tiled/monotile, +"xAR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, /area/space) "xAU" = ( /obj/structure/table/reinforced, @@ -28981,32 +31342,46 @@ /obj/structure/railing, /turf/simulated/open, /area/rnd/rdoffice) -"xCL" = ( -/obj/machinery/door/firedoor{ - dir = 8 +"xBf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/component/binary/pump{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/hatch, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/engineering/engine_gas) +/area/main_map/maintenance/atmospheric_substation/security) +"xCh" = ( +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Head of Personnel's Office" + }, +/turf/simulated/floor/wood, +/area/bridge/hop_office) +"xCj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/security) +"xCl" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "xDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/wood, /area/rift/station/fighter_bay) -"xDN" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "xDQ" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -29019,6 +31394,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) +"xDT" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"xEu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) "xEG" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -29026,12 +31414,6 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/patient_wing) -"xEQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "xEX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -29041,6 +31423,18 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_b) +"xFb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck2/stairs) "xGo" = ( /turf/simulated/wall/r_wall/prepainted, /area/main_map/maintenance/deck_two/aft/starboard) @@ -29057,10 +31451,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck2/port_fore) -"xHy" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/reinforced/airless, -/area/space) "xHC" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/light/no_nightshift, @@ -29078,6 +31468,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"xHX" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) "xIk" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 @@ -29093,11 +31493,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) -"xJo" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/medical/medbay2) "xJE" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -29113,6 +31508,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_two/forward/port) +"xKC" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_two) "xKM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29129,21 +31530,6 @@ }, /turf/simulated/floor/reinforced, /area/space) -"xLA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/space) "xLF" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -29155,7 +31541,7 @@ dir = 1 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/crew_quarters/fitness) "xMe" = ( @@ -29166,22 +31552,6 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) -"xMr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/forward/port) -"xMu" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/engineering/hallway) "xMv" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay2) @@ -29194,13 +31564,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"xNq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "xNW" = ( /obj/structure/closet/crate/corporate/nanotrasen, /turf/simulated/floor/tiled/techmaint, @@ -29220,43 +31583,10 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/engineering/engine_eva) -"xOu" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for shutters."; - id = "hop_office_desk"; - layer = 3.3; - name = "Desk Privacy Shutter"; - pixel_x = 6; - pixel_y = -29 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/space) -"xOH" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/super/critical/north_bump, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) -"xPj" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/space/basic, -/area/space) +"xOQ" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "xPl" = ( /obj/structure/closet/secure_closet/freezer/fridge{ anchored = 1 @@ -29288,6 +31618,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/gas_storage) +"xPH" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "AI Upload Access"; + req_access = list(16); + req_one_access = list() + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/main_map/maintenance/atmospheric_substation/ai) "xPN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29311,20 +31655,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/hallway) -"xQB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck2) +"xQx" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/port) "xQE" = ( /turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/main_map/maintenance/atmospheric_substation/medical) -"xQM" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "xQO" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 4; @@ -29382,6 +31721,18 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rift/station/fighter_bay/hangar) +"xSx" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/cargo) +"xSD" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) "xSH" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -29390,12 +31741,19 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) +"xSM" = ( +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/security/lobby) "xST" = ( /obj/structure/cable/cyan{ icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"xTR" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/rdoffice) "xUs" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 10 @@ -29453,37 +31811,39 @@ }, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"xWA" = ( -/obj{ - name = "---Merge conflict marker---" +"xWg" = ( +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward) +"xWj" = ( /obj/machinery/air_alarm{ - dir = 8; - pixel_x = 25 + pixel_y = 24 }, -/obj/structure/catwalk, -/turf/space/basic, -/area/space) -"xWO" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/closet/crate/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/medical/pillbottle, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/starboard) +"xWZ" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, +/obj/landmark/spawnpoint/job/station_engineer, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) -"xXi" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/red, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_ridged, /area/engineering/hallway) "xXl" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -29532,6 +31892,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"xYx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/forward/starboard) "xYZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -29570,6 +31936,14 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, /area/quartermaster/qm) +"xZI" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + req_one_access = list(10); + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/hallway) "xZK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -29579,12 +31953,6 @@ "yao" = ( /turf/simulated/floor/plating, /area/space) -"yau" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/engineering/engine_gas) "yaA" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -29600,6 +31968,12 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) +"yaL" = ( +/obj/machinery/atmospherics/component/binary/pump, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/atmos) "yaZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29619,14 +31993,27 @@ }, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/maintenance) -"ycI" = ( +"ybY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-5" +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/forward) +"ycQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/rnd/research/researchdivision) +/area/main_map/maintenance/deck_two) "ycY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29656,10 +32043,25 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/engineering/engine_eva) +"ydQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two/aft/starboard) "ydV" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) +"yei" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "yev" = ( /obj/structure/sign/deck/second{ pixel_x = 32 @@ -29675,30 +32077,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rift/station/fighter_bay/transport_tunnel) -"yeQ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two) "yeW" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/atmos, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/gas_storage) -"yfj" = ( -/obj/structure/sign/deck2{ - pixel_y = -32 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "yfF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, @@ -29724,17 +32108,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) -"yfZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) "ygP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/ai) +"yhd" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/high/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2/b) "yhH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29745,6 +32130,14 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/gas_storage) +"yih" = ( +/obj/structure/lattice, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_two/aft/starboard) "yiy" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/blast/regular{ @@ -29776,21 +32169,26 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"yjG" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engineering/engine_gas) +"yjA" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/atmos/gas_storage) "yjM" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) +"yjY" = ( +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_two) "ykb" = ( /turf/simulated/wall/prepainted/civilian, /area/hydroponics) @@ -29809,24 +32207,45 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) +"ykn" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"yku" = ( +/obj/machinery/door/airlock{ + name = "Auxiliary Janitorial Closet"; + req_access = list(26) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck2/stairs) "yky" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_hallway) -"ymh" = ( -/obj/structure/cable{ +"ylP" = ( +/obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_two/starboard) +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_two/aft/starboard) (1,1,1) = {" hts @@ -30477,80 +32896,80 @@ hts hts hts hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +hts +hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +pEs +hdg +hdg +dug +bYZ +dKJ +oyX +baX +knr +vRW +hdg +hdg +bxj +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts hts hts hts @@ -30693,19 +33112,19 @@ qVH qVH qVH qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +kMo +vtx +nQp +lsl +jaY +gPL +wvS +nOA +reW +vaG +ptq +aMn +kMo hts hts hts @@ -30887,19 +33306,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +vNc +qZw +hHu +snb +aHu +yao +hJW +yao +yao +cHI +hit +aMn +kMo qVH qVH hts @@ -31081,19 +33500,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +aIh +rKx +kkZ +vQM +aHu +yao +hJW +yao +yao +cHI +ptq +paH +tYk qVH qVH hts @@ -31275,7 +33694,21 @@ qVH qVH qVH qVH -hts +jxT +rBL +hcp +xAR +hVQ +dHw +vph +jKn +auF +tbs +lAT +hit +wkI +qVH +qVH hts qVH qVH @@ -31290,7 +33723,6 @@ qVH qVH qVH qVH -hts qVH qVH qVH @@ -31302,21 +33734,8 @@ qVH qVH qVH qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +qVH +qVH hts hts hts @@ -31459,19 +33878,6 @@ hts qVH qVH qVH -ihZ -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -qVH qVH qVH qVH @@ -31482,6 +33888,19 @@ qVH qVH qVH qVH +vuZ +lrF +nQp +jfv +oOS +yao +hJW +yao +pDU +tbs +lAT +ptq +vNc qVH qVH hts @@ -31663,19 +34082,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +kMo +jJz +wVD +ihp +yao +yao +hJW +yao +pDU +tbs +jJz +jJz +kMo qVH qVH hts @@ -31857,19 +34276,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +izr +msz +kZY +gwN +dHw +dHw +ffL +dHw +tWm +oCQ +trL +nrc +jiV qVH qVH hts @@ -32051,19 +34470,19 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +dpZ +oCD +dpZ +wjn +ttc +ttc +hQe +xjH +dWF +hDn +aGn +qau +dmT qVH qVH hts @@ -32090,7 +34509,7 @@ qVH qVH qVH qVH -vgx +qVH qVH qVH qVH @@ -32245,28 +34664,28 @@ qVH qVH qVH qVH -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH +hbm +nUJ +jty +jty +jty +jty +jty +jty +nGy +hdb +nIz +hdb +rDw qVH qVH -qVH -qVH -qVH -qVH -qVH -hts hts hts hts hts -hts -qfO +qVH +qVH +qVH qVH qVH qVH @@ -32422,7 +34841,7 @@ qVH hts hts hts -frk +qGi hts hts hts @@ -32439,27 +34858,27 @@ qVH qVH hts hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +hDs +baO +vRd +rYG +yao +sdd +htC +htC +kmq +oLd +fEE +lrM +lrM qVH qVH hts hts hts hts -hts -hts +qVH +qVH qVH qVH qVH @@ -32512,7 +34931,7 @@ qVH qVH qVH hts -frk +qGi hts hts hts @@ -32616,7 +35035,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -32633,19 +35052,19 @@ qVH qVH hts hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +qYn +hrq +kuH +yao +yao +pDU +yao +oOl +reW +tVE +eBN +qqL +eCo qVH qVH hts @@ -32706,7 +35125,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -32810,7 +35229,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -32827,19 +35246,19 @@ qVH qVH hts hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH +syJ +bWv +dQE +aEr +hhR +qsb +eWy +hZQ +sjm +iwx +bNv +wjF +gWx qVH qVH hts @@ -32900,7 +35319,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33004,7 +35423,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -33094,7 +35513,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33198,7 +35617,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -33236,21 +35655,21 @@ hts pDJ caB caB -hpp -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -hpp +trl +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +trl pDJ pDJ pDJ @@ -33288,7 +35707,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33392,7 +35811,7 @@ qVH hts hts hts -kLI +vKm hts hts hts @@ -33428,25 +35847,25 @@ hts hts hts mRB -sqV -lTs +kBS +vIm wvw -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm wvw -kLI -kLI +vKm +vKm mRB hts hts @@ -33482,7 +35901,7 @@ qVH qVH qVH hts -kLI +vKm hts hts hts @@ -33586,7 +36005,7 @@ hts hts hts hts -kLI +vKm hts hts hts @@ -33676,7 +36095,7 @@ hts hts hts hts -kLI +vKm hts hts hts @@ -33779,9 +36198,9 @@ hts hts hts hts -kLI -kLI -kLI +mRB +mRB +mRB hts hts hts @@ -33869,9 +36288,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -33973,9 +36392,9 @@ hts hts hts hts -kLI -kLI -kLI +mRB +yao +mRB hts hts hts @@ -34063,9 +36482,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -34166,12 +36585,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -hts +mRB +mRB +yao +mRB +mRB +mRB hts hts hts @@ -34256,11 +36675,11 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -34358,15 +36777,15 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +mRB +mRB +yao +yao +yao +yao +mRB +mRB hts hts hts @@ -34448,15 +36867,15 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -34551,8 +36970,8 @@ hts hts hts hts -kLI -kLI +vKm +oXy oXy oXy oXy @@ -34560,8 +36979,8 @@ oXy oXy oXy oXy -kLI -kLI +mRB +vKm hts hts hts @@ -34598,13 +37017,13 @@ syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +kKF +kKF +kKF +kKF +kKF noL noL noL @@ -34641,17 +37060,17 @@ hts hts hts hts -kLI -kLI -rkw +vKm +vKm +hFr xGo hfU hfU hfU hfU hfU -kLI -kLI +vKm +vKm hts hts hts @@ -34743,21 +37162,21 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm oXy -dbv -dbv +ePY +ePY +ePY ePY ePY ePY oXy oXy -kLI -kLI -kLI +vKm +vKm +vKm hts hts gCv @@ -34781,24 +37200,24 @@ iLu oqD sGG kLd -efa -jXq -jXq -jXq -iLO +fPv +fPv +fPv +fPv +fPv fPv gQA syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +kKF +kKF +kKF +kKF +kKF noL noL noL @@ -34827,27 +37246,27 @@ mRB mRB mRB wvw -hts -hts -gCv -hts -hts -gCv -vdY -clM -clM -smB -smB -xGo +vKm +vKm +rzJ +vKm +vKm +rzJ +bvd +rDc +rDc +rDc +rDc +bvd nus nus aZS aZS hfU -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -34935,29 +37354,29 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm oXy ePY ePY +dak +dak +dak ePY -ePY -ePY -ePY +cXA oXy oXy -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm xph dCI dCI @@ -34975,24 +37394,24 @@ gpN gpN qKz lDd -iKv +kMJ lBS wlk xQO -rQb +qLg ilF waS syq noL noL noL -noL -noL +kKF +kKF noL iIR noL -noL -noL +kKF +kKF noL noL noL @@ -35021,29 +37440,29 @@ rff qWl qWl mRB -kLI -kLI -kLI -kLI -kLI -kLI -vdY -xrg -pWd -pWd -fPt -xGo +vKm +vKm +vKm +vKm +vKm +vKm +bvd +pTm +pTm +pTm +sAw +bvd nus nus ncT rvh hfU -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -35127,37 +37546,37 @@ hts hts hts hts -kLI -arg -kLI -kLI -kLI -kLI -kLI -kLI +vKm +rPB +vKm +vKm +vKm +vKm +vKm oXy ePY ePY -ePY -ePY -ePY -ePY -ePY +cVE +cVE +cVE +cQp +cXA +cXA oXy oXy -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm cRq cRq cRq cRq kao -kao +rMO kao eFZ tUW @@ -35169,24 +37588,24 @@ xul gpN lNG gpN -rQb +qLg dXk mYP ddw -cXM -fhR +aNn +oIy jVG syq noL noL noL +kKF +kKF noL noL noL -noL -noL -noL -noL +kKF +kKF noL noL noL @@ -35215,31 +37634,31 @@ rff rff rff mRB -kLI -kLI -kLI -kLI -kLI -kLI -vdY -esP -esP -esP -esP -xGo +vKm +vKm +vKm +vKm +vKm +vKm +bvd +fPT +fPT +fPT +fPT +bvd nus nus xvv rvh hfU -kLI -kLI -kLI -kLI -kLI -kLI -arg -kLI +vKm +vKm +vKm +vKm +vKm +vKm +rPB +vKm hts hts hts @@ -35321,14 +37740,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +oXy oXy oXy iuS @@ -35350,7 +37769,7 @@ cRq qBx qBx cRq -gun +hyG uSB aUT bTC @@ -35363,24 +37782,24 @@ roN pDF lNG iXE -rQb +qLg wzE dCk szC -rQb -hPD +qLg +kUZ waS syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +pwr +pwr +pwr +kKF +kKF noL noL noL @@ -35415,25 +37834,25 @@ hfU hfU hfU xGo -xGo -esP -esP -esP -dPW -xGo -xGo -xGo +bvd +fPT +fPT +fPT +sij +bvd +bvd +bvd hfU ujj hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -35515,14 +37934,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oXy cVE cVE @@ -35536,15 +37955,15 @@ cVE cVE cVE cVE -hrE -cRq +cVE +bbH lve rlo lve kEj mTI -cRq -pHj +oRM +bTC bTC uOj mqg @@ -35557,24 +37976,24 @@ hWE iaC eEb iaC -mcO +jUH mHg aZs szC -rQb -hPD +qLg +cjM waS syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +erC +gTG +kwG +kKF +kKF noL noL noL @@ -35608,26 +38027,26 @@ shT shT shT shT -xGo -esP -esP -esP -esP -bFQ -aYx -xbe -xGo shT -aZS +bvd +fPT +fPT +fPT +htd +nby +kbE +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -35709,14 +38128,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -wwj +ofc +mym +eoW +vKm +vKm +vKm +vKm +lLe oXy lrZ lrZ @@ -35737,13 +38156,13 @@ lve lve gnl fVM -rnN +tGm pwZ pwZ ehX aHa dDV -pAg +fWj fPv dKT oqD @@ -35751,24 +38170,24 @@ vyK woS kxi gxE -iKv +kMJ lBS mYP szC -rQb +qLg ilF waS syq noL noL noL -noL -noL -noL -noL -noL -noL -noL +kKF +kKF +iCV +dQo +iCV +kKF +kKF noL noL noL @@ -35802,26 +38221,26 @@ shT shT shT shT -xGo -esP -esP -esP -esP -bFQ -aZS -aZS -xGo shT -aZS +bvd +fPT +fPT +fPT +htd +tHq +tHq +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -35901,16 +38320,16 @@ hts hts hts hts -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc bUF pSb @@ -35924,7 +38343,7 @@ ryc ryc ryc lrZ -cVE +hrE cRq lve ksF @@ -35935,21 +38354,21 @@ cRq gcG tFZ nXu -wgQ +olX gvq skY -tDB +oMs ajq dpw dpw dhN dhN fsp -efa -jXq -jXq -cGZ -uvN +fPv +nlD +nlD +wpK +fPv fPv tjj syq @@ -35959,7 +38378,7 @@ noL noL noL noL -noL +jIa noL noL noL @@ -35996,28 +38415,28 @@ shT shT shT shT -xGo -esP -esP -esP -esP -nOs -hIq -hIq -xGo shT -aZS +bvd +fPT +fPT +fPT +ugP +oSI +oSI +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm hts hts hts @@ -36093,18 +38512,18 @@ hts hts hts hts -kLI -arg -arg -arg -aPO -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +rPB +rPB +rPB +dub +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc icy nEZ @@ -36130,9 +38549,9 @@ auf mmI syd lVX -flT +hxr nXu -abD +yaL crM vyK gRY @@ -36153,7 +38572,7 @@ noL noL noL noL -noL +jIa noL noL noL @@ -36190,30 +38609,30 @@ shT shT shT shT -xGo -esP -esP -esP -esP -bFQ -aYx -xbe -xGo shT -aZS +bvd +daV +fPT +fPT +htd +nby +kbE +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -rAX -arg -arg -arg -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +jDW +rPB +rPB +rPB +vKm hts hts hts @@ -36286,21 +38705,21 @@ hts hts hts hts -kLI -tAx -gZu -gZu -gZu -gZu -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +ofc +mym +mym +mym +mym +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc -mHn +kkh drT drT drT @@ -36346,9 +38765,9 @@ jne jne jne omU -xCL -hvD -lBV +qin +moR +tvX omU jne jne @@ -36378,37 +38797,37 @@ nbh nbh nbh rff -shT -shT -shT -xGo -xGo -xGo -xGo -vdd -esP -esP -esP -bFQ -aZS -aZS xGo +kRb +bvd +bvd +bvd +bvd +bvd +lHW +fPT +fPT +fPT +htd +tHq +tHq +bvd +shT shT -aZS hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -kLI -kLI -kLI -kLI -xQM -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +vKm +vKm +vKm +vKm +eoW +vKm hts hts hts @@ -36480,19 +38899,19 @@ hts hts hts hts -kLI -tAx -kLI +vKm +ofc +vKm mRB mRB mRB -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -36535,19 +38954,19 @@ fBh eJd hNA omU -rUM -rbI -rbI -lbA -yfZ -tfY -hZL -ecQ -dBM -hxh -rbI -rbI -iSI +nAg +nAg +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU rff rff @@ -36574,35 +38993,35 @@ nbh rff shT shT +bvd +bvd +bNB +nhc +wxB +nUU +fPT +fPT +fPT +ugP +oSI +oSI +bvd shT -xGo -jsE -kwJ -rhD -qvm -esP -esP -esP -nOs -hIq -hIq -xGo shT -aZS hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym mRB mRB mRB -kLI -xQM -kLI +vKm +eoW +vKm hts hts hts @@ -36674,19 +39093,19 @@ hts hts hts hts -frk -tAx -xHy +qGi +ofc +qZR mRB mRB mRB -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -36729,19 +39148,19 @@ enT xbl hNA omU -pAl -xEQ -kRZ -tEJ -jCF -bvR -tWx -xgN -eim -myX -kts -vNN -pAl +nAg +nAg +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU aTO gyB @@ -36768,35 +39187,35 @@ nbh rff shT shT +cCP +wxB +wxB +wxB +wxB +nUU +fPT +fPT +fPT +htd +nby +kbE +bvd shT -xGo -rhD -rhD -rhD -qvm -esP -esP -esP -bFQ -aYx -xbe -xGo shT -aZS hfU -ddu -kLI -kLI -kLI -kLI -tAx -gZu +sBk +vKm +vKm +vKm +vKm +ofc +mym mRB mRB mRB -xHy -xQM -frk +qZR +eoW +qGi hts hts hts @@ -36868,19 +39287,19 @@ hts hts hts hts -kLI -wwj +vKm +lLe mRB mRB mRB mRB -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -36922,20 +39341,20 @@ yiN omJ omJ iuP -tFq -dvx -rrh -hfT -ids -isE -jNh -vbs nAg nAg -kyt -fPr -vNN -pAl +nAg +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU psS dth @@ -36960,37 +39379,37 @@ nbh nbh nbh rff -rnV -wvD -rnV -uuj -qNn -rhD -rhD -qvm -esP -esP -esP -bFQ -aZS -aZS -xGo shT -aZS +shT +smF +mQJ +wxB +wxB +wxB +nUU +fPT +fPT +fPT +htd +tHq +tHq +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym mRB mRB mRB mRB -ddu -kLI +sBk +vKm hts hts hts @@ -37062,19 +39481,19 @@ hts hts hts hts -kLI -kLI -kLI -tAx +vKm +vKm +vKm +ofc bRO bRO -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37112,24 +39531,24 @@ dpw gNi uuP xIk -fPv -fPv -fPv -tjj +xmY +xmY +pmC +hNA omU -eDq -pYr -qJE -sWo -pJy -vbs -vbs nAg nAg -kyt -kts -cYe -eqp +nAg +nAg +nAg +qLW +qLW +qLW +nAg +nAg +nAg +nAg +nAg omU tJA cPJ @@ -37155,36 +39574,36 @@ nbh nbh rff shT -aZS -iqj -xGo -rhD -rhD -rhD -qvm -esP -esP -esP -cqf -pWd -pWd -xGo shT -aZS +bvd +vng +wxB +wxB +wxB +nUU +fPT +fPT +fPT +lgF +pTm +pTm +bvd +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym bRO bRO -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -37257,18 +39676,18 @@ hts hts hts hts -kLI -kLI -kLI -cIh -lwH -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +pAq +czO +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37305,25 +39724,25 @@ sUy xhN tAC pCT -ndd -fPv -ujx -wxe -jOK +pCT +pCT +pCT +pCT +iDb mTs -izw -yau -eaA -pBk -mNs -nVV -nVV -cMd -bko -ncv -aZv -fPr -wgu +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc mTs rff rff @@ -37349,35 +39768,35 @@ jkA jkA jkA shT -aZS -aZS -xGo -qsE -rhD -rhD -qvm -esP -esP -esP -esP -esP -esP -qst shT -aZS +bvd +bvd +rog +wxB +wxB +nUU +fPT +fPT +fPT +fPT +fPT +fPT +sGD +shT +shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -37453,16 +39872,16 @@ hts hts hts hts -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37495,35 +39914,35 @@ rOQ xDQ tuY auf -uxJ -apO +bDR +wGk fPv +wGH +cfB +xmY +drO +xmY xmY -sOR -kmO -wUD -iFi -jbW omU -gUL -leE -kRZ -wXN -eLG -ecD -yjG -gMD -nMW -ncv -aZv -kts -dvx +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc omU jAi +jQG +jQG jAi jAi -jAi -dzO qhn jAi jAi @@ -37544,32 +39963,32 @@ rLB jkA hwK shT -aZS -xGo -efP -rhD -rhD -xGo shT +bvd +sNL +wRd +hPe +bvd +ish +ish +bvd +fPT +fPT +qyN +bvd shT -xGo -xev -xev -xev -xGo shT -aZS hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm hts hts hts @@ -37649,14 +40068,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37690,34 +40109,34 @@ eec tuY auf xif -gWV +isz pjR pjR pjR pjR pjR pjR -vrI +iFH +omU +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc omU -pAl -fZM -xDN -xnG -enP -cel -tKq -nsB -nMW -ncv -fZM -fZM -pAl -bgx -dzO -dzO -dzO -dzO -dzO +jAi +jAi +jQG +jQG +jAi qhn jAi jAi @@ -37738,30 +40157,30 @@ lue jkA ovL shT -aZS -xGo -oEw -rhD -rhD -xGo -fhh -fhh -xGo -xev -xev -xev -xGo shT -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +bvd +pDC +mAe +wxB +bvd +mXP +mXP +bvd +qyN +qyN +qyN +bvd +shT +shT +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -37843,14 +40262,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -37866,8 +40285,8 @@ bFb lrZ tsq oXy -dLj -dLj +buy +buy auf mhV dxM @@ -37893,25 +40312,25 @@ jQI jQI iKN omU -kYR -cjl -iHp -msY -obo -cuj -lYe -rqz -pvT -cjy -iAz -lTE -rGD +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc omU -kJt +cbf kJt kJt jld -dzO +jAi qhn jAi jAi @@ -37932,30 +40351,30 @@ sJz tHF shT shT -aZS -xGo -xGo -nZz -xGo -xGo -xGo -xGo -xGo -xGo -xGo -xGo -xGo shT -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +bvd +bvd +bZe +bvd +bvd +bvd +bvd +bvd +bvd +bvd +bvd +bvd +shT +shT +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -38038,13 +40457,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm qwl drT drT @@ -38059,7 +40478,7 @@ drT bFb lrZ tsq -dNh +eMX cVE cVE pan @@ -38076,36 +40495,36 @@ pnB qFk lOr dkK -tgk +lgP kJz xlx mJP -bfR +sGM mJP lGK nAL nAL nAL -mXz -iCx -tyE -iCx -iCx -iCx -wHz -whG -kgy -vaM -wri -nEi -rpC -kXX +iFd +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW vKx hBq iVk mNW jld -dzO +jQG rff rff rff @@ -38126,11 +40545,12 @@ jkA jkA pXJ jlk -aZS shT shT shT +kjL shT +rnV shT shT shT @@ -38140,15 +40560,14 @@ shT shT shT shT -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38232,13 +40651,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm ryc pSb pSb @@ -38270,36 +40689,36 @@ llj eNA gBO nrW -ePh +yjA kVy rHv ixz -iQX +lRt ixz cKk wVC wVC wVC -ply -vTY -dEW -dzY -dzY -dzY -dzY -dzY -dzY -ssU -lGc -cem -lGc -fhP +ncI +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW +qLW wJT bYT lfF mNW jld -dzO +jQG rff nbh nbh @@ -38319,30 +40738,30 @@ jkA kbd aJt wHw -soX -lqW -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -aZS -hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +xAg +hQA +oON +oON +pqj +shT +xce +shT +shT +shT +shT +shT +shT +shT +shT +shT +tIM +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38412,7 +40831,7 @@ qVH qVH qVH qVH -hUP +qVH qVH qVH qVH @@ -38426,13 +40845,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -wwj +mym +eoW +vKm +vKm +vKm +vKm +lLe oXy peC cVE @@ -38475,25 +40894,25 @@ oXm paQ pHd omU -xOH -gAE -sjh -jKM -nAg -wXk -oIq -oIq -wzJ -hrw -dmG -mfL -mfL +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc kJt xST hzI bxr jld -dzO +jAi rff nbh foH @@ -38513,9 +40932,9 @@ jkA lRb abe fln -ngr -kdF -shT +uxL +jsw +xSD aCf aCf aCf @@ -38525,18 +40944,18 @@ aCf aCf aCf aCf -shT -shT -shT -shT +rnV +uIn +rnV +rnV hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38609,7 +41028,7 @@ qVH qVH qVH qVH -vfp +qVH qVH qVH qVH @@ -38620,13 +41039,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE lBh @@ -38669,25 +41088,25 @@ nrV hwP cvs hwP -ajf -lfj -jaD -nAg -nAg -nMW -nAg -wVi -eim -efN -dhE -fvA -fvA +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc kJt xST lfF cex jld -dzO +jAi rff nbh foH @@ -38707,9 +41126,9 @@ uSp kqs pVX fln -aZS -kdF -shT +wkd +stq +stV aCf qiF ldU @@ -38724,13 +41143,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -38810,17 +41229,17 @@ qVH qVH qVH qVH -hzP +qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE wNo @@ -38854,34 +41273,34 @@ auf auf auf jcQ -xMu +wUu nrV -yao -eys -mlT +gKU +sxb +eIq hwP qUy kFX hwP -vFn -nIY -fNz -npA -bcv -xNq -beG -sPg -owx -ijL -eWH -eQw -sIT +hAc +hAc +hAc +hAc +hAc +qLW +qLW +qLW +hAc +hAc +hAc +hAc +hAc kJt tef djS cex jld -dzO +jQG rff nbh foH @@ -38900,10 +41319,10 @@ rff var var ctf -dzg -gVs -kdF -shT +sFS +hmW +vGC +stV aCf aqm kuk @@ -38918,13 +41337,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39008,13 +41427,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE uno @@ -39050,24 +41469,24 @@ auf txH rHv nrV -yao -kbz -yao +gKU +npE +gKU hwP dIR kFX hwP hwP hwP -wHS -wHS +nAg +nAg bYA wXn riA kld bYA -wHS -wHS +nAg +nAg kJt kJt kJt @@ -39075,7 +41494,7 @@ kwQ mJl kJt jld -dzO +jQG rff nbh nbh @@ -39095,9 +41514,9 @@ fln fln fln fln -gnF -kdF -hwK +sHd +vGC +wUv aCf oDu eqt @@ -39112,13 +41531,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39189,10 +41608,10 @@ qVH qVH qVH qVH -tQB qVH qVH -mcq +qVH +qVH qVH qVH qVH @@ -39202,13 +41621,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE nVq @@ -39244,24 +41663,24 @@ auf txH rHv nrV -yao -kbz -yao +gKU +npE +gKU hwP jqO dzA ndO kFX hwP -gws -gws +wjy +wjy bYA oSs itl -xOd +hkN bYA -gws -gws +wjy +wjy kJt pbe wDx @@ -39269,7 +41688,7 @@ aPL bYL kJt jAi -dzO +jAi rff rff rff @@ -39286,19 +41705,19 @@ fnJ rff rff nZS -gVo +uLw vgw -rnV -gnF -wMZ -ovL +wkd +eKS +kYE +rGp aCf dGb dEB dZB pWw mtY -fyw +qho aGz aCf shT @@ -39306,13 +41725,13 @@ shT shT shT hfU -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39396,13 +41815,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm pRH cVE nWF @@ -39438,53 +41857,53 @@ auf mkv lXM nrV -yao -kbz -yao +gKU +npE +gKU hwP lSi daw ksv kFX hwP -gws -gws +wjy +wjy bYA aoA ifJ xOd bYA -gws -gws +wjy +wjy kJt jis asi uxC -lfF +ihz kJt jAi -dzO jAi +jQG +uWc +jQG jAi -jpB -xAr -xAr -xAr -xAr -xAr -jpB -ppx +jAi +jQG +gYx +wGw shT +ppx +wGw nZS -tpX +vaE mzh bnD nZS -rvh -bJG -rnV -gnF -bqw +shT +shT +hyW +okI +tbl etU aCf aCf @@ -39500,13 +41919,13 @@ ijk ijk ijk ijk -ddu -kLI -kLI -kLI -kLI -tAx -gZu +sBk +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39590,13 +42009,13 @@ qVH qVH hts uDM -gZu -xQM -kLI -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm +vKm oXy peC cVE @@ -39632,41 +42051,41 @@ auf txH gTt nrV -yao -kbz -yao -hpx +gKU +npE +gKU +bPe eUN eUN oDI eUN eUN -gws -gws +bYA +bYA bYA kbG ydo xyL bYA -gws -gws +bYA +bYA kJt pIo wDx aPL cGR kJt +jQG jAi -dzO jAi +jQG jAi -jpB -xAr -xAr -xAr -xAr -xAr -jpB +jAi +jAi +jAi +mWg +shT +shT xpc obk mth @@ -39675,16 +42094,16 @@ cHo lsz nZS rvh -gUS -rnV -gnF -bqw +xHX +hyW +okI +tbl tZE -msO -msO -mpi -ltv -msO +hyB +fjv +smc +gNs +sKe ijk xAV bvX @@ -39694,13 +42113,13 @@ pMy pMy wxo ijk -kLI -kLI -kLI -kLI -kLI -tAx -gZu +vKm +vKm +vKm +vKm +vKm +ofc +mym fqv hts hts @@ -39783,14 +42202,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm iVy bKM bKM @@ -39826,10 +42245,10 @@ auf pXq tql nrV -yao -kbz -yao -yao +gKU +npE +gKU +kjN eUN rms avr @@ -39850,18 +42269,18 @@ cXL xpI qLV kJt -dzO -dzO jAi jAi -jpB -xAr -xAr -xAr -xAr -xAr -jpB -gdv +jAi +jAi +jQG +jQG +jQG +jAi +gYx +wGw +shT +azv vgw nZS nVN @@ -39869,16 +42288,16 @@ wji lHN nZS rvh -gUS -rnV -gnF -bqw +qdz +hyW +okI +tbl tZE -msO -msO +tGN +rLJ bok rzN -msO +uok hwB qKL mtg @@ -39887,15 +42306,15 @@ uZc paM rTB sEJ -tZt -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +xTR +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -39977,14 +42396,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40020,76 +42439,76 @@ mcA mlD ojQ fLl -eId -hxn -eId -xeg +tgi +tfk +tgi +jwx peH vMk xRn vel aAi -pFp -dAZ -dAZ -haR iQH -vPn -cDO -cDO -ttP +iQH +iQH +iQH +iQH +iQH +iQH +iQH +iQH uLY wTg cXL fgg cms kJt -dzO -jAi jAi +jQG +jQG diA -jpB -xAr -xAr -xAr -xAr -xAr -jpB -gdv -shT +bHf +bHf +bHf +bHf +bHf +bHf +bHf +fTu +iZA nZS rxM xyM axC rTt -hrN -iVU -rnV -gnF -bqw +oON +uHC +hyW +okI +tbl tZE -msO +kPL xZK msO jJr -ycI +jeF aRM cdl -qZQ +cyN bRB bRB fVb hfD jUK -tZt -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +xTR +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40171,14 +42590,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40214,76 +42633,76 @@ lkO qAa ixz nrV -yao -vwy -yao -cdR +gKU +xdH +gKU +hEk eUN woB xsn hHh eUN -ilv -pDX iQH iQH iQH iQH iQH -dIk -mTG +iQH +iQH +iQH +iQH kJt wNI cXL fgg -drX +kse kJt -dzO jAi +jQG jAi qcp -jpB -xAr -xAr -xAr -xAr -xAr -jpB -gdv -shT +bHf +xSM +xSM +xSM +xSM +hPN +bHf +qXj +fLD nZS nZS cYp nZS nZS -fin -rnV -rnV -gnF -qWL +lGC +shT +hyW +okI +qRu brK -jFh +xlV bYF jFh dty -msO +uok hwB gmB -wEF -adh +iHR +wcZ adh eiu aJB tiG -tZt -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +xTR +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40357,7 +42776,7 @@ qVH qVH qVH qVH -kMV +qVH qVH qVH qVH @@ -40365,14 +42784,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40406,12 +42825,12 @@ quZ sEd auf fCn -lRt +xZI nrV nrV nrV nrV -sQX +mdo eUN eUN mnS @@ -40430,37 +42849,37 @@ kJt clm aMX nER -drX +pXb kJt -dzO jAi jAi jAi -qJq -xAr -lDf -lDf -lDf -lDf -bBB -htL -aZS -aZS -aZS -gnF -wvD -aZS +jQG +nUf +xSM +eIY +eIY +eIY +eIY +kAn +bly +shT +cWx +shT +rTX +fin rvh -oxr -rnV -gnF -fTN +rvh +rvh +hyW +okI +ylP tZE -msO -msO -msO -msO -msO +lFB +nVt +nVt +nVt +jxe ijk qAb rSo @@ -40470,14 +42889,14 @@ jbn fTt cRV ijk -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40559,14 +42978,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40604,7 +43023,7 @@ ixz xbt aOu meU -uVR +xWZ lRq jLd tTR @@ -40630,48 +43049,48 @@ xxd qhn qhn qhn -jpB -nnS -dKZ -rHE -nnS -nnS -jpB -cxb -aUW -aUW +bHf +tNW +opW +wpT +tNW +tNW +bHf +bgi +tXY +tXY aUW -ugw +pvE rnV -shT -rvh -oxr -rnV -gnF -fTN +kEG +kEG +yih +hyW +okI +ylP tZE -aGV -kRX +skX +fco lGa lGa -wmZ -ggB -ggB -ggB -ggB -ggB -ggB -ggB -ggB +elt +xgx +xgx +xgx +xgx +xgx +xgx +xgx +xgx tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts qVH qVH @@ -40740,7 +43159,7 @@ qVH qVH qVH qVH -gVq +qVH qVH qVH qVH @@ -40753,14 +43172,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -40795,9 +43214,9 @@ xyA auf flh lAk -gXg -nyY -nyY +vTN +kKM +xnP jQs ntJ nyY @@ -40824,31 +43243,31 @@ soJ soJ soJ lmj -jpB -wyS -vzd -nnS -bRO -bRO +bHf +met +cnR +tNW +atT +atT nqm -rdw +fmu myY myY myY myY myY -rnV -rvh -oxr -rnV -gnF -fTN +nus +nus +gda +xCl +dhO +wHc tZE dAc -sDQ +tDN lGa lGa -oPE +vtK kna kna kna @@ -40858,14 +43277,14 @@ kna kna kna tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -40947,14 +43366,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -41018,31 +43437,31 @@ uJy fUA soJ tDw -jpB -lOw -vzd -nnS -bRO -bRO +bHf +dgx +cnR +tNW +atT +atT nqm -eNz +ksY kIW shw -iuv +sHi wSR myY rnV -wvD rnV rnV -rEj -uWe +rnV +gnF +lWu tZE -uXg -unL +jeG +ghe lGa -mTO -pkd +vbk +qYj kna kna kna @@ -41052,14 +43471,14 @@ kna kna kna tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -41141,14 +43560,14 @@ qVH qVH qVH hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -41183,9 +43602,9 @@ xyA auf puk ixz -gXg +vTN oom -nyY +kKM jQs xRc xRc @@ -41212,48 +43631,48 @@ xmm sMK soJ hDF -jpB -lOw -eGt -rHE -upx -upx +bHf +dgx +rjq +wpT +iSi +iSi nqm -bwl +xCj uBC fLW fZO gsZ myY +pQZ +nuZ +lhv shT -aZS -shT -shT -gnF -fTN +rTX +uOT tZE -xxt -dDH +wkt +wNe lGa -rrl -deT +wVB +sQC +kna +kna +kna +kna +kna kna kna kna -tAE -tAE -tAE -tAE -tAE tZE -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -41335,14 +43754,14 @@ hts hts hts hts -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm oLI iUx iUx @@ -41387,7 +43806,7 @@ tTR cFL nvh nvh -nvh +epq cCG nvh nvh @@ -41406,48 +43825,48 @@ ctR sMK soJ ney -jpB -lOw -lXU -lGl -gwH -xAr +bHf +dgx +smn +aLf +kkK +xSM nqm -uaa +sZm pLu iQr lZt nlH vxW -aZS -aZS -fds -iHb -odQ -fTN +shT +shT +oIf +aUW +pvE +npw tZE dAc -sDQ +tDN lGa lGa -oPE +vtK kna kna bkS -uuW -uuW -uuW -uuW -uuW +hvv +hvv +hvv +hvv +hvv ved -ddu -kLI -kLI -kLI -kLI -tAx -gZu -xQM +sBk +vKm +vKm +vKm +vKm +ofc +mym +eoW hts hts hts @@ -41528,17 +43947,17 @@ hts hts hts hts -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm iVy -mlH +yhd iUx iUx iUx @@ -41562,13 +43981,13 @@ nqE rxB wbQ pjR -wNw -vEr +jki +gmS lxV vEr vEr -xXi -vEr +swV +gmS fDs ixz awY @@ -41579,9 +43998,9 @@ aXz awY awY kIF -hpx -hpx -hpx +jaI +jaI +jaI hBz nUo xnp @@ -41600,14 +44019,14 @@ xmm sMK soJ tDw -jpB -boQ -hCY -ovx -uXF -xAr +bHf +pPJ +lNs +fRS +nRr +xSM nqm -fHl +dqD hav qFG liX @@ -41615,34 +44034,34 @@ gsZ myY hwK kFe -hWL -cpo -cpo -jrG +trO +jkO +axF +ajv tZE -pPg -ekM +btR +nnU lGa lGa -qJg -deT -deT +guE +sQC +sQC bkS wTj dcQ ncb ncb wTj -vXA -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI +jHP +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm hts hts hts @@ -41721,16 +44140,16 @@ hts hts hts hts -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm iVy wVH pKc @@ -41773,9 +44192,9 @@ ljK cvx fuZ kIF -mlT -tzO -yao +krR +udR +jub hBz cCV iPW @@ -41794,14 +44213,14 @@ hhl rJK soJ dxw -jpB -boQ -lDf -mZy -lDf -nnq +bHf +pPJ +eIY +oav +eIY +eIY nqm -tlJ +xBf kIW sSQ jKS @@ -41809,35 +44228,35 @@ fvh myY ovL shT -gnF +rTX shT -aZS -bbG +shT +ddd uFy -wbl -mas -wbl -kZx -wbl -ham -wbl -hdn +ocq +qtv +tSz +nSe +tSz +adg +opl +iaM lte vxt cJP nhm fNq -vXA -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI +jHP +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm hts hts hts @@ -41914,17 +44333,17 @@ hts hts hts hts -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -wwj +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +lLe iVy uBb iVy @@ -41967,9 +44386,9 @@ pyl mQU sha rCm -aMD -qXs -yao +xtN +cIS +iEj hBz tVu wld @@ -41988,14 +44407,14 @@ gYx gYx xxd gYx -jpB -iSG -ovx -ovx -ovx -iSG +bHf +cAp +fRS +fRS +fRS +cAp nqm -rdw +fmu myY qxG qxG @@ -42003,36 +44422,36 @@ qxG qxG qxG kSv -gnF +mHL shT -cao -hlM +vgs +isO tZE -msO -aAa -hLM -rHm -msO -gvi -msO -uNG +lFB +hBY +glF +peI +nVt +iyA +jxe +bTi mVP uoI swF wTj kyU -vXA -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI +jHP +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm hts hts hts @@ -42107,18 +44526,18 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm mRB sBK fPn @@ -42168,36 +44587,36 @@ hBz roP uMG hkt -bKa +wxM igT hBz gqJ qDW -eDU +cYd hBz gYx uUB gYx cDr jAi -dzO jAi -jpB -btP -ovx -ovx -ovx -bsV -oSm -rFX jAi +bHf +fMi +fRS +fRS +fRS +cPe +oSm +kto +pkv qxG noz vPo bqH jhI wVK -gnF +rTX eIB sTq eIB @@ -42216,18 +44635,18 @@ czQ wTj ekQ ved -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42301,18 +44720,18 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -fkK -kLI -kLI -fkK +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +rzJ +vKm +vKm +rzJ mRB sBK fPn @@ -42369,29 +44788,29 @@ hBz hBz hBz hBz -jAi -rDa +jQG +sya jAi cDr +jQG +jQG jAi -dzO -jAi -oSm -jpB -ovx -ovx -ovx -jpB -jAi -ksw -jAi +bHf +bHf +fRS +fRS +fRS +bHf +jkG +pIY +mPq qxG eyf eyf nOP jhI nPx -ebD +ydQ jDN iZH nob @@ -42408,20 +44827,20 @@ ecR sCZ lmf wTj -gGP +kcK ved -kLI -kLI -fkK -kLI -kLI -uuF -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +rzJ +vKm +vKm +lBm +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42495,20 +44914,20 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm mRB -sBK +mSD fPn fPn fPn @@ -42533,7 +44952,7 @@ svk jNj pjR qYd -lRt +fhw awY tsZ kwz @@ -42549,43 +44968,43 @@ oIC uAp ppP kIF -tAZ +mka qPE kwq -bHV -wRy -wRy -jfs -jfs -jfs -jfs -vvd -ong -mFc -ong -ong -dwx -jAi +xPH +vGS +vGS +bWe +bWe +bWe +bjg +pSH +bWe +rnh +bWe +ajA +cSC +skE cDr cDr -dzO +jAi cDr cDr -jpB -arp -arp -arp -jpB -jAi -ksw -jAi +bHf +hCI +hCI +hCI +bHf +jkG +pIY +pkv qxG nEw tUp tUp vXZ aUW -hwE +dFa eIB lwa rau @@ -42601,21 +45020,21 @@ egw bkS gOn czQ -kKY -vbm +fMU +ogY ved -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42689,18 +45108,18 @@ hts hts hts hts -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm +vKm mRB wxx fPn @@ -42713,8 +45132,8 @@ oXy oXy oXy iuS -cYP -vds +bBn +eBZ spD gfJ kds @@ -42726,7 +45145,7 @@ giW otA jUp pjR -eZu +waT lAk awY jyk @@ -42752,34 +45171,34 @@ aNZ cDr cDr cDr -jAi -cSw -jAi +jQG +fre +jQG gYx jAi -jAi -rDa +oEa +sya rNk jAi jAi -dzO jAi jAi -jpB -jpB -jpB -jpB -jpB -jAi -pzb -skE +jQG +bHf +bHf +bHf +bHf +bHf +jQG +tiT +mvB qxG mQu eyf jAm jhI uNy -gnF +mHL eIB lHZ oZX @@ -42795,21 +45214,21 @@ fFn bkS qlL czQ -wTj -swr +qIo +ogY ved -kLI -kLI -kLI -kLI -kLI -tAx -gZu -xQM -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +ofc +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -42883,12 +45302,12 @@ hts hts hts hts -frk -kLI -kLI -vBY -gZu -gZu +qGi +vKm +vKm +rod +mym +mym wvw mRB mRB @@ -42946,36 +45365,36 @@ aNZ jAi jAi cDr -jAi -cSw -jAi +cag +jZU +skE gYx jAi -jAi -rjo -ong -ong -ong -ong -ong -ong -ong +jQG +dzl +kfR +kfR +kfR +kfR +kfR +kfR +kfR mFc -ong -ong -ong -ong -dsx -jAi +kfR +kfR +kfR +kfR +kNk +pkv qxG jnB lXi eXH jhI wVK -gnF +rTX eIB -dOK +bwE ayZ vhb jyZ @@ -42989,8 +45408,8 @@ yev ecR nIA czQ -wTj -swr +qIo +ogY ved mRB mRB @@ -42998,12 +45417,12 @@ mRB mRB mRB wvw -gZu -xQM -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43077,12 +45496,12 @@ hts hts hts hts -kLI -kLI -kLI -qkZ -kLI -kLI +vKm +vKm +vKm +lPW +vKm +vKm mRB yao yao @@ -43119,7 +45538,7 @@ tbY awY oho uAp -pBm +iZR uAp uAp fZK @@ -43138,10 +45557,10 @@ hKI kcY aNZ jAi -jAi +jQG cDr jAi -cSw +fre gYx gYx jAi @@ -43153,21 +45572,21 @@ iow gvU jAi jAi -jAi +jQG gYx -jAi -jAi -jAi -jAi -ksw -jAi +jQG +tvs +jQG +jkG +pIY +pkv qxG qxG qxG qxG qxG nPx -gnF +rTX eIB eIB eIB @@ -43192,12 +45611,12 @@ yao yao yao mRB -gZu -xQM -kLI -kLI -kLI -frk +mym +eoW +vKm +vKm +vKm +qGi hts hts hts @@ -43271,12 +45690,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -uIA +vKm +vKm +vKm +vKm +vKm +atk mRB yao yao @@ -43308,21 +45727,21 @@ spD qNJ qNJ pjR -uSP -uIm +fYL +fhw kIF oho -uAp +jAO ldT uAp -uAp +uHU fZK awY hYN wEX -txn -txn -txn +eCF +gQG +gnc uml kIF oTN @@ -43334,11 +45753,11 @@ dfM gYx gYx gYx -jAi -cSw +gRp +fre gYx -jAi -jAi +jQG +jQG jAi gvU vQk @@ -43346,27 +45765,27 @@ vQk vQk gvU jAi -jAi -jAi +hVJ +jQG gvU gvU gvU gvU gvU -kIR -jfs -jfs -jfs -iai -jfs -kiZ -mAp -ltf -mAp -nIZ -pfp -mEH -jcG +eTi +iwg +iwg +iwg +fhm +iwg +thm +ecl +ccp +ecl +bDW +cnC +maO +jFG eCL uwA pAL @@ -43386,12 +45805,12 @@ yao yao yao mRB -fjG -xQM -kLI -kLI -kLI -kLI +rRN +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43465,12 +45884,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -gZu +vKm +vKm +vKm +vKm +vKm +mym mRB yao yao @@ -43489,7 +45908,7 @@ rQs sAF rQs rQs -nfh +sBK ite spD fkE @@ -43510,15 +45929,15 @@ uXA kIF kIF kIF -hpx -hpx -hpx -hpx -hpx -hpx -hpx -hpx -hpx +vYm +vYm +vYm +vYm +vYm +vYm +vYm +vYm +jld aNZ aNZ oPM @@ -43528,8 +45947,8 @@ gpj gpj gpj gvU -jAi -cSw +jQG +gBd gvU gvU gvU @@ -43544,21 +45963,21 @@ gvU gvU gvU oQN -srv +woO caV gvU -ksw -dzO -dzO -mWI -xtB -cef -tPM +pIY +pkv +pkv +aHc +otM +dPy hrN -wXO -aZS -xhy -aZS +dLS +drc +shT +emf +shT mPs mOG eCL @@ -43567,7 +45986,7 @@ bjJ sfY uqo hNo -rIU +qsD lKt piC sUJ @@ -43580,12 +45999,12 @@ yao yao yao mRB -gZu -xQM -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43659,12 +46078,12 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -gZu +vKm +vKm +vKm +vKm +vKm +mym mRB yao yao @@ -43673,7 +46092,7 @@ yao yao mRB gMH -sBK +nLf sBK sBK sBK @@ -43704,16 +46123,16 @@ vcx vcx vcx vcx -oDh -bRO -bRO -jJz -jJz -jJz -gTn -oDh -yao -hlI +pvy +qxa +qxa +wyn +wyn +wyn +hWR +pvy +jAi +tnr aNZ aNZ aNZ @@ -43723,9 +46142,9 @@ srv srv gvU diA -cSw +fre gvU -wnR +qoh syt bwD srv @@ -43737,23 +46156,23 @@ srv vQk vQk gvU -leN -srv +rOV +fJQ bBv gvU -iSs -cNF +uyB +ovD hpx azB jBY hpx hpx -shT -kev +wGw +bjf ezZ -xhy -aZS -shT +lwD +wGw +wGw tKc bTb vTG @@ -43761,7 +46180,7 @@ bjJ bjJ ogD mYO -qwk +mkH oZR ehq wTj @@ -43774,12 +46193,12 @@ yao yao yao mRB -gZu -xQM -kLI -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm +vKm hts hts hts @@ -43854,11 +46273,11 @@ hts hts hts hts -kLI -kLI -kLI -kLI -gZu +vKm +vKm +vKm +vKm +mym mRB yao yao @@ -43891,33 +46310,33 @@ bnA mfd cDa hwX -cDa +qks rzn vcx dtC kHU nvX nvX -oDh -bRO -bRO -jJz -jJz -jJz -bTl -oDh -yao -yao -yao -yao -ouC +pvy +qxa +qxa +wyn +wyn +wyn +iUO +pvy +jAi +jAi +jAi +jAi +gla gvU +idZ srv -srv -srv +asH gvU qcp -cSw +fre gvU mGe rDH @@ -43927,26 +46346,26 @@ lbI lbI lbI srv -srv +dVE vQk vQk gvU -srv -srv +fJQ +fJQ dPM gvU -ksw -hVJ +pIY +hCr hpx dUY uMx kIA hpx -shT +naN trt shT -xhy -aZS +emf +wGw shT shT eCL @@ -43968,11 +46387,11 @@ uEG uEG yao mRB -gZu -xQM -kLI -kLI -kLI +mym +eoW +vKm +vKm +vKm hts hts hts @@ -44049,10 +46468,10 @@ hts hts hts hts -kLI -kLI -kLI -gZu +vKm +vKm +vKm +mym mRB mRB mRB @@ -44071,8 +46490,8 @@ iow iow iow hiO -wNB -xna +rRh +nyw spD wBB spD @@ -44092,14 +46511,14 @@ gvU gvU gvU ovm -dgp -dgp -dgp -dgp -dgp -qdB -fjJ -dgp +pvy +pvy +pvy +pvy +pvy +axq +dQB +pvy gvU gvU gvU @@ -44111,11 +46530,11 @@ nMN nMN tIW hiO -kuQ +aSD gvU tLh -nMN -qCd +gNb +uIa gvU iow iow @@ -44139,14 +46558,14 @@ hpx rnV rnV rnV -xhy -aZS +lwD +wGw shT shT eCL avX bjJ -iIk +eqK eYO eYO eCL @@ -44162,10 +46581,10 @@ pVJ jRq mRB mRB -gZu -xQM -kLI -kLI +mym +eoW +vKm +vKm hts hts hts @@ -44244,10 +46663,10 @@ hts hts hts hts -kLI -kLI -gZu -gZu +vKm +vKm +mym +mym mRB fPn fPn @@ -44273,7 +46692,7 @@ wmU rLK jPX tMn -tMn +pUm tMn hvm tXx @@ -44281,36 +46700,36 @@ rLK fwa tMn tMn -tMn +pUm tMn tMn jPX rLK gkH rLK -jPX +vRf tMn tMn tMn tMn tMn -jPX +vRf rLK wmU rLK -jPX +vRf tMn tMn tMn tMn tMn -jPX +vRf dGt gkH rLK jPX aiq -tMn +pUm tMn tMn tMn @@ -44318,7 +46737,7 @@ jPX rLK gkH rLK -tMn +pUm tMn tMn jPX @@ -44330,17 +46749,17 @@ qbf wQo dLa hpx -uuJ -uuJ +lWn +vPV rnV -xhy -aZS -aZS -aZS +lwD +shT +shT +wGw eCL avX bjJ -iIk +eqK wrH wrH eCL @@ -44354,11 +46773,11 @@ jRq jRq isl jRq -gZu -gZu -gZu -xQM -kLI +mym +mym +mym +eoW +vKm hts hts hts @@ -44439,9 +46858,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm mRB fPn fPn @@ -44461,82 +46880,82 @@ lRo lRo tje sFe -dmh -iDh -kbZ -iDh -ogh -uqO -dmh -paD -gWX -iDh -iDh -wwm -lTg -dmh -rrq -lRo -lRo -eSj -xQB -rXI -xQB -eSj -lRo -lRo -bXU -lRo -lRo -eSj -xQB -xyr -xQB -nxm -lRo -lRo -lRo -lRo -lRo -eSj -bHo -rXI -xQB -eSj -uKw -lRo -lRo -lRo -lRo -eSj -xQB -rXI -nda -aln -aln -aln -aem -rdJ -xhH -mfd +bMm +gDA +sjO +gDA +gye +kEZ +bMm +uXO +hew +gDA +gDA +lwN +bRJ +bMm +akV +lPV +pZC +olw +wPE +xsM +wPE +olw +efy +efy +koc +efy +efy +olw +wPE +tRs +wPE +tMv +efy +efy +efy +efy +efy +olw +qNv +xsM +wPE +olw +ePO +efy +efy +efy +efy +olw +wPE +xsM +wSY +nIp +efy +pZC +pzh +iwO +qQJ +fdX hpx hpx hpx hpx hpx -uuJ +upG uuJ rnV -ctg -geV +emf +smE rnV -aZS +kKX eCL avX bjJ -iIk -iIk -iIk +eqK +eqK +eqK eCL wtk ofM @@ -44548,10 +46967,10 @@ rlB rlB rlB jRq -cIh -cIh -cIh -kLI +pAq +pAq +pAq +vKm hts hts hts @@ -44634,8 +47053,8 @@ hts hts hts hts -kLI -kLI +vKm +vKm mRB fPn fPn @@ -44652,7 +47071,7 @@ sae mfb avx uLA -uLA +auy uLA uLA uLA @@ -44705,24 +47124,24 @@ oFd avx aJU wuo -uAy -khG -nxF -fjK -cAo -aCp +opK +klL +uLA +oFd +avx +hcY dkM nNn gvU uuJ -uuJ -uuJ -uuJ -uuJ -uuJ sEh -qxf -bEC +dbe +upG +upG +kWj +sEh +iqQ +kWj rnV jSU eCL @@ -44742,9 +47161,9 @@ fPm qLr rlB jRq -ddu -kLI -kLI +sBk +vKm +vKm hts hts hts @@ -44848,7 +47267,7 @@ nKv nKv nKv oSA -oSA +wWD nKv gvU gvU @@ -44891,8 +47310,8 @@ nWG gvU iow iow -dMq -dMq +wvJ +giU iow iow mnn @@ -44912,11 +47331,11 @@ gvU gvU hOw hOw -hOw +rcU hOw sEh -qxf -bEC +bzq +kWj rnV qdz eCL @@ -45032,7 +47451,7 @@ aNJ fPn gQr fPn -fPn +esL nKv kgf bYR @@ -45061,10 +47480,10 @@ vCt xLb fhN mYo -cfF -tjx -tjx +vdV +vdV tjx +sVL gvU bnA jES @@ -45096,21 +47515,21 @@ fIB xVE bkV vkg -nGO -mnn +moM +ban bnA aZo iow gpj gpj gvU -uuJ -uuJ -uuJ +igs +kWj +upG uuJ sEh -qxf -bEC +bzq +uuJ rnV rnV eCL @@ -45242,7 +47661,7 @@ tjx bbR sVL tjx -bJc +fhc vzj sWu fcu @@ -45255,17 +47674,17 @@ fUt xLb sbI mYo -cfF -tjx -tjx -tjx +vdV +vdV +evJ +dNP gvU tZY jES mfd pfb hQg -ovT +pmf gvU gvU gvU @@ -45289,7 +47708,7 @@ tQt fkY ubH pFe -pFe +qbb aqF ban bnA @@ -45298,15 +47717,15 @@ iow srv srv gvU -uuJ -uuJ -uuJ -uuJ +xWj +kBu +upG +upG sEh -ymh -ckX +nBB +umO ehF -uuJ +kWj eCL avX avX @@ -45436,12 +47855,12 @@ bbR bbR eap tjx -bJc +qgM vzj fsW tfh vzj -jGc +jmh cpl mYo slU @@ -45449,10 +47868,10 @@ pOf lWm vFK mYo -cfF -tjx -tjx +vmM +vdV tjx +qGZ gvU vSf jES @@ -45485,22 +47904,22 @@ sSU wwN pFe tGo -ban -bnA +mnn +tZY aZo tIW ese -ded +azL gvU -uuJ -uuJ -uuJ +upG +jhY +upG uuJ sEh -qxf -bEC -uuJ +wxJ +kWj uuJ +cTP eCL eCL eCL @@ -45628,9 +48047,9 @@ rlC nKv tjx bbR +tqy tjx -tjx -bJc +fhc vzj vzj mLq @@ -45643,12 +48062,12 @@ kBt sVV sbI mYo -cfF -tjx -tjx +vdV +vdV tjx +qGZ gvU -bnA +hqb qcY mfd nBd @@ -45667,43 +48086,43 @@ seT iow iow iow -dMq -dMq +wvJ +giU iow iow mnn oOf -tNO +rhQ aHb tJE txR -pFe +qbb tGo ban bnA gTr -wmU +hAy dBy mfd gvU +dHa +loy +mqE +sDX +eKE +tUN uuJ uuJ uuJ -uuJ -sEh -qxf -bEC -aRq -aRq -sEh -uuJ -uuJ -uuJ -uuJ -sEh -aZH -aZH -paT +nWv +fpZ +fpZ +xsu +fpZ +fpZ +fpZ +fpZ +xtc kvR aZH aZH @@ -45824,9 +48243,9 @@ boa boa boa boa -uEJ -jBe -cXm +aUX +hvV +wJd gtP bbR bbR @@ -45837,18 +48256,18 @@ uIW xRz bpg mYo -cfF -tjx -tjx -tjx +vdV +vdV +wJo +vvz gvU osL qCd dZc -oDh -nfq -gvk -oDh +qIl +wRs +fnN +qIl hCZ alw mXb @@ -45876,32 +48295,32 @@ kSV ban mfb voM -iTf +rnU uLA nNn gvU +aKi +uvV uuJ -uuJ -uuJ -uuJ +upG sEh -qxf -bEC -bEC -bEC -nyq -bEC -bEC -bEC -bEC -nyq -paT -paT -paT +jlj +hHB +hHB +hHB +iiw +lGn +trp +lGn +lGn +hLW +lGn +tja +uOB kvR aZH -aZH -aZH +oyG +jMc boX hts hts @@ -46020,29 +48439,29 @@ lFf boa boa aZw -tfH +cmB dLL cQw -cQw -qef +oEN +cMO arH cry xYZ mGy xRz mYo -cfF -tjx -tjx -tjx +vdV +vdV +aFO +evJ gvU bnA qcY mfd -mCS -mbx -xOu -oDh +csx +jQP +cfx +qIl uXQ tGw dSJ @@ -46065,7 +48484,7 @@ mnn mnn sDS pFe -pFe +ePy kSV mnn byD @@ -46074,29 +48493,29 @@ gvU gvU gvU gvU -uuJ -uuJ -uuJ -uuJ -sEh -ejP -gce -oLS -uuJ -sEh -uuJ -uuJ -uuJ -uuJ +kWj +oJT +upG +upG sEh +ntR +baF +njw +kWj +kvR +sdn +msa aZH aZH -aZH +rRJ +fjh +mPi +uOB kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46213,35 +48632,35 @@ lOl lOl dXu jZi -dWX -kDu -pzf -jBe -jBe -dXq +ecb +tIc +tIw +hvV +hvV +aVx mYo mYo mYo mYo mYo mYo -cfF -tjx -tjx -tjx +vdV +vdV +evJ +evJ gvU bnA jES mfd -vre -vUC -nxV -oDh +poW +jJO +izI +qIl tPq tGw paB -sxk -sxk +fmt +fHH sxk eXV tGw @@ -46254,43 +48673,43 @@ srv tIW duL duL -jmn -jmn +eGg +mIP mnn -oDw -pFe -pFe +fyf +jLH +eeX ePy mnn jYD -qRL -uuJ -uuJ +vIU +aoz +bHI uuJ sEh -uuJ -uuJ -uuJ -uuJ +xre +oqS +kHm +fVs sEh -qxf -bEC -pUB -uuJ -sEh -uuJ -uuJ -uuJ +iqQ +kWj +oEn uuJ -sEh -aZH +kvR +qCZ aZH aZH +dbE +qCZ +qCZ +mPi +uOB kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46412,25 +48831,25 @@ uws hIi tjx tjx -cfF -jZp -tjx -tjx tjx -kjG bbR -cfF -tjx +evJ +evJ tjx +kjG +pze +vdV +vdV +ltM tjx gvU bnA jES mfd -vre -iGY -xLA -phC +poW +xCh +rHc +mHE eri eri oLz @@ -46444,22 +48863,22 @@ anh srv aQy chl -srv +asH gvU bGg -jmn -jmn -jmn +uCJ +nzH +llM +mnn +elK +mnn +mnn mnn -fyf -jLH -eeX -pFe mnn wtk -qRL -uuJ -uuJ +vIU +aoz +kWj uuJ sEh sEh @@ -46478,13 +48897,13 @@ xQE xQE xQE kvR -kvR -kvR +eRT +tDc kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46583,11 +49002,11 @@ hts aNJ fvO gQr -tqn -kqG -kqG -kqG -tqn +lfV +uJd +uJd +flg +lfV ePr dZW ijK @@ -46601,35 +49020,35 @@ wiv ehw ebx boa -wmH +umS uws hIi tjx gGr -cfF -cfF -cfF -cfF -cfF -cfF -ndw -cfF -cfF -cfF tjx +lWh +vdV +vdV +vdV +vdV +vdV +vdV +vdV +vdV +vdV gvU dUc jES egA -hHg -nUu -trS -oDh +sfr +kmF +qeo +qIl lSm knG stM -cid -cid +wxN +kAD cid qwI tGw @@ -46641,26 +49060,26 @@ oQW wTr gvU bGg -jmn -jmn -jmn -mnn -elK -mnn -mnn -mnn -mnn -uuJ -qRL -uuJ -uuJ -uuJ -uuJ -uuJ +jyB +uee +jfN sEh +wKk +aoz +aoz +aoz +aoz +aoz +vIU +aoz +fbe uuJ uuJ -aRq +kWj +sEh +bHH +gWj +qBZ vir jSx kIt @@ -46672,13 +49091,13 @@ jIs ehL xQE aZH -aZH -aZH +mPi +uOB kvR aZH +xYx aZH -aZH -boX +iLc hts hts hts @@ -46777,11 +49196,11 @@ hts aNJ fvO gQr -kqG -bRO -bRO -bRO -kqG +uJd +ePr +ePr +ePr +uJd qoG aDN ijK @@ -46801,24 +49220,24 @@ scC xLF koJ tjx -jZp -tjx -tjx -tjx -tjx -bbR -tjx -tjx cfF -tjx +vdV +vdV +toB +vdV +vdV +vdV +vdV +vdV +vdV gvU mpH qvi vmh -rEo -oaf -sxa -oDh +qIl +mAU +jbt +qIl eJJ wWB pjx @@ -46827,36 +49246,36 @@ tGw tGw tGw tGw -tGw +jsB seT gvU gos gvU gvU gvU -jmn -jmn -jmn -jmn -sEh -ycY -uuJ -mrc -uuJ -iIC -uuJ -qRL -uuJ -uuJ -uuJ +vAK +nzH +uee +llM +bdk +wKk +aoz +bAt +mNS +pJp +aoz +vIU +aoz +meA +drV uuJ uuJ sEh +uLe uuJ -uuJ -aRq +kWj ycY -pYL +sqC wEO xQE jJi @@ -46865,13 +49284,13 @@ jPH jIs tAR xQE -aZH -aZH -aZH -kvR -aZH -aZH -aZH +hex +ryu +rRx +wip +qLM +dYc +fbv boX hts hts @@ -46971,11 +49390,11 @@ hts aNJ rQs gDB -kqG -bRO -bRO -bRO -xAr +uJd +ePr +ePr +ePr +kru lUg ijK ijK @@ -47002,17 +49421,17 @@ oEJ oEJ oEJ oEJ -tjx +bbR cfF -tjx +vem gvU dUc jES egA -wKl -jmu -mZV -oDh +qIl +czI +eus +qIl nET gzJ fpe @@ -47023,34 +49442,34 @@ tGw tGw tGw hKb -vao -wVX -bDD -cLo -umt -bDD -bDD -bDD -bqz -oWs -vZk -aAo +eLL +pWH +aQv +oxF +fYa +gtv +wUX +wUX +smH +mBM +jWN +msI czE mqE -lQK -mqE -ezu -uuJ -uuJ -uuJ -uuJ -uuJ -sEh -uuJ -uuJ -aRq +uMl +eKi +vWD +aoz +aoz +aoz +aoz +aoz +hnr +bEC +bEC +bEC ycY -gLm +nud dWm xQE lPt @@ -47059,12 +49478,12 @@ jQS jPH lPt xQE -aZH -aZH -aZH +xbc +qHn +uOB kvR aZH -aZH +kzM aZH boX hts @@ -47165,11 +49584,11 @@ hts aNJ fPn gQr -kqG -bRO -bRO -bRO -xAr +uJd +ePr +ePr +ePr +kru lUg ijK ijK @@ -47196,17 +49615,17 @@ xpR xpR ezV oEJ -tjx -cfF -tjx +psc +xSx +hCU gvU bnA jES mfd -eLM -oDh -oDh -oDh +rwl +qIl +qIl +qIl seT seT jgk @@ -47217,34 +49636,34 @@ mbJ jCI jCI seT -vGL -ppz -jmn +iJX +sQK +llM duL -qXn -jmn -kce -jmn -cbU +qrd +oxb +bmn +oxb +xdj lEO -bEC -bEC -bEC -bEC -bEC -bKZ -pDn -pDn -pDn -pDn -pDn +kWj +uuJ +uuJ +uuJ +qBZ +xDT +adq +adq +adq +adq +adq +adq pDn -lTl pDn quC fVD ycY -hTA +rlE dCu xQE huZ @@ -47253,9 +49672,9 @@ diK orw lPt xQE -aZH -aZH -aZH +vPA +mPi +xle kvR kvR kvR @@ -47359,11 +49778,11 @@ hts aNJ fPn gQr -kqG -bRO -bRO -bRO -kqG +uJd +ePr +ePr +ePr +uJd xRG upw ijK @@ -47390,15 +49809,15 @@ ryW wtR kOt oEJ -tjx -cfF -tjx +rcw +uxd +tpv mOg bnA suR pFE ctG -nGt +bxZ nTA qer eDv @@ -47411,9 +49830,9 @@ hcm htM ejn wxj -vGL -vHM -mMA +sRC +rAL +idR qJj qJj qJj @@ -47423,16 +49842,16 @@ qJj qJj jYD wtk -pUB -uuJ -uuJ -gnV -uuJ -uuJ -uuJ -uuJ -uuJ +oEn +puD +lkp +lGX +aoz +kWj +kWj uuJ +puD +kWj mSp mSp mUM @@ -47447,9 +49866,9 @@ dRL uTM gew xQE -aZH -aZH -aZH +not +btA +uOB kvR aZH aZH @@ -47550,14 +49969,14 @@ rSz cPC flY hts -aNJ +tZg fPn gQr -tqn -kqG -kqG -kqG -tqn +lfV +uJd +uJd +flg +lfV ePr dZW ijK @@ -47584,9 +50003,9 @@ rhW bzl ecv oEJ -tjx -cfF -cfF +bfD +onn +ayP gvU aBQ ovT @@ -47605,9 +50024,9 @@ hcm dvv wbN wxj -vGL -jSg -neY +sRC +nxj +tCH qJj tAa ewS @@ -47641,14 +50060,14 @@ qXZ npD eRO xQE -aZH -aZH -aZH -kvR -aZH -aZH -aZH -boX +fVk +ryu +rRx +wip +qLM +qfm +fbv +iLc hts hts hts @@ -47744,7 +50163,7 @@ hts hts hts hts -aNJ +tZg fPn gQr fPn @@ -47778,8 +50197,8 @@ tnA dho ukE oEJ -tjx -cfF +bfD +ffC wmH gvU qKi @@ -47799,9 +50218,9 @@ tMB wjP eJU wxj -vGL -nbs -jTq +sRC +uzS +mNU qJj xhx hak @@ -47810,7 +50229,7 @@ uWP nlf wcM mBg -sEE +otZ bCi rXS uad @@ -47835,14 +50254,14 @@ fTQ ekC jPH xQE -kvR -kvR -kvR -kvR aZH +mPi +uOB +kvR aZH +xYx aZH -boX +iLc hts hts hts @@ -47938,7 +50357,7 @@ hts hts hts hts -aNJ +tZg fPn gQr gQr @@ -47972,8 +50391,8 @@ lWl sEw kra oEJ -tjx -cfF +bfD +ffC kug gvU mfb @@ -47993,9 +50412,9 @@ sXb jNW tJO wxj -vGL -lIK -jmn +sRC +qiR +rzX qJj dGm hak @@ -48029,14 +50448,14 @@ xbV jPH jPH xQE -aZH -aZH -aZH +kvR +eRT +tDc kvR aZH -aZH -aZH -boX +bZB +jMc +iLc hts hts hts @@ -48132,7 +50551,7 @@ hts hts hts hts -aNJ +tZg fPn fPn wCD @@ -48166,9 +50585,9 @@ oEJ qRB oEJ oEJ -tjx -cfF -tjx +rcw +svp +pIV gvU srv srv @@ -48176,10 +50595,10 @@ srv gvU dTI nGt -twy -jmn -jmn -jmn +afH +fKg +tkF +ivQ wxj dwG uLV @@ -48187,9 +50606,9 @@ hRp gWM hAM wxj -vGL -lIK -xyS +wtd +llM +sgF nkk uOf hak @@ -48197,10 +50616,10 @@ wmv tJR aNf wcM -qje -oYL -jyc -dKj +prJ +rcT +wwa +xMv mow yfI oYL @@ -48223,11 +50642,11 @@ xQE xQE xQE xQE -aZH -aZH -aZH +qCZ +mPi +uOB kvR -aZH +fMC aZH boX boX @@ -48360,9 +50779,9 @@ ovn lcP nHf xcp -cfF -cfF -ojG +xEu +gAu +sgI gvU afs afs @@ -48370,10 +50789,10 @@ afs gvU duL nmD -wHJ -jmn -jmn -jmn +eMN +fKg +rzB +fjV wxj xlM aFc @@ -48381,45 +50800,45 @@ qGs uVe kRx wxj -vGL -lIK -cWD +sRC +llM +wxl qJj vww oBO lXo oZc -saC +dAp qJj -poO -rDL -qTw +fhT +jlQ +wBH xMv -mBg +rcy ado -tqn -nnS -nnS -kqG -qtm +nCc +gLP +gLP +fRK +nCc tRb tRb -aZH -aZH -baW -jJQ -jJQ -iOK -jJQ -foE -jJQ -jJQ +wZP +wZP +sUz +kBr +oqO +ciF +dSo +bCs +dSo +ndz aFW kvR -aZH -aZH -aZH -aZH +fMC +hkF +aVu +uOB kvR aZH aZH @@ -48524,7 +50943,7 @@ aNJ fPn fPn wCD -iVx +maq rTe ngW uBL @@ -48537,7 +50956,7 @@ bcK nSw rqL dAV -qJx +ceE tDH sZQ qXw @@ -48564,10 +50983,10 @@ gvU gvU kcD vcc -nle -jmn -jmn -jmn +sFw +rzB +rzB +rSX wxj nDl aqk @@ -48575,9 +50994,9 @@ vtG tAT hYi wxj -gRV -duL -duL +fNy +dSr +dSr qJj qJj qJj @@ -48585,35 +51004,35 @@ qJj qJj qJj qJj -lkt -liy -xJo +poO +rDL +qTw xMv wek tcJ -ggs -bRO -bRO -bRO -bKr -aZH -aZH +fRK +foC +foC +foC +fRK +wGP +seJ gli dln iqZ xJE -gUQ -tmY -aZH -xjy -aZH -aZH -aZH -kvR -aZH -aZH -aZH -aZH +bCf +uEc +iho +jFP +iho +uEL +xtc +nWv +fpZ +fpZ +iFb +xle kvR aZH aZH @@ -48730,10 +51149,10 @@ rrR rYi bnI rqL -hIa -spg -kKv -bda +nPv +lxS +xKM +dGr qXw vQt eLI @@ -48741,7 +51160,7 @@ yky jhD qXw dlV -tsx +lzB agJ gsb rZl @@ -48758,10 +51177,10 @@ qva duL byt kgi -hIZ -jmn -jmn -jmn +udK +rzB +rzB +rSX wxj wxj wxj @@ -48769,45 +51188,45 @@ wxj wxj wxj wxj -vGL -duL -hal -cNa -aLS -aLS +sRC +dSr +daq +pmh +hUa +hUa xMv dTF jJf xMv -xMv -xMv -xMv -xMv +aHm +mjr +mjr +fha coC rjC -ggs -bRO -bRO -bRO -jfV -aZH -aZH +cWu +foC +foC +foC +fRK +wGP +seJ gli hwM rZB oaW -aZH -fdb -aZH -xjy -aZH -aZH -aZH -jTc -aZH -aZH -aZH -aZH +cpq +dZD +iho +jFP +iho +iho +uOB +nog +iho +nIL +mDm +tNc boX boX boX @@ -48909,12 +51328,12 @@ hts hts hts hts -kLI -kLI +vKm +vKm wCD wCD vuh -aDW +qJK eXp wCD uNX @@ -48935,8 +51354,8 @@ hSH ohk eaQ ohk -pXl -pbq +ohk +fUz cBv iTq ske @@ -48952,59 +51371,59 @@ anz uIg tzk sBW -omf -hHl -hHl -hHl -duL -jmn -jmn -jmn -jmn -jmn -jmn -vGL +iif +mKw +mKw +mKw duL -qMk -bFh -lIK -vaX +vAK +gOZ +urK +jXZ +imJ +jXZ +ycQ +dSr +pgc +nky +sPB +vfH xMv xlg ozO fha -fxF -nIc -gRG -nIc +gvn +cnQ +cnQ +cnQ ivA wwF -ggs -bRO -bRO -bRO -bKr -aZH -aZH +gLP +foC +foC +foC +kwZ +wGP +seJ gli gEI oyt aey -aZH -fdb -aZH -xjy -aZH -aZH -aZH +cpq +dZD +iho +jFP +iho +iho +uOB kvR -aZH -aZH +eln +rRJ boX boX boX -kLI -kLI +vKm +vKm hts hts hts @@ -49103,10 +51522,10 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm wCD wCD wCD @@ -49150,55 +51569,55 @@ aIX les les les -kKS -les -les -jRZ -les -les -les -kud -duL -uht -lIK -frN -vyv +qBl +wSV +sQu +rPS +sQu +sQu +sQu +wZD +xdU +qPr +sPB +lDC +xhs xMv ozO ozO ozO lHr -aCC -wYf +ohj +uur wQZ wOQ xrU -tqn -kqG -kqG -kqG -qtm -aZH -aZH +nCc +fRK +fRK +fRK +nCc +wGP +seJ gli gli gli gli -pkG -dzb -aZH -xjy -aZH -aZH -aZH +iTu +crA +iho +nFx +cUW +cUW +tNc boX boX boX boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -49297,14 +51716,14 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm bxl bxl bxl @@ -49341,19 +51760,19 @@ mkf eBS lIK nSu +xKC lIK lIK lIK -bxt -lIK -lIK -nkK -iQg -hWi -lIK -lIK -duL -uht +cLR +sQR +mBu +kbD +kdb +oxb +rzX +dSr +mJs dSr dSr dSr @@ -49367,32 +51786,32 @@ xMv xMv qje klp -sWM -gWB -gWB -gWB -gWB -gWB -gWB -gWB -gWB -lpG -jPu -gWB -rly -qLM -mWP -boX +gBt +qgQ +iQM +qgQ +qgQ +pSx +pbS +wjI +dpW +tLI +jPh +fkD +iBN +lGn +nfi boX +iLc +iLc boX -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -49491,17 +51910,17 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm bxl bxl bxl @@ -49540,14 +51959,14 @@ eeE eeE eeE eeE -jmn -yeQ -qXn -nNl +cLR +wuV +mVr +iww dSr dSr dSr -fdR +yku dSr aeM aeM @@ -49567,8 +51986,8 @@ boX boX boX boX -aZH -aZH +vOZ +kvR kvR kvR kvR @@ -49577,16 +51996,16 @@ nSY boX boX boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -49685,168 +52104,106 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -ajb -ajb -kKe -iDj -puw -kKv -jce -rNx -gxy -uvG -soB -aPu -kqv -jHh -qmQ -oAc -wFz -aaz -wFz -cdB -rqO -nhA -nhA -nhA -nhA -nhA -iHT -mkf -sFw -eeE -fEL -pWj -sOl -vsg -itp -eeE -duL -qgT -duL -duL -dSr -wJc -wJc -boW -wNv -aeM -aeM -xMv -buh -fMj -aoH -rel -wdV -eSZ -lCR -wJN -wFH -uxB -qyp -kLI -kLI -kLI -boX -aZH -aZH -kvR -aZH -jsj -hvz -rot -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -qVH -qVH -qVH -qVH -qVH -qVH -qVH -qVH -hts -hts -hts -hts -hts -hts -hts -hts -hts -"} -(104,1,1) = {" -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +ajb +ajb +kKe +iDj +puw +kKv +jce +rNx +gxy +uvG +soB +aPu +kqv +jHh +qmQ +oAc +wFz +aaz +wFz +cdB +rqO +nhA +nhA +nhA +nhA +nhA +iHT +mkf +sFw +eeE +fEL +pWj +sOl +vsg +itp +eeE +duL +qgT +duL +duL +dSr +gNl +gNl +iTv +wNv +aeM +aeM +xMv +buh +fMj +aoH +rel +wdV +eSZ +lCR +wJN +wFH +uxB +qyp +qLK +qLK +qLK +boX +aZH +aZH +kvR +qCZ +fTd +lsr +bSN +boX +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +hts +hts +hts +hts hts hts hts @@ -49854,6 +52211,15 @@ hts hts hts hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +hts hts hts hts @@ -49862,6 +52228,14 @@ hts hts hts hts +"} +(104,1,1) = {" +hts +hts +hts +hts +hts +hts hts hts hts @@ -49880,18 +52254,63 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +hts +hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +hts +hts +hts +hts +hts +hts +hts +hts +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm ajb jzo lBf @@ -49908,7 +52327,7 @@ snz wFz deo ebW -duQ +oKH pWE vjK cdB @@ -49928,14 +52347,14 @@ dlM eyC okn eeE -gZp -ooG -jmn +fOh +agS jmn +xOQ dSr -bcI -bcI -boW +iNF +iNF +iTv jVl iNF iNF @@ -49951,29 +52370,29 @@ nJy kSy don qyp -kLI -kLI -kLI +qLK +qLK +qLK boX aZH aZH kvR qUd -bcZ -aZH -aZH +cbT +qCZ +qCZ boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50031,16 +52450,17 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH qVH qVH qVH -xPj +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50075,17 +52495,16 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm ajb aOc iaY @@ -50114,7 +52533,7 @@ oDY mkf mkf mkf -sfl +eGv eeE akq jPv @@ -50122,14 +52541,14 @@ tPg dHJ ukx eeE -jmn -yeQ -jmn +cLW +lUO +xOQ neY dSr iNF vjz -jzL +ern iNF qSS iNF @@ -50145,7 +52564,7 @@ cis xSH cis sEr -kLI +qLK mRB mRB boX @@ -50153,19 +52572,19 @@ aZH aZH kvR gUQ -tmY -aZH -aZH -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +oqK +qCZ +qCZ +iLc +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50225,12 +52644,13 @@ hts hts hts hts -hts -hts -hts qVH qVH -jKj +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50271,22 +52691,21 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +vKm +vKm ajb oYt sic iDj puw mYy -kLI +qLK mRB mRB mRB @@ -50300,30 +52719,30 @@ upo eTw rrk kqv -sZU +pko sZU rdE jSS -sjV -sZU -sZU -kbi -gFh +cDs +gZB +jro +gho +uoU eeE haJ nuU uGl fFC okn -eeE +cZw jmn -hGh -vYS -vYS +deU +aEx +aEx cxc nzi feJ -kRs +xFb bXy vZE hCF @@ -50339,25 +52758,25 @@ hJT lFA iOu sEr -kLI +qLK mRB mRB boX boX boX boX +vbC +wSD +qCZ aZH -bcZ -aZH -aZH -boX -kLI -kLI -kLI -kLI -kLI -kLI -kLI +iLc +vKm +vKm +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50419,9 +52838,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50468,21 +52888,20 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm ajb ajb bha iDj puw mYy -nqw -hYb -hYb +gcu +hmr +hmr mRB mRB bRO @@ -50492,17 +52911,17 @@ lKY upo nJI pWE -vjK +nLw kqv -sZU +nUF sZU gQE jSS -upY -pyY -pyY -pyY -mvW +ngM +gnK +epT +gnK +jCm eeE jjq pWj @@ -50510,16 +52929,16 @@ kWr lGL ljd eeE +xOQ +lUO +nyD jmn -yeQ -duL -duL dSr gyX hCF +sXU bpe hCF -hCF gyX xMv foC @@ -50537,19 +52956,19 @@ rgm mRB mRB mRB -tAx -hYb +vly +hmr boX pkG -qfW +riD aZH aZH -boX -kLI -kLI -kLI -kLI -kLI +iLc +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -50613,9 +53032,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50663,23 +53083,22 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm mYy kKv gaL xKM kup mYy -tAx -kLI -tAx -hEu -kLI -kLI +vly +vKm +ofc +stR +qLK +qLK cdB eTw qLm @@ -50688,15 +53107,15 @@ wFz aaz wFz kqv -sZU -nRU -tjA +nUF +qFn +nUF jSS -mbT +rlm sZU -sZU -vKw -vFZ +nUF +iYj +ikB eeE iDV eeE @@ -50704,11 +53123,11 @@ eeE eeE eeE eeE -hBW -rGd -kKS -les -mpR +het +cUX +cIV +yei +usF dSr dSr dSr @@ -50728,21 +53147,21 @@ xEX ajJ vjy sgm -kLI -kLI -kLI -tAx -kLI +qLK +qLK +qLK +vly +vKm boX -paT -bcZ +aZH +cbT aZH aZH boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -50807,9 +53226,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -50857,23 +53277,22 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm mYy kKv kKv kKv puw mYy -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK cdB upo rrk @@ -50884,29 +53303,29 @@ qMT kqv jSS jSS -eiy +gYG jSS -hAB sZU sZU sZU -hzg -pCZ -vCf +nUF +dhF +czC +fQU eIt -pPp -pPp -pPp -pPp -pPp -oUm -bRv -pPp -sKs -xWO -jmn -jmn +sLY +sLY +sLY +sLY +sLY +cdw +sLY +sLY +axi +weB jmn +vxb +xOQ jmn jmn xMv @@ -50921,22 +53340,22 @@ bmr knD lHw vjy -kLI -kLI -kLI -kLI -kLI -yfj +qLK +qLK +qLK +qLK +qLK +uec boX eNw -bcZ -aZH +cbT aZH +qCZ boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -51001,9 +53420,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51051,23 +53471,22 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm mYy -kKv +utU kKv kKv puw mYy -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK cdB kqv snz @@ -51076,17 +53495,17 @@ kqv kqv kqv kqv +bCj +bCj sZU -sZU -tjA -sZU +aZe +nUF sZU sZU -sZU -sZU -sjV -rCK -jGV +xzS +dvX +sFF +sEm ykb ykb ykb @@ -51096,16 +53515,16 @@ ykb ykb ykb ykb -cAj -dBD -cfP -cfP -cfP -cfP -eLJ -ghD +uOE +gIq +sYe +hyf +hyf +bvi +npB +oYE jmn -vIf +exM aoH rel wdV @@ -51115,22 +53534,22 @@ dWR dIL dWR jOy -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK boX mJJ -bcZ -aZH -aZH +cbT +qCZ +qCZ boX -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -51195,9 +53614,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -51213,7 +53629,11 @@ qVH qVH qVH qVH -cbd +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51246,60 +53666,59 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH sNN sNN sNN xHm iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB hfN -tjA -tjA -tjA -tjA -tjA +sZU +sZU +svt +sZU +sZU eiy -tjA -tjA -tjA -tjA -tjA -vhr -hKO -hKO -ubz +ruP +ruP +ruP +ruP +ruP +meq +rIp +rIp +kOM pNZ -hfN +pWo ykb qRq dKd -eNo +apQ clx eTm jYW vsH ckt -hMg -wqV -duL -dPp -eFg -xgk -lIK +iKz +wwM +rzB +rzB +rzB +hhL +rzB dlT mMA -vIf +exM aoH rel mWn @@ -51309,21 +53728,21 @@ omr tVp ruU jOy -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz gkA aks gkA gkA qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -51389,9 +53808,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51440,25 +53860,24 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH gSn hbs qWZ lCr iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB jGV -tjA +sZU sZU sZU sZU @@ -51479,7 +53898,7 @@ ykb anf inF iMN -iMN +mSU mur hTc xof @@ -51490,10 +53909,10 @@ hcs hcs hcs hcs -lIK +rzB kaA jmn -vIf +exM aoH bsN xxR @@ -51503,21 +53922,21 @@ dWR dWR dWR jOy -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz aIl hyj gQY bId qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -51583,9 +54002,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -51597,7 +54013,11 @@ qVH qVH qVH qVH -fJR +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51634,28 +54054,27 @@ hts hts hts hts -hts -kLI -kLI -kLI -iTH +vKm +vKm +vKm +iHt gSn hbs qWZ wEL iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB -kbi -gWH +gMX +nYU +nYU sZU sZU -eiY fRg qbF maL @@ -51663,7 +54082,7 @@ trr lEx brA fRg -pQT +hyv ogP nnd uDq @@ -51684,7 +54103,7 @@ fNA tWH nWJ hcs -lIK +rzB kaA duL mvV @@ -51697,21 +54116,21 @@ ufQ dKO jmB kMa -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz fMc ePF gQY bId -qUz -kLI -kLI -kLI +lZb +vKm +vKm +vKm hts hts hts @@ -51777,9 +54196,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -51829,35 +54249,34 @@ hts hts hts hts -hts -kLI -kLI -iTH +vKm +vKm +iHt qWZ qWZ qWZ qWZ iTH -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK dOB -sZU -gxA +llF +nYU +nYU sZU sZU -eiY fRg -rkT +mgF fST kXb jHp uXT fRg -pQT +hyv ogP nnB kSB @@ -51876,12 +54295,12 @@ wbh rVy rVy tWH -jjl +iVI hcs -lIK +rzB kaA jmn -jmn +xOQ aoH vNL rEO @@ -51891,20 +54310,20 @@ tWn qMJ lxh kMa -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK qUz hkE jqL cRv cRv -qUz -kLI -kLI +lZb +vKm +vKm hts hts hts @@ -51971,12 +54390,13 @@ hts hts hts hts -hts -hts -hts qVH qVH -tvN +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52023,24 +54443,23 @@ hts hts hts hts -hts -kLI -kLI -iTH +vKm +vKm +iHt qWZ qWZ qWZ qWZ iTH -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK dOB -sZU -gxA +wvi +hRe sZU rBj rBj @@ -52051,7 +54470,7 @@ iaq dIo xPl fRg -pQT +hyv ogP lKv bzk @@ -52072,10 +54491,10 @@ ciy uiO lBE hcs -lIK +rzB vbN jTq -jmn +xOQ aoH rel wdV @@ -52085,20 +54504,20 @@ oEd boo oEd fMb -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK qUz ezh ocU cRv cRv -qUz -kLI -kLI +lZb +vKm +vKm hts hts hts @@ -52165,9 +54584,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52217,24 +54637,23 @@ hts hts hts hts -hts -kLI -kLI +vKm +vKm iTH iTH qOK qWZ qWZ iTH -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK dOB -sZU -gxA +eiY +noG xuL rBj jpm @@ -52245,7 +54664,7 @@ vjg kXb xPl fRg -pQT +wvI ogP ogP ikv @@ -52266,10 +54685,10 @@ woy vuM jLZ qpu -dIv -nqj -jmn +sAe +rtm jmn +egB aoH rel wdV @@ -52279,20 +54698,20 @@ aeR kxX qRn fMb -kLI -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +qLK +qLK qUz cRv cRv mxh qUz qUz -kLI -kLI +vKm +vKm hts hts hts @@ -52359,9 +54778,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52412,24 +54832,23 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH qWZ qWZ iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB -gZV -gxA -tjA +eiY +noG +sZU rBj jpm fRg @@ -52439,11 +54858,11 @@ fRg muu muu fRg -pQT -gfI -sgT -gqh -tFl +hyv +slf +dQg +mIZ +eOH woz lnQ ofn @@ -52455,12 +54874,12 @@ maT qwv qjX wbh -vXV +oIh eoL tKk eZY hcs -lIK +rzB bxu jmn jmn @@ -52473,19 +54892,19 @@ oEd oEd oEd fMb -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz bNf bNf qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -52553,9 +54972,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52606,23 +55026,22 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH hfr hfr iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB -sZU -gxA +gsq +noG uaw rBj ixX @@ -52633,11 +55052,11 @@ jVR ahT nZd rBj -eZW -rTc -wUU -bfO -rfS +xju +wAO +jSS +jSS +jSS ykb ykb ykb @@ -52654,7 +55073,7 @@ oEH aDY lnO hcs -qgu +kgM duL duL duL @@ -52667,19 +55086,19 @@ iPo lvs vQx hmh -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz uKh uKh qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -52747,9 +55166,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -52767,17 +55183,21 @@ qVH qVH qVH qVH -vnE qVH qVH qVH -fSl qVH qVH qVH qVH qVH -vnE +qVH +qVH +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52800,23 +55220,22 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm iTH iTH iTH iTH -kLI -kLI +qLK +qLK mRB mRB mRB -kLI +qLK dOB vKw -xMr +fOw rdq rBj jTh @@ -52827,12 +55246,12 @@ rBj rBj rBj rBj -tjA -eLj -jSS -jSS -jSS +ruP +oWU jSS +dnN +waB +hZB aUc aUc aUc @@ -52848,7 +55267,7 @@ hcs hcs hcs hcs -sxY +jue mMA bGg xvb @@ -52861,19 +55280,19 @@ bIt wMe rib hmh -kLI +qLK mRB mRB mRB -kLI -kLI +qLK +qLK qUz qUz qUz qUz -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -52941,9 +55360,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -52954,7 +55370,11 @@ qVH qVH qVH qVH -dwL +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -52995,22 +55415,21 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm +vKm +vKm +vKm +vKm dOB sZU -ovF +muP jSS rBj nNS @@ -53018,15 +55437,15 @@ rBj rBj rBj rBj -sZU -sZU -sZU -tjA -hie +jDQ +nWb +nJT +ruP +aQM jSS -dnN -waB -hZB +xvV +sZU +xeW aUc aUc aUc @@ -53037,12 +55456,12 @@ aUc aUc aUc jUZ -gCq -jmn -jmn -jmn +rca +rzB +bAM +rzB duL -iqJ +fnS jmn bGg blj @@ -53055,18 +55474,18 @@ iFr nTC iFr gmv -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts @@ -53135,9 +55554,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53189,38 +55609,37 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm +vKm +vKm +vKm +vKm dOB sZU -rHw -pJI +xok +hhm wWg -hxA -wNx -bwO -wNx +bxe +aHG +oLx +aHG eZF -wNx -wNx -wNx -wNx -uSU +bCQ +lKg +ecO +bCQ +nXi jSS +jOi xvV -sZU -xeW +cIf aUc aUc aUc @@ -53231,15 +55650,15 @@ aUc aUc aUc jUZ -gCq -jmn -jmn -jmn +rca +rzB +rzB +rzB duL -iqJ -lIK -lIK -xgk +fnS +rzB +rzB +hhL aoH rel wdV @@ -53249,18 +55668,18 @@ sWt hOD gWY gmv -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts @@ -53329,9 +55748,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53383,19 +55803,18 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI -kLI -kLI -kLI -kLI +qLK +vKm +vKm +vKm +vKm +vKm +vKm dOB dOB dOB @@ -53403,35 +55822,35 @@ dOB dOB sZU sZU -jWH +fDM ulZ -dOB -dOB -dOB -dOB -ppi -lTJ jSS -jOi -xvV -cIf -flI +jSS +jSS +jSS +ruP +way +jSS +jSS +jSS +jSS +hpi aac -flI -flI -flI -flI -flI +hpi +hpi +hpi +hpi +hpi aac -flI +hpi duL -ryt -pHr -vYS -sAd -sUr -eWN -jTq +xwn +wER +aEx +kWq +kqX +cNB +etH jmn aoH aoH @@ -53443,18 +55862,18 @@ gmv gmv gmv gmv -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI +qLK +vKm +vKm hts hts hts @@ -53523,9 +55942,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53577,78 +55997,77 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI -kLI -hts -kLI -kLI -kLI -kLI -kLI -kLI +qLK +vKm +vKm +vKm +hts +vKm +vKm +vKm +vKm +vKm +vKm dOB +gsq sZU -sZU -jWH +fDM xuL -dOB -kLI -kLI -vYd -thb -mJX -non -non -non -non -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -jUZ -sFw -cbU -jmn -qXn +jSS +mdN +oWw +rDv +qQa +dGE +qQa +qzk +qQa +pzY +rop +rop +rop +rop +rop +rop +rop +rop +rop +jzn +eEe +aWF +gsc +tKs duL mYR -kce -jmn +yjY +xOQ jzV rui mAb cQJ dPv fkN -kLI -kLI -kLI -kLI -kLI -kLI -hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm +vKm +hts +vKm +vKm +vKm +qLK mRB mRB -kLI -kLI -kLI +qLK +vKm +vKm hts hts hts @@ -53717,9 +56136,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -53731,7 +56147,11 @@ qVH qVH qVH qVH -gAR +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53771,51 +56191,50 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm dOB sZU vKw -exX +doK hfN -dOB -kLI -kLI -vYd -thb -mJX -oWw -oWw -oWw -non -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -aUc -jUZ -sFw -kce -cjs +jSS +mdN +mdN +rDv +qQa +dGE +qQa +qQa +qQa +qQa +rop +rop +rop +rop +rop +rop +rop +rop +rop +rzB +eEe +yjY +dGK qGT sVu sVu @@ -53827,22 +56246,22 @@ mAb rui kRB fkN -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm hts hts hts -kLI -kLI -kLI -kLI -kLI -kLI -kLI -kLI +vKm +vKm +qLK +qLK +qLK +qLK +vKm +vKm hts hts hts @@ -53911,9 +56330,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -53967,47 +56387,46 @@ hts hts hts hts -hts -kLI -kLI -kLI -kLI -kLI +qLK +qLK +qLK +qLK +vKm hts hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm dOB sZU -kbi -eLY +wvi +mwQ jGV -dOB -kLI -kLI -jmt -thb -mJX +jSS oWw +mdN +mKW oWw -iOy +iDw +xWg +snV +dhy non -flI +nEo aac -flI -flI -flI -flI -flI +nEo +nEo +nEo +nEo +nEo aac -flI +nEo duL -sFw +eEe svf svf svf @@ -54021,20 +56440,20 @@ gXV xxC kRB fkN -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +qLK +qLK +qLK +qLK hts hts hts @@ -54105,9 +56524,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54139,7 +56555,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54162,10 +56581,10 @@ qVH qVH qVH hts -kLI +qLK mRB mRB -kLI +qLK hts hts hts @@ -54173,23 +56592,23 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm dOB jSS jSS fKs jSS -dOB -kLI -kLI -jmt -thb -hEd -tuk -vOB -tXw +jSS +non +oWw +xeG +oWw +gQD +kbP +bIg +fWc non aUc aUc @@ -54201,7 +56620,7 @@ aUc aUc aUc jUZ -sFw +eEe svf kQm bmj @@ -54215,9 +56634,9 @@ cvn rui wmT fkN -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -54225,10 +56644,10 @@ hts hts hts hts -kLI +vKm mRB mRB -kLI +vKm hts hts hts @@ -54299,12 +56718,8 @@ hts hts hts hts -hts -hts -hts qVH qVH -ccc qVH qVH qVH @@ -54314,26 +56729,30 @@ qVH qVH qVH qVH -clr qVH qVH qVH qVH qVH -dwL qVH qVH qVH qVH -dwL qVH qVH qVH qVH -dwL qVH qVH -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -54356,10 +56775,10 @@ qVH qVH qVH hts -kLI +qLK mRB mRB -kLI +qLK hts hts hts @@ -54367,23 +56786,23 @@ hts hts hts hts -kLI -kLI -kLI -dOB -sZU -sZU -jWH -sZU +vKm +vKm +vKm dOB -kLI -kLI -vYd -thb -thb +mWs +lfC +dQn +xQx +ulZ +non +oWw +rDv +mdN +oWw jjn lnZ -mJX +dGE non aUc aUc @@ -54395,7 +56814,7 @@ aUc aUc aUc jUZ -sFw +eEe svf kQm bmj @@ -54409,9 +56828,9 @@ nnx sHu tTX fkN -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -54419,10 +56838,10 @@ hts hts hts hts -kLI +vKm mRB mRB -kLI +vKm hts hts hts @@ -54493,9 +56912,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54527,7 +56943,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54550,10 +56969,10 @@ qVH qVH qVH hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54561,18 +56980,18 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm dOB +dNL +sZU +sZU sZU sZU -jWH -ulZ -dOB -kLI -kLI -goG +nkE +nkE +nkE nkE nkE nkE @@ -54589,7 +57008,7 @@ aUc aUc aUc svf -wNj +xor wjd kQm bmj @@ -54603,9 +57022,9 @@ rui mWO sNY fkN -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -54613,10 +57032,10 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54687,9 +57106,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54721,7 +57137,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54744,10 +57163,10 @@ qVH qVH qVH hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54756,20 +57175,20 @@ hts hts hts hts -tAx -kLI +ofc +vKm dOB -sZU -vKw -dkZ -xuL -dOB -kLI -kLI -goG +uGx +nYU +nYU +nYU +nYU nkE cOp cOp +cOp +cOp +cOp nkE mJX non @@ -54797,8 +57216,8 @@ oce dMZ mBy fkN -kLI -xQM +vKm +eoW hts hts hts @@ -54807,10 +57226,10 @@ hts hts hts hts -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -54881,9 +57300,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -54915,7 +57331,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -54939,8 +57358,8 @@ qVH qVH hts hts -kLI -kLI +vKm +vKm hts hts hts @@ -54950,18 +57369,18 @@ hts hts hts hts -tAx -kLI +ofc +vKm dOB -sZU -kbi -eqX -sZU -dOB -kLI -kLI -goG +lqL +oNH +wqf +vFR +hFb +nkE mRV +cOp +cOp tCN rBy nkE @@ -54991,8 +57410,8 @@ flG xjK ayM fkN -kLI -xQM +vKm +eoW hts hts hts @@ -55002,8 +57421,8 @@ hts hts hts hts -kLI -kLI +vKm +vKm hts hts hts @@ -55075,12 +57494,8 @@ hts hts hts hts -hts -hts -hts qVH qVH -ejw qVH qVH qVH @@ -55109,7 +57524,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -55133,8 +57552,8 @@ qVH qVH hts hts -kLI -eDd +vKm +inW hts hts hts @@ -55144,18 +57563,18 @@ hts hts hts hts -tAx -jDF -dOB -gZV -vhr -orC -bEU +ofc +mbj dOB -kLI -kLI -bCc +bym +svA +gaG +tqh +aoB +nkE sxM +cOp +cOp bFx nYN nkE @@ -55163,11 +57582,11 @@ jno sAl svf wXZ -tAJ +wau xXH svf aMb -uCD +npl acH svf svf @@ -55185,8 +57604,8 @@ flG xjK jKN fkN -kLI -xQM +vKm +eoW hts hts hts @@ -55196,8 +57615,8 @@ hts hts hts hts -kLI -kLI +vKm +vKm hts hts hts @@ -55269,9 +57688,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55281,7 +57697,6 @@ qVH qVH qVH qVH -sop qVH qVH qVH @@ -55303,7 +57718,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -55327,8 +57746,8 @@ qVH qVH hts hts -kLI -frk +vKm +qGi hts hts hts @@ -55339,16 +57758,16 @@ hts hts hts uDM -kLI -dOB -sZU -hNQ -sZU +vKm dOB -dOB -kLI -kLI -bCc +tFN +aEL +gaG +tqh +nYU +nkE +rEy +cOp cOp ncn nrk @@ -55368,18 +57787,18 @@ svf amt rTF pia -nMd +tkA fTa -kLI -kLI -kLI +vKm +vKm +vKm fkN fkN flG xjK xHC fkN -kLI +vKm fqv hts hts @@ -55390,8 +57809,8 @@ hts hts hts hts -frk -kLI +qGi +vKm hts hts hts @@ -55463,9 +57882,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55482,22 +57898,25 @@ qVH qVH qVH qVH -pwo qVH qVH qVH qVH qVH -xuZ qVH qVH qVH -pwo qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -55533,22 +57952,22 @@ hts hts hts uDM -kLI +vKm dOB sZU -gOz -sZU -cxK -kLI -kLI -hts -goG -rEy +svA +gaG +tqh +nYU +nkE +cOp +cOp +cOp gLT cOp nkE lTx -kcG +sFU svf svf prg @@ -55564,16 +57983,16 @@ iNH pia aNs fTa -kLI +vKm hts -kLI -kLI -vGw +vKm +vKm +pvA wzB xjK rvz fkN -kLI +vKm fqv hts hts @@ -55657,9 +58076,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55691,7 +58107,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -55727,47 +58146,47 @@ hts hts hts uDM -kLI +vKm dOB sZU -gOz -sZU +svA +gaG +dOB cxK -kLI -kLI -hts goG +bCc +bCc goG cOp wXY nkE thb -thb +fKM rgK lkz -tOR -cpc -cpc -cpc -tOR -rgM -cpc -cpc -cpc -cpc -fnG +fax +iPj +uny +iPj +cCQ +ijB +nZT +uHf +iPj +uEV +gnx nMd fTa -kLI +vKm hts -kLI -kLI -vGw +vKm +vKm +pvA oQC vfD dkc fkN -kLI +vKm fqv hts hts @@ -55851,9 +58270,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -55885,7 +58301,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -55921,14 +58340,14 @@ hts hts hts uDM -yfj +gIC dOB dOB dOB dOB dOB -kLI -kLI +vKm +vKm hts hts goG @@ -55938,30 +58357,30 @@ nkE thb thb svf -lMi -ofO -tAX -vHR -tAX -qZb -tAX -tAX -vHR -tAX -nGg -eZP -nMd +dHe +qgS +jdt +vNA +jdt +jdt +jdt +jdt +vNA +jdt +odi +dCT +aKS fTa hts hts -kLI -kLI +mRB +mRB fkN fkN fkN fkN fkN -eNC +oTr fqv hts hts @@ -56045,9 +58464,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -56072,14 +58488,17 @@ qVH qVH qVH qVH -xPj qVH qVH qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -56115,14 +58534,14 @@ hts hts hts uDM -kLI -kLI -tZK +vKm +vKm +eNd dOB dOB -kLI -kLI -kLI +vKm +vKm +vKm hts hts goG @@ -56132,30 +58551,30 @@ nkE vYd thb svf -dHe -qgS -jdt -vNA -jdt -jdt -jdt -jdt -vNA -jdt -odi -dCT -aKS +svf +svf +svf +svf +svf +svf +svf +svf +svf +svf +svf +mNk +fTa fTa hts hts -kLI -kLI -kLI mRB +vKm +vKm mRB -cil -kLI -kLI +mRB +ykn +vKm +vKm fqv hts hts @@ -56239,16 +58658,11 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH -scc qVH qVH -fLc qVH qVH qVH @@ -56263,7 +58677,6 @@ qVH qVH qVH qVH -xWA qVH qVH qVH @@ -56273,7 +58686,13 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -56309,14 +58728,14 @@ hts hts hts hts -cIh -cIh -cIh +pAq +pAq +pAq dOB dOB -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -56325,79 +58744,31 @@ lxL lxL vYd thb -svf -svf -svf -svf -svf -svf -svf -svf -svf -svf -svf -svf -mNk -fTa -fTa +oWw +non +cGt +oKu +lcs +uOu +uOu +oWC +non +oWw +dYk +oWw +oWw +vYd +vYd hts hts -kLI -kLI -kLI mRB +vKm +vKm mRB -cIh -cIh -cIh -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts -hts +mRB +pAq +pAq +pAq hts hts hts @@ -56405,8 +58776,6 @@ hts hts hts hts -"} -(138,1,1) = {" hts hts hts @@ -56436,6 +58805,57 @@ hts hts hts hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +"} +(138,1,1) = {" +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -56467,7 +58887,6 @@ qVH qVH qVH qVH -hts hts hts hts @@ -56504,13 +58923,13 @@ hts hts hts hts -kLI -kLI +vKm +vKm dOB dOB -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -56521,12 +58940,12 @@ vYd thb thb gGO -thb -vOl -vlS -uwR -uwR -mfc +ocZ +wch +qlX +bLg +bLg +ybY tNT fFt fFt @@ -56536,13 +58955,13 @@ vYd hts hts hts -kLI -kLI -kLI mRB mRB -kLI -kLI +mRB +mRB +mRB +vKm +vKm hts hts hts @@ -56627,9 +59046,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -56661,7 +59077,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -56698,11 +59117,11 @@ hts hts hts hts -kLI -kLI -hEu -kLI -kLI +vKm +vKm +syA +vKm +vKm hts hts hts @@ -56711,16 +59130,16 @@ hts vYd oWw fmX -mRB -uJw -mRB -mRB -mRB -lnZ -cKL -oWw -oWw -jjn +vYd +fEg +vYd +vYd +vYd +aHC +ixk +fmX +fmX +vYy vYd oWw oWw @@ -56732,11 +59151,11 @@ hts hts hts hts -kLI -kLI -hEu -kLI -kLI +vKm +vKm +syA +vKm +vKm hts hts hts @@ -56821,9 +59240,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -56834,7 +59250,6 @@ qVH qVH qVH qVH -vnE qVH qVH qVH @@ -56855,7 +59270,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -56892,11 +59311,11 @@ hts hts hts hts -kLI -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm +vKm hts hts hts @@ -56905,16 +59324,16 @@ hts vYd oWw fmX -ezJ -yao -jJz -bGD -mRB -gDQ -mLk -ikx -rnp -iOy +gwK +oWw +fmX +dLT +vYd +ocZ +bMq +wQL +lsc +usn vYd xVc xVc @@ -56926,11 +59345,11 @@ hts hts hts hts -frk -kLI -kLI -kLI -kLI +qGi +vKm +vKm +vKm +vKm hts hts hts @@ -57015,9 +59434,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -57049,7 +59465,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -57087,22 +59506,22 @@ hts hts hts hts -kLI -kLI -frk +vKm +vKm +qGi hts hts hts hts hts hts -jmt +jsZ fmX aZT -lHF -jJz -jJz -bGD +mZw +fmX +fmX +dLT hpx hpx rtC @@ -57121,9 +59540,9 @@ hts hts hts hts -kLI -kLI -kLI +vKm +vKm +vKm hts hts hts @@ -57209,9 +59628,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -57227,7 +59643,6 @@ qVH qVH qVH qVH -kUE qVH qVH qVH @@ -57243,7 +59658,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -57291,12 +59710,12 @@ hts hts hts vYd -jmt +jsZ vYd -mRB -eSE -hpx -hpx +vYd +jsZ +xqa +xqa hpx laL hKm @@ -57403,9 +59822,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -57437,7 +59853,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -57486,9 +59905,9 @@ hts hts hts hts -kLI -hEu -kLI +vKm +syA +vKm hpx lMM hpx @@ -57499,8 +59918,8 @@ aPf hpx yao oDh -kLI -hEu +vKm +syA hts hts hts @@ -57597,9 +60016,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -57679,10 +60099,9 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm hpx ebT hpx @@ -57693,8 +60112,8 @@ cqS wii xRi oDh -kLI -kLI +vKm +vKm hts hts hts @@ -57791,9 +60210,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -57873,10 +60293,9 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm hpx byF hpx @@ -57887,8 +60306,8 @@ hpx hpx oDh oDh -kLI -kLI +vKm +vKm hts hts hts @@ -57985,9 +60404,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58067,10 +60487,9 @@ hts hts hts hts -hts -kLI -kLI -kLI +vKm +vKm +vKm hpx dPl vwu @@ -58079,10 +60498,10 @@ wBN hmk pBx hpx -kLI -kLI -kLI -kLI +vKm +vKm +vKm +vKm hts hts hts @@ -58179,9 +60598,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58263,8 +60683,7 @@ hts hts hts hts -hts -kLI +vKm hpx dKA hpx @@ -58273,8 +60692,8 @@ ghL rgO qEO hpx -kLI -kLI +vKm +vKm hts hts hts @@ -58373,15 +60792,16 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH qVH qVH -kYz +qVH +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58457,8 +60877,7 @@ hts hts hts hts -hts -kLI +vKm hpx hpx hpx @@ -58467,8 +60886,8 @@ hpx hpx hpx hpx -kLI -kLI +vKm +vKm hts hts hts @@ -58567,9 +60986,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -58653,13 +61073,12 @@ hts hts hts hts -hts -whH -rlY +oee +igf aQU oNf -rlY -ilo +igf +ccq hts hts hts @@ -58761,16 +61180,12 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH qVH qVH qVH -hFk qVH qVH qVH @@ -58795,7 +61210,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -58955,9 +61374,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -58969,7 +61385,6 @@ qVH qVH qVH qVH -bUR qVH qVH qVH @@ -58989,7 +61404,11 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH +qVH hts hts hts @@ -59149,9 +61568,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -59183,7 +61599,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -59343,9 +61762,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -59377,7 +61793,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -59537,9 +61956,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -59625,9 +62045,8 @@ hts hts hts hts -hts -hEu -gyk +syA +efw hts hts hts @@ -59731,9 +62150,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -59819,9 +62239,8 @@ hts hts hts hts -hts -kLI -gyk +vKm +efw hts hts hts @@ -59925,9 +62344,10 @@ hts hts hts hts -hts -hts -hts +qVH +qVH +qVH +qVH qVH qVH qVH @@ -60013,9 +62433,8 @@ hts hts hts hts -hts -frk -lHx +qGi +fIL hts hts hts @@ -60119,9 +62538,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -60153,7 +62569,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -60313,9 +62732,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -60347,7 +62763,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts @@ -60507,9 +62926,6 @@ hts hts hts hts -hts -hts -hts qVH qVH qVH @@ -60541,7 +62957,10 @@ qVH qVH qVH qVH -hts +qVH +qVH +qVH +qVH hts hts hts diff --git a/maps/euthenia/levels/deck3.dmm b/maps/euthenia/levels/deck3.dmm index 96121a5110..87705be7a2 100644 --- a/maps/euthenia/levels/deck3.dmm +++ b/maps/euthenia/levels/deck3.dmm @@ -5,20 +5,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) -"aaO" = ( -/obj/machinery/door/airlock{ - name = "Pilot's Office"; - req_one_access = list(67) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/tether/exploration/pilot_office) "abz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -63,6 +49,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"adR" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "aen" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -70,6 +66,22 @@ /obj/structure/table/marble, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"aeD" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "engsec_ld_c"; + name = "CE Office Blast Doors"; + opacity = 0 + }, +/obj/effect/paint_stripe/sun, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/chief) "aeP" = ( /obj/structure/railing/grey{ dir = 1 @@ -105,6 +117,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"agk" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/medical/medbay3) "agK" = ( /obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloorblack{ @@ -115,10 +131,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) -"ahp" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/reinforced, -/area/space) "ahG" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -127,6 +139,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ahI" = ( @@ -141,6 +154,15 @@ "aje" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"ajw" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/welding/superior, +/obj/structure/closet/hydrant{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "akn" = ( /obj/structure/table/rack/shelf, /obj/effect/floor_decal/spline/fancy/wood{ @@ -180,6 +202,16 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/sleep/cryo) +"amo" = ( +/obj/machinery/door/window/brigdoor/northright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ana" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -189,6 +221,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"anH" = ( +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "aoh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -231,6 +266,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"arh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/girder, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "aro" = ( /obj/structure/table/standard, /obj/item/aiModule/oxygen, @@ -255,23 +301,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/port) -"ass" = ( -/obj/machinery/air_alarm/server{ - dir = 4; - pixel_x = -21 +"asc" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 }, -/turf/simulated/floor/bluegrid{ - initial_gas_mix = "n2=100;TEMP=80"; - name = "Mainframe Base" +/obj/machinery/camera/network/cargo{ + dir = 1 }, -/area/tcommsat/chamber) +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "asC" = ( /obj/machinery/holopad, /turf/simulated/floor/wood, /area/tether/exploration/pilot_office) -"asI" = ( -/turf/simulated/floor/tiled/techfloor, -/area/space) "ath" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -285,6 +327,7 @@ /obj/structure/sign/deck3{ pixel_y = -32 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "atE" = ( @@ -366,6 +409,12 @@ icon_state = "techmaint" }, /area/security/brig) +"awi" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/chapel/office) "awI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -382,10 +431,6 @@ /obj/machinery/computer/arcade, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"awX" = ( -/obj/machinery/holoplant, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "awY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -393,8 +438,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -417,8 +461,7 @@ /obj/item/storage/firstaid/toxin{ pixel_y = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/blue, @@ -435,6 +478,18 @@ /obj/item/beach_ball/holoball, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/brig) +"ayC" = ( +/obj/landmark{ + name = "lightsout" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "azA" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -447,15 +502,24 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"azN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "aAa" = ( /turf/simulated/floor/wood, /area/hydroponics/garden) +"aAu" = ( +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"aAx" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"aAJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) +"aBc" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "aBh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -463,15 +527,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"aBp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "aBU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -486,6 +541,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"aCu" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"aDc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "aDu" = ( /turf/simulated/wall/prepainted/science, /area/rnd/rdoffice) @@ -496,7 +568,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "aED" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -508,7 +583,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "aFl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -520,6 +595,12 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/medical/virology) +"aFm" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/hand_labeler, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "aFG" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -539,6 +620,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"aHl" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/mime, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "aHN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -603,7 +692,6 @@ }, /obj/structure/railing, /obj/structure/lattice, -/obj/machinery/door/firedoor, /turf/simulated/open, /area/main_map/maintenance/deck_three/forward/port) "aMR" = ( @@ -626,12 +714,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/exploration/pilot_office) -"aNP" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "aOa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -648,6 +730,13 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"aOu" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "aPr" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/nifsofts_medical, @@ -676,6 +765,22 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"aQi" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) +"aQt" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "aQw" = ( /obj/machinery/light/no_nightshift, /obj/structure/cable/green{ @@ -683,6 +788,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"aQX" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/medical/psych) "aSy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -692,6 +803,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"aTe" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "aTj" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -706,10 +821,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"aTt" = ( -/obj/structure/sign/hangar/three, -/turf/simulated/wall, -/area/main_map/Hangar_bay/deck2) "aTB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -722,6 +833,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"aTI" = ( +/obj/structure/cable/blue{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "aUl" = ( /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/wood, @@ -729,6 +846,11 @@ "aUy" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/pilot_office) +"aVb" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "aVt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -745,12 +867,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"aVx" = ( -/obj/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "aVF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 4 @@ -763,14 +879,6 @@ /obj/item/glass_jar, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"aVO" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "aWO" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -778,6 +886,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"aXg" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "aXJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -785,7 +900,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "aYm" = ( /obj/machinery/camera/network/security{ @@ -871,6 +986,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"baF" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/chapel/main) "baM" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -891,8 +1015,7 @@ /obj/effect/floor_decal/industrial/loading{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/black, @@ -924,6 +1047,15 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"bbH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "bcl" = ( /obj/item/toy/plushie/farwa, /turf/simulated/floor/reinforced, @@ -945,6 +1077,33 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"bdy" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"bdD" = ( +/obj/structure/cable/green{ + icon_state = "32-8" + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/machinery/door/firedoor, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/port) "bdO" = ( /obj/machinery/vending/wallmed1/public{ pixel_y = 28 @@ -976,6 +1135,12 @@ /obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"beO" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "beU" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1079,25 +1244,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"blw" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/floodlight{ - anchored = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/space) "bmd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1108,23 +1254,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/triumph/surfacebase/sauna) -"bmG" = ( -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"bmJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/space) -"bmN" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/space) "bnj" = ( /obj/machinery/holopad, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -1140,17 +1269,8 @@ }, /turf/simulated/floor/tiled, /area/medical/virologyaccess) -"boh" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) "boD" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -1182,15 +1302,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"bsb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "bsl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1201,29 +1312,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"bsz" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 +"bsC" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) +/turf/simulated/floor/carpet/bcarpet, +/area/chapel/main) "bsW" = ( /turf/simulated/wall, /area/tether/exploration/pilot_office) -"btL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) -"btT" = ( -/obj/machinery/disposal, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "bua" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1231,25 +1328,37 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"bve" = ( +"bus" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"buJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/floor_decal/borderfloorwhite/corner, -/obj/effect/floor_decal/corner/beige/bordercorner, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"buX" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "bvj" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/white, /area/medical/resleeving) "bwF" = ( /obj/machinery/recharge_station, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light/no_nightshift{ dir = 8 }, @@ -1289,13 +1398,17 @@ /obj/structure/table/woodentable, /turf/simulated/floor/carpet, /area/medical/psych_ward) -"bzA" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 8 - }, -/turf/simulated/open, +"bzp" = ( +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"bzx" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "bzD" = ( /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) @@ -1305,6 +1418,12 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) +"bAt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "bAz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -1355,14 +1474,24 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three/starboard) -"bCw" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plating, -/area/space) +"bDa" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 4 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "bDk" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward) +"bDr" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/medical/psych) "bDB" = ( /obj/item/trash/candle, /turf/simulated/floor/plating, @@ -1401,34 +1530,54 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"bEV" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 - }, -/obj/machinery/light/no_nightshift{ - dir = 8 +"bEM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) +"bEU" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/obj/landmark/spawnpoint/job/chief_engineer, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "bFs" = ( /obj/machinery/telecomms/processor/preset_one, /turf/simulated/floor/tiled/dark{ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"bFt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "bFK" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck3) +"bFU" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"bGp" = ( +/obj/machinery/door/airlock/maintenance/command, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward) "bHh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "bHk" = ( /turf/simulated/floor/tiled/techmaint, @@ -1446,6 +1595,12 @@ "bHz" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/chapel/main) +"bHI" = ( +/obj/structure/cable/blue{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "bHT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1514,6 +1669,12 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/vacant/vacant_shop) +"bJm" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/obj/structure/fans/tiny, +/turf/simulated/floor/airless/ceiling, +/area/space) "bJx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1526,6 +1687,27 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"bJU" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) +"bKz" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "bLA" = ( /obj/structure/table/standard, /obj/structure/bedsheetbin, @@ -1540,13 +1722,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"bLS" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "bLY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -1554,21 +1729,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"bMF" = ( -/obj/machinery/door/airlock/glass{ - name = "Garden" +"bNk" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/hydroponics/garden) -"bMK" = ( -/obj/structure/ladder, -/obj/structure/largecrate, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/main_map/maintenance/deck_three/port) "bOc" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) +"bOE" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "bOG" = ( /obj/machinery/cryopod, /turf/simulated/floor/tiled/techfloor/grid, @@ -1592,21 +1767,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"bPF" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/turf/simulated/floor/plating, -/area/space) "bQc" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -1621,6 +1781,14 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"bQK" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/cafeteria) "bQR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -1652,6 +1820,18 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel, /area/security/brig) +"bRB" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"bRF" = ( +/obj/effect/floor_decal/grass_edge, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "bRL" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; @@ -1670,6 +1850,27 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) +"bRW" = ( +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) +"bRZ" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/plating, +/area/chapel/office) +"bSR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "bTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1692,7 +1893,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/medical/virology) "bTM" = ( @@ -1711,6 +1912,7 @@ /area/hydroponics/garden) "bUa" = ( /obj/machinery/light/small, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "bUj" = ( @@ -1744,10 +1946,26 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"bVj" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"bWB" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/table/steel_reinforced, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) +"bXr" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"bXy" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "bXA" = ( /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) @@ -1787,6 +2005,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"bZB" = ( +/obj/structure/closet/crate/biohazard, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) "bZH" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -1802,17 +2024,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"cao" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "caq" = ( /obj/structure/railing{ dir = 4 @@ -1844,15 +2055,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"cdq" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/machinery/shield_diffuser, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "cdt" = ( /obj/machinery/door/blast/regular{ id = "xenobiovs"; @@ -1861,6 +2063,10 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"ceE" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) "ceK" = ( /obj/random/cutout, /obj/structure/sign/deck3{ @@ -1902,11 +2108,13 @@ }, /turf/simulated/floor/wood, /area/chapel/main) -"cgK" = ( -/obj/structure/bookcase, -/obj/structure/ladder, +"cgY" = ( +/obj/structure/cable/blue{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/rnd/xenobiology) "chE" = ( /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/theatre) @@ -1939,10 +2147,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/rdoffice) -"ciN" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/space) "cja" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 1 @@ -1977,6 +2181,9 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "ckD" = ( @@ -1998,21 +2205,34 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"clW" = ( -/obj/machinery/telecomms/receiver/preset_right, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "cmh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/cafeteria) -"cmq" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, +"cmv" = ( +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 1 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"cmw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "cnL" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -2035,19 +2255,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"coQ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "coZ" = ( /obj/effect/floor_decal/grass_edge, /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"cpy" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "cpz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2075,6 +2294,10 @@ /obj/random/cigarettes, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"cqE" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/medical/psych_ward) "crx" = ( /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) @@ -2114,6 +2337,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"cuN" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "cvg" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/library) @@ -2179,7 +2408,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "cAH" = ( /obj/structure/bed, @@ -2197,7 +2426,8 @@ dir = 1 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "cBa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2215,19 +2445,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, /area/rnd/test_area) -"cBg" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/space) -"cBh" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "cBC" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -2240,19 +2457,6 @@ }, /turf/simulated/floor/carpet, /area/medical/psych_ward) -"cCp" = ( -/obj/machinery/light_switch{ - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/space) -"cDU" = ( -/obj/item/flame/candle/candelabra/everburn, -/turf/simulated/floor/tiled/techfloor, -/area/space) "cEf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -2302,12 +2506,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"cHo" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/space) "cHQ" = ( /turf/simulated/floor/tiled/techmaint, /area/security/prison) @@ -2315,16 +2513,47 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/airless/ceiling, /area/space) -"cIP" = ( -/obj/machinery/door/airlock{ - name = "Chapel Office" +"cIZ" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/chapel/main) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "cKv" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/aft/port) +"cLa" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/port) +"cLs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) +"cLz" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "cLD" = ( /obj/structure/simple_door/hardwood, /turf/simulated/floor/carpet, @@ -2336,12 +2565,11 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"cMh" = ( -/obj/machinery/door/airlock/glass{ - name = "Garden" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) +"cLQ" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "cNd" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -2358,10 +2586,6 @@ "cNP" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) -"cOG" = ( -/obj/machinery/light/fairy, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) "cOM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2374,11 +2598,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) -"cPA" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/space) "cQd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -2389,33 +2608,30 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"cQy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "cQB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"cRe" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-8" - }, +"cRm" = ( /obj/structure/cable/heavyduty{ - icon_state = "0-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"cRw" = ( -/obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/power/apc/critical/south_bump, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" }, -/area/tcommsat/chamber) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "cRQ" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologyisolation) @@ -2426,8 +2642,7 @@ /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) "cSm" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/reagent_dispensers/watertank, @@ -2466,17 +2681,10 @@ }, /turf/simulated/floor/tiled, /area/medical/morgue) -"cTM" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/effect/floor_decal/techfloor{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +"cSL" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/port) "cUh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/bcarpet, @@ -2495,11 +2703,25 @@ icon_state = "techmaint" }, /area/tcommsat/chamber) -"cUp" = ( -/obj/structure/catwalk, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +"cUr" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/xenobiology) +"cUG" = ( +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "cUK" = ( /obj/machinery/air_sensor{ frequency = 1445; @@ -2520,6 +2742,14 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"cUV" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/recharger, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "cVW" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -2556,6 +2786,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rnd/rdoffice) +"cXQ" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"cYl" = ( +/turf/simulated/wall, +/area/medical/psych) "cYJ" = ( /turf/simulated/floor/bluegrid, /area/ai) @@ -2569,10 +2808,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"cZD" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/space) "cZF" = ( /obj/machinery/smartfridge/secure/extract, /obj/structure/window/reinforced{ @@ -2580,10 +2815,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"cZP" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) "dak" = ( /turf/simulated/floor/tiled/white, /area/medical/psych) @@ -2633,17 +2864,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"dbO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 5 - }, -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/rdoffice) "dcR" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/security/brig) +"ddj" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/wood, +/area/tether/exploration/pilot_office) +"ddA" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "dec" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2661,7 +2899,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/medical/medbay3) "dfa" = ( @@ -2677,14 +2915,24 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "dfd" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai) -"dff" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) +"dfp" = ( +/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 = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "dfu" = ( /obj/structure/morgue{ dir = 8 @@ -2695,12 +2943,19 @@ /obj/structure/railing/grey, /turf/simulated/open, /area/ai_upload) -"dfU" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 9 +"dge" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"dhi" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck3) "dhv" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/robotics/surgeryroom1) @@ -2745,14 +3000,15 @@ "dks" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "dky" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "dkO" = ( /obj/structure/cable/green{ @@ -2762,9 +3018,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/security/brig) -"dlc" = ( -/turf/simulated/wall/r_wall, -/area/main_map/maintenance/deck_three) +"dlk" = ( +/obj/effect/floor_decal/grass_edge{ + dir = 1 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "dll" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -2775,16 +3037,14 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "dlL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "dma" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -2815,11 +3075,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"doQ" = ( -/obj/structure/ladder, -/obj/structure/barricade/cutout, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "dpj" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) @@ -2830,18 +3085,37 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"dpX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) +"dqt" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"dqG" = ( +/obj/machinery/door/window/brigdoor/northleft{ + req_access = null; + req_one_access = list(55); + name = "Containment Pen" + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "dqQ" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward) -"drw" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) "drB" = ( /obj/structure/curtain/black{ anchored = 1; @@ -2872,12 +3146,33 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"dsi" = ( +/obj/machinery/door/airlock{ + name = "Pilot's Office"; + req_one_access = list(67) + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/tether/exploration/pilot_office) "dsp" = ( /obj/structure/sign/deck/third{ pixel_y = 32 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"dsL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "dsR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2929,22 +3224,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "duk" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, /area/medical/psych_ward) -"duF" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) "duH" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -2959,6 +3245,13 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) +"dvH" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "dvX" = ( /turf/simulated/floor/tiled/old_cargo/blue, /area/security/brig) @@ -2984,6 +3277,12 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"dwL" = ( +/obj/machinery/telecomms/server/presets/service/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "dxw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -2997,6 +3296,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"dxC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "dyu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -3011,12 +3320,6 @@ /obj/structure/catwalk, /turf/simulated/open, /area/main_map/maintenance/deck_three) -"dyP" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 9 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "dze" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -3057,24 +3360,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"dAz" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "dAP" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10 - }, -/obj/machinery/air_alarm{ - pixel_y = 30 - }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "dAV" = ( /turf/space/basic, /area/space) +"dAZ" = ( +/obj/machinery/telecomms/hub/preset/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "dBh" = ( /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay recovery room door."; @@ -3105,6 +3412,13 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck3) +"dCv" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "dDp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3113,7 +3427,8 @@ dir = 8 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "dDq" = ( /obj/structure/sign/deck/third{ @@ -3129,6 +3444,13 @@ /obj/machinery/door/airlock/maintenance/rnd, /turf/simulated/floor/tiled/techmaint, /area/rnd/research) +"dEA" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "dFe" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 4 @@ -3140,9 +3462,16 @@ /obj/item/stool/padded, /turf/simulated/floor/tiled/steel, /area/security/brig) -"dFJ" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/main_map/maintenance/deck_three/aft/port) +"dFl" = ( +/obj/machinery/power/emitter{ + dir = 4; + anchored = 1 + }, +/obj/structure/cable/blue{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "dGQ" = ( /obj/structure/bed/psych, /turf/simulated/floor/wood, @@ -3171,14 +3500,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"dJS" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) -"dKj" = ( -/obj/structure/dogbed, -/obj/item/toy/plushie/squid/pink, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +"dIS" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/substation/flight_deck) "dKw" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -3187,6 +3511,15 @@ /obj/machinery/computer/telecomms/server, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"dLd" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/brig) "dLA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -3203,20 +3536,28 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"dMB" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "dNe" = ( /obj/structure/table/marble, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"dNp" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(18,47) - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) "dNC" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo) +"dND" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "dOb" = ( /turf/simulated/open, /area/main_map/hallway/deck3) @@ -3232,12 +3573,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/security/prison) -"dPc" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "dPy" = ( /turf/simulated/floor/glass/reinforced, /area/crew_quarters/cafeteria) @@ -3251,9 +3586,10 @@ /turf/simulated/floor/tiled, /area/medical/resleeving) "dPN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ +/obj/structure/railing{ dir = 4 }, +/obj/structure/railing, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "dQv" = ( @@ -3304,24 +3640,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"dTq" = ( -/obj/structure/barricade, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/plating, -/area/space) -"dTL" = ( -/obj/machinery/light/fairy{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) -"dTX" = ( -/obj/structure/stairs/spawner/north, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "dUa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -3344,6 +3662,10 @@ /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/wood, /area/library) +"dUw" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "dVc" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -3357,6 +3679,12 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"dVK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "dVM" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -3380,12 +3708,16 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"dWI" = ( -/obj/structure/railing{ - dir = 8 +"dXq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorwhite/corner, +/obj/effect/floor_decal/corner/beige/bordercorner, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "dXJ" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -3419,12 +3751,29 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"dYT" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck3) "dYU" = ( /obj/structure/closet/crate/bin{ anchored = 1 }, /turf/simulated/floor/tiled/steel, /area/security/brig) +"dZg" = ( +/obj/machinery/telecomms/receiver/preset_right/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) +"dZq" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "dZu" = ( /turf/simulated/floor/tiled, /area/medical/morgue) @@ -3432,13 +3781,9 @@ /obj/structure/sign/warning/nosmoking_2, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/workshop) -"eap" = ( -/obj/structure/cable/heavyduty, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +"dZZ" = ( +/turf/simulated/wall/r_wall, +/area/medical/psych) "eaE" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -3452,6 +3797,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"ebF" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "ecG" = ( /turf/simulated/open, /area/main_map/maintenance/deck_three/aft/starboard) @@ -3474,6 +3823,24 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"edw" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"edY" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/main_map/maintenance/deck_three/starboard) +"eei" = ( +/obj/machinery/computer/security/mining{ + dir = 1; + name = "xenobiology camera monitor"; + network = list("Xenobiology") + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "eeo" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -3487,6 +3854,22 @@ "eey" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three/aft/starboard) +"efb" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "efy" = ( /obj/machinery/computer/aifixer, /turf/simulated/floor/tiled/techfloor, @@ -3519,6 +3902,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"ehU" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/chapel/office) "eia" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -3532,6 +3923,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"eju" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "elp" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3582,6 +3977,29 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/techfloor, /area/engineering/gravity_gen) +"eou" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/corner/green{ + dir = 5 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/security/brig) +"eoC" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/network/engineering{ + dir = 8 + }, +/obj/item/storage/box/snakesnackbox, +/obj/machinery/button/remote/blast_door{ + id = "engsec_ld_c"; + name = "Access Lockdown"; + pixel_x = 25 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "eoD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3591,6 +4009,29 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"epn" = ( +/obj/machinery/smartfridge/secure/extract{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"epr" = ( +/obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) +"epJ" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/catering/bar_soft{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "epN" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, @@ -3625,8 +4066,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) +"eqL" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/xenobiology) +"err" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Elevator Shaft Access"; + req_one_access = null + }, +/turf/simulated/floor/plating, +/area/medical/medbay3) "erC" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -3647,18 +4107,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) -"erV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) "esJ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -3669,6 +4117,12 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"etj" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "etJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3699,6 +4153,12 @@ }, /turf/simulated/wall/r_lead, /area/engineering/gravity_gen) +"ewo" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "exf" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -3727,18 +4187,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) -"eym" = ( -/obj/structure/sign/deck3{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/space) "eyF" = ( /obj/structure/bed/chair/sofa/black/right{ dir = 4 @@ -3748,6 +4196,10 @@ "eyN" = ( /turf/simulated/wall/prepainted/science, /area/rnd/workshop) +"ezx" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ezE" = ( /obj/effect/floor_decal/borderfloorblack, /obj/machinery/suit_cycler/pilot, @@ -3776,6 +4228,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"eBy" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "eCf" = ( /obj/structure/table/woodentable, /obj/machinery/computer/med_data/laptop, @@ -3791,10 +4250,19 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"eCW" = ( -/obj/structure/barricade, -/turf/simulated/floor/reinforced, -/area/space) +"eCt" = ( +/turf/simulated/wall/r_wall, +/area/main_map/hanger_cafe) +"eDc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "eDE" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -3808,13 +4276,6 @@ "eDH" = ( /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"eDJ" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/direction_bump/east, -/turf/simulated/floor/tiled/monotile, -/area/rnd/xenobiology) "eEb" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -3835,15 +4296,6 @@ }, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"eEn" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/machinery/camera/network/cargo{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/space) "eEA" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -3903,20 +4355,34 @@ /obj/structure/morgue, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"eHm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"eHp" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "eHK" = ( /obj/landmark/spawnpoint/latejoin/station/cyborg, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) -"eHY" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/chapel/main) "eIu" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/medical/psych_ward) +"eIx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "eIH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3972,6 +4438,13 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"eJQ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "eKb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -3994,26 +4467,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_monitoring) -"eKZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/beige/border, -/turf/simulated/floor/tiled/white, -/area/medical/psych) -"eLa" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) +"eKp" = ( +/obj/machinery/holopad, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "eLh" = ( /obj/structure/railing{ dir = 8 @@ -4042,6 +4499,23 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"eMv" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) +"eMG" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/senior_engineer, +/turf/simulated/floor/tiled, +/area/engineering/engine_monitoring) "eMN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4051,10 +4525,30 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"eNj" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"eNA" = ( +/obj/structure/curtain/black{ + anchored = 1; + icon_state = "open" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/chapel/main) "eNE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "eOO" = ( @@ -4070,13 +4564,18 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"eQf" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "eQh" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"eQQ" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/space) "eRb" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, @@ -4098,17 +4597,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"eRZ" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/cargo_shelter_dock) "eSK" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/starboard) "eSO" = ( /turf/simulated/floor/tiled/techfloor, /area/chapel/main) -"eTk" = ( -/obj/structure/ladder, -/obj/structure/bookcase, +"eTA" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/chapel/main) +"eTK" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/main_map/maintenance/deck_three/port) "eTL" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -4124,17 +4638,8 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"eVa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2) "eVd" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4145,6 +4650,13 @@ /obj/item/storage/box/cups, /turf/simulated/floor/wood, /area/medical/medbay3) +"eXb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "eXz" = ( /obj/structure/table/standard, /obj/machinery/computer/atmoscontrol/laptop{ @@ -4160,6 +4672,30 @@ "eXF" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/main_map/maintenance/deck_three/aft/starboard) +"eXQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) +"eXV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hydroponics/garden) +"eYt" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "eYF" = ( /obj/machinery/air_alarm{ dir = 8; @@ -4167,6 +4703,30 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"eYR" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) +"eYX" = ( +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(55); + name = "Containment Pen" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"faG" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + req_one_access = list(31); + name = "Cargo" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) "faU" = ( /obj/machinery/air_alarm{ dir = 1; @@ -4219,6 +4779,16 @@ /obj/structure/lattice, /turf/simulated/open, /area/main_map/maintenance/deck_three) +"fdh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "fdz" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/grass_edge{ @@ -4236,25 +4806,16 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"feM" = ( -/obj/machinery/door/airlock/multi_tile/glass/polarized{ - dir = 2; - id_tint = "saunatint"; - name = "Sauna" - }, -/turf/simulated/floor/tiled, -/area/triumph/surfacebase/sauna) "ffa" = ( /obj/structure/railing, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"ffr" = ( -/obj/machinery/door/airlock{ - name = "Hydroponics"; - req_one_access = list(35) +"ffL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, -/area/hydroponics) +/area/main_map/maintenance/deck_three/port) "ffQ" = ( /obj/machinery/camera/network/cargo{ dir = 8 @@ -4319,10 +4880,10 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) -"fkB" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/steel, -/area/security/brig) +"fjW" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "fkM" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/structure/railing, @@ -4336,12 +4897,27 @@ /obj/machinery/cell_charger, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"flF" = ( +/obj/machinery/door/firedoor{ + dir = 2 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "flO" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"fmo" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/Hangar_bay/deck2) "fmq" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 10 @@ -4365,10 +4941,6 @@ /obj/item/stock_parts/subspace/treatment, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"fnD" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor/tiled/techmaint, -/area/space) "foe" = ( /obj/structure/fence/door, /obj/machinery/door/firedoor{ @@ -4403,6 +4975,10 @@ }, /turf/simulated/floor/carpet, /area/security/brig) +"foV" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "fpr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4437,6 +5013,23 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/theatre) +"fqF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) +"fqJ" = ( +/obj/structure/table/bench/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "fqY" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, @@ -4444,6 +5037,11 @@ "frn" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) +"frM" = ( +/obj/machinery/computer/atmos_alert, +/obj/machinery/camera/network/engineering, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "frV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4452,15 +5050,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"frY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) "fsf" = ( /obj/structure/table/standard, /obj/machinery/librarypubliccomp, @@ -4502,12 +5091,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/entrance) -"fud" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 +"ftM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "fuh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4557,6 +5147,24 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"fvT" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"fwR" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) +"fxt" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "fxw" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 @@ -4566,13 +5174,10 @@ "fxX" = ( /turf/simulated/open, /area/ai) -"fyY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) +"fyg" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/xenobiology) "fzo" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4583,12 +5188,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"fzE" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three/forward/starboard) "fAH" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -4597,13 +5196,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"fBa" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fBl" = ( /obj/machinery/porta_turret/ai_defense, /turf/simulated/floor/tiled/techfloor, @@ -4614,6 +5206,13 @@ }, /turf/simulated/floor/wood, /area/library) +"fBD" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "fCd" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -4630,6 +5229,10 @@ /obj/structure/railing, /turf/simulated/open, /area/main_map/maintenance/deck_three) +"fDt" = ( +/obj/machinery/atmospherics/pipe/simple/insulated, +/turf/simulated/floor/reinforced/overhang, +/area/space) "fDA" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -4711,7 +5314,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -4723,6 +5326,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"fFz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "fGi" = ( /obj/machinery/holoplant, /obj/effect/floor_decal/spline/fancy/wood, @@ -4791,6 +5404,10 @@ name = "Cold Room Base" }, /area/rnd/xenobiology) +"fHc" = ( +/obj/structure/bed/chair/sofa/black/corner, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "fHn" = ( /turf/simulated/wall/prepainted/medical, /area/medical/psych/psych_2) @@ -4819,43 +5436,18 @@ "fHR" = ( /turf/simulated/floor/wood, /area/medical/psych_ward) -"fIj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/techfloor/orange{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/engineering/engine_monitoring) +"fIa" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "fIR" = ( /obj/structure/railing, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"fJt" = ( -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) -"fJB" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "fJO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -4871,9 +5463,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"fKs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "fKv" = ( /turf/simulated/wall/prepainted/medical, /area/medical/virologyaccess) +"fKO" = ( +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "fLa" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -4906,13 +5510,9 @@ "fMH" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/cryo) -"fNv" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) +"fMZ" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_three/port) "fNU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -4955,6 +5555,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"fQi" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "fRt" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -4966,16 +5570,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"fRy" = ( -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) "fRL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -5013,25 +5607,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"fSH" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/obj/structure/closet/crate/bin{ - desc = "A large bin for medical and other personnel that deals with bio-grade waste."; - icon_closed = "biohazard"; - icon_opened = "biohazardopen"; - icon_state = "biohazard"; - name = "biohazard bin" - }, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/medical/virology) "fTu" = ( /obj/structure/window/reinforced, /obj/machinery/disposal, @@ -5056,12 +5631,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"fUh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced, -/area/space) +"fUm" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/skills, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "fUz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -5078,13 +5652,28 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) -"fUX" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced/airless, -/area/space) +"fUQ" = ( +/obj/machinery/door/airlock/atmos{ + name = "Civilian Atmospherics Backup"; + req_access = list(24) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) +"fVo" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/holofloor/tiled/dark, +/area/medical/medbay3) +"fVq" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/brig) "fVG" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/warning, @@ -5096,6 +5685,14 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"fWa" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "fWF" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -5104,6 +5701,10 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled, /area/rnd/test_area) +"fXn" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "fXp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -5111,8 +5712,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"fXv" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/cryo) +"fXD" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "fXE" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -5138,20 +5749,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"fYC" = ( -/obj/effect/floor_decal/industrial/loading, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/prison) -"fYM" = ( -/obj/machinery/vending/hydronutrients, -/turf/simulated/floor/tiled, -/area/hydroponics) "fZf" = ( /obj/machinery/door/airlock/medical{ id_tag = "mentaldoor"; @@ -5220,6 +5817,9 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) +"gaO" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_three/aft) "gaS" = ( /turf/simulated/floor/tiled, /area/medical/psych) @@ -5249,10 +5849,40 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) +"gcJ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"gcT" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) +"gdg" = ( +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"gdu" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck3) "gdO" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/brig) +"ger" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/cargo_shelter_dock) "gev" = ( /obj/landmark/spawnpoint/latejoin/station/cryogenics, /obj/effect/floor_decal/techfloor{ @@ -5271,12 +5901,6 @@ }, /turf/simulated/floor/wood, /area/medical/medbay3) -"gfE" = ( -/obj/structure/bed/chair/sofa/black/left{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "ggL" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -5286,10 +5910,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"ghj" = ( -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/space) "ghr" = ( /obj/item/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ @@ -5297,34 +5917,36 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"ghw" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/carpet/sblucarpet, -/area/medical/psych/psych_1) "ghy" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ppflowers, /obj/machinery/light/flamp, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"ghY" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 4 +"gjj" = ( +/obj/structure/bed/chair/wood{ + dir = 8 }, -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/reinforced, -/area/space) +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/clown, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) +"gjx" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "gjF" = ( /turf/simulated/floor/tiled/old_cargo/red, /area/security/brig) -"gks" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/west, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/storage) +"gjG" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "gkv" = ( /obj/structure/table/steel_reinforced, /obj/machinery/camera/network/research{ @@ -5359,6 +5981,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"gmN" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "gnr" = ( /obj/machinery/vending/loadout/uniform, /obj/machinery/air_alarm{ @@ -5374,6 +6002,12 @@ /obj/structure/lattice, /turf/simulated/open, /area/space) +"gok" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "goY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -5382,7 +6016,8 @@ dir = 8 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "gpO" = ( /obj/machinery/light/small{ @@ -5390,23 +6025,43 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"gqr" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) -"gqu" = ( +"gpT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"gqm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) +"gqn" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/hallway/deck3) "grs" = ( /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"grH" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/xenobiology) "gsh" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -5422,13 +6077,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"gsM" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 - }, -/obj/structure/filingcabinet/tall, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "gsR" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5445,18 +6093,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"gvc" = ( +"guB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /obj/structure/cable/green{ - icon_state = "0-8" + icon_state = "1-4" + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-2" }, -/obj/machinery/power/apc/direction_bump/east, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) +/turf/simulated/floor/tiled, +/area/engineering/engine_monitoring) +"guS" = ( +/obj/item/storage/fancy/whitecandle_box, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "gvK" = ( /obj/machinery/ntnet_relay, /obj/machinery/camera/network/tcomms, @@ -5482,17 +6144,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) -"gxi" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/landmark/spawnpoint/job/pathfinder, -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 +"gxJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "gyL" = ( /obj/structure/railing, /obj/structure/railing{ @@ -5553,6 +6210,26 @@ /obj/item/slime_extract/grey, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"gAS" = ( +/obj/structure/table/steel, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"gBi" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) "gBr" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/red, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5566,9 +6243,6 @@ /obj/machinery/biogenerator, /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) -"gDb" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/tether/exploration/pathfinder_office) "gDo" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -5586,13 +6260,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) -"gEA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +"gEn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) "gFr" = ( @@ -5606,16 +6280,15 @@ /obj/structure/bed/chair/sofa/black/left, /turf/simulated/floor/wood, /area/library) -"gGt" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 +"gGy" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"gHo" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/table/wooden_reinforced, -/obj/item/flame/candle/candelabra/everburn, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/port) "gHG" = ( /obj/structure/closet/firecloset, @@ -5627,6 +6300,10 @@ }, /turf/simulated/open, /area/rnd/research) +"gHN" = ( +/obj/landmark/spawnpoint/job/botanist, +/turf/simulated/floor/tiled, +/area/hydroponics) "gIe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -5681,6 +6358,16 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) +"gKB" = ( +/obj/structure/table/reinforced, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/photocopier/faxmachine{ + department = "CMO's Office" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "gKP" = ( /obj/machinery/light/flamp, /obj/effect/floor_decal/grass_edge{ @@ -5699,18 +6386,26 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"gLb" = ( +/obj/structure/bed/chair/sofa/black/left{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet, +/area/medical/psych) "gLg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) -"gLk" = ( -/obj/structure/railing{ - dir = 1 +"gLB" = ( +/obj/machinery/door/airlock/atmos{ + name = "Civilian Atmospherics Backup"; + req_access = list(24) }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "gLW" = ( /obj/structure/table/bench/wooden, /obj/machinery/light/no_nightshift{ @@ -5731,29 +6426,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/library) -"gMT" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/structure/table/wooden_reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/port) -"gMZ" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "gNU" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/tcommsat/chamber) +"gOE" = ( +/obj/structure/cable/heavyduty, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "gOY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -5792,12 +6474,6 @@ /obj/structure/bed/chair/wood/wings, /turf/simulated/floor/wood, /area/medical/psych_ward) -"gQn" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "gQv" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -5825,6 +6501,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"gRy" = ( +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -12 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "gRE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -5842,15 +6525,6 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/hydroponics/garden) -"gSo" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Pathfinder's Office"; - pixel_x = 2; - pixel_y = 4 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "gSx" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, @@ -5902,6 +6576,16 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"gUP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "gVa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -5949,8 +6633,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"gXZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "gYv" = ( /obj/machinery/light/small{ dir = 8 @@ -5967,10 +6658,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"gYG" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/wood, -/area/triumph/surfacebase/sauna) "gYO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -5983,15 +6670,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"gZb" = ( -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/space) "haf" = ( /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" @@ -6006,16 +6684,13 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) -"haM" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/airless/ceiling, -/area/space) "hbf" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "hbl" = ( /obj/structure/noticeboard{ @@ -6033,6 +6708,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"hbV" = ( +/obj/structure/closet/secure_closet/engineering_chief, +/obj/item/clothing/accessory/poncho/roles/cloak/ce, +/obj/machinery/requests_console/preset/ce{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "hcc" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -6065,15 +6748,6 @@ /obj/machinery/computer/telecomms/monitor, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) -"hel" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) "heB" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/air_alarm{ @@ -6082,22 +6756,24 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"hgb" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "hgH" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) +"hhj" = ( +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "hhq" = ( /obj/structure/largecrate, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) +"hhu" = ( +/obj/structure/ladder, +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "hiZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -6138,11 +6814,26 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"hjD" = ( -/obj/structure/ladder, -/obj/structure/stasis_cage, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +"hjH" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) +"hjZ" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/grass_edge{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "hkd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -6155,15 +6846,15 @@ "hko" = ( /turf/simulated/wall/durasteel, /area/ai) +"hlg" = ( +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "hlI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/security/brig) -"hmr" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/wood, -/area/space) "hmB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -6213,6 +6904,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"hpg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "hpl" = ( /turf/simulated/floor/wood, /area/rnd/xenobiology) @@ -6232,12 +6928,6 @@ /obj/machinery/light/flamp, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"hqD" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/hallway/deck3) "hqV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -6258,6 +6948,10 @@ /obj/structure/table/rack, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"hrW" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "hsd" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain, @@ -6277,11 +6971,23 @@ /obj/item/mirrortool, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"htm" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"htA" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/clothing/mask/breath, +/obj/item/hardsuit/ce/equipped{ + req_access = list(56) + }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "htN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6294,6 +7000,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"htR" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"hua" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "hug" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6306,6 +7023,10 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"huF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "huR" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/structure/railing{ @@ -6313,16 +7034,21 @@ }, /turf/simulated/floor/plating, /area/rnd/storage) -"huS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"hvd" = ( +/obj/machinery/door/airlock{ + name = "Hydroponics"; + req_one_access = list(35) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/hydroponics) +"hvh" = ( +/obj/structure/closet/crate/miningcar, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/table/standard, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +/area/quartermaster/cargo_shelter_dock) "hvn" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -6330,12 +7056,6 @@ }, /turf/simulated/floor/tiled, /area/medical/morgue) -"hwb" = ( -/obj/structure/bed/chair/sofa/black/corner{ - dir = 1 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "hwI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6389,12 +7109,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"hyH" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +"hyP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass/civilian{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) +"hyQ" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/port) "hyW" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -6419,6 +7149,10 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) +"hzS" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "hzZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6448,12 +7182,18 @@ /obj/machinery/librarypubliccomp, /turf/simulated/floor/wood, /area/library) -"hAT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +"hAU" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "hBM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6465,6 +7205,13 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"hBS" = ( +/obj/structure/largecrate, +/obj/item/hardsuit/industrial/old/spring, +/obj/item/hardsuit_module/device/rigwelder, +/obj/random/powercell, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "hCc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -6482,6 +7229,23 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"hCv" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/security/brig) +"hCW" = ( +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/structure/table/standard, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "hDc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6496,7 +7260,8 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "hEY" = ( -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three) "hFt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6521,6 +7286,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"hGo" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) +"hGu" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) +"hGF" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "hGG" = ( /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/steel, @@ -6531,6 +7318,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"hHq" = ( +/obj/machinery/light_switch{ + pixel_y = -25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "hHE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -6540,23 +7336,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"hHP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) -"hIk" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) -"hIN" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) +"hHL" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "hJe" = ( /obj/effect/floor_decal/corner/green/border{ dir = 1 @@ -6566,13 +7349,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"hJw" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) "hJx" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -6588,6 +7364,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"hKu" = ( +/obj/item/flame/candle/candelabra, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "hLt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6600,28 +7380,14 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"hLM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/zpipe/up{ - dir = 1 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "hLT" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) -"hMw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/airlock/glass{ - name = "Garden" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/hydroponics/garden) +"hMB" = ( +/obj/structure/sign/hangar/three, +/turf/simulated/wall/r_wall, +/area/main_map/hanger_cafe) "hMG" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, @@ -6662,6 +7428,10 @@ }, /turf/simulated/floor/reinforced, /area/space) +"hOk" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "hOM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6683,15 +7453,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hydroponics/garden) -"hQF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "hQS" = ( /obj/structure/filingcabinet/medical{ desc = "A large cabinet with hard copy medical records."; @@ -6735,6 +7496,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"hRB" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"hRZ" = ( +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "hSA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -6753,18 +7524,17 @@ "hUd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "hUC" = ( /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck3) -"hVs" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/spline/plain{ - dir = 8 +"hUD" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "hVt" = ( /obj/structure/sign/deck3{ pixel_y = 32 @@ -6788,28 +7558,39 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"hXp" = ( -/obj/structure/railing{ +"hXc" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"hXt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"hXV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "hZk" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"hZl" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck3) "hZt" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload) -"hZy" = ( -/obj/random/obstruction, -/turf/simulated/floor/plating, -/area/space) +"hZv" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "hZN" = ( /obj/structure/cable{ icon_state = "2-8" @@ -6857,6 +7638,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"idd" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/space) "idm" = ( /obj/machinery/holoplant, /obj/structure/railing/grey, @@ -6865,12 +7649,29 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/hallway/deck3) +"idH" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "idO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"ieq" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/plating, +/area/chapel/office) "ieI" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -6887,6 +7688,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three) +"ifo" = ( +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "ifR" = ( /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -6898,6 +7702,13 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"igF" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "ihc" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor/grid, @@ -6941,12 +7752,38 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/xenobiology) +"ijC" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "ijD" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"ijR" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"ijZ" = ( +/obj/machinery/power/apc/north_mount, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "ike" = ( /obj/structure/railing{ dir = 4 @@ -6960,16 +7797,6 @@ /obj/structure/simple_door/wood, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"iks" = ( -/turf/simulated/wall/prepainted/civilian, -/area/space) -"ikt" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) "ikJ" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing{ @@ -6977,11 +7804,6 @@ }, /turf/simulated/floor/plating, /area/rnd/research) -"ikZ" = ( -/obj/structure/ladder, -/obj/structure/frame, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "ilQ" = ( /obj/random/junk, /turf/simulated/floor/plating, @@ -7026,29 +7848,29 @@ }, /turf/simulated/floor/plating, /area/ai_upload) -"ioF" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 +"ioT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "ioV" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) -"ipp" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait, -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "ipw" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"ipG" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "iqq" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research) @@ -7058,6 +7880,11 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) +"iri" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "irH" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) @@ -7086,9 +7913,48 @@ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/medical/psych) +"itl" = ( +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "engsec_ld_c"; + name = "CE Office Blast Doors"; + opacity = 0 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/chief) +"itw" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"itK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) +"itS" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) +"itV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "iul" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 1; @@ -7101,16 +7967,16 @@ }, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"iuo" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "ius" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"iuw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "iuS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -7130,16 +7996,6 @@ /obj/item/toy/plushie/kitten, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"iwI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/plating, -/area/space) "iwJ" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -7151,6 +8007,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"iwK" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "iwX" = ( /obj/structure/bed/chair/wheelchair, /obj/effect/floor_decal/industrial/outline/blue, @@ -7163,7 +8025,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) "ixl" = ( @@ -7239,6 +8101,7 @@ /area/main_map/Hangar_bay/deck2) "iAl" = ( /obj/structure/ladder/up, +/obj/structure/largecrate, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "iAp" = ( @@ -7254,6 +8117,17 @@ /obj/machinery/door/window/eastleft, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"iAI" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet/sblucarpet, +/area/medical/psych/psych_1) +"iAT" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "iAX" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck3) @@ -7272,7 +8146,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "iCw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7308,6 +8183,13 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"iDQ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "iEg" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ external_pressure_bound = 0; @@ -7330,16 +8212,23 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"iER" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "iFC" = ( /obj/machinery/door/airlock/glass{ name = "Psyche Lobby Room" }, /turf/simulated/floor/tiled, /area/medical/psych) -"iFG" = ( -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) +"iFS" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "iFT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/bed/chair{ @@ -7362,10 +8251,22 @@ }, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"iGJ" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/starboard) +"iGe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"iGW" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "iHr" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -7415,21 +8316,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/cafeteria) -"iJv" = ( -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/techmaint, -/area/space) "iJX" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"iKt" = ( -/obj/item/flame/candle/candelabra, -/turf/simulated/floor/tiled/techfloor, -/area/space) +"iKW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "iLO" = ( /obj/machinery/door/airlock/maintenance/sec, /obj/structure/cable/green{ @@ -7448,6 +8347,9 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"iMk" = ( +/turf/simulated/wall/prepainted/security, +/area/security/brig) "iMM" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/closet/emcloset, @@ -7459,13 +8361,16 @@ dir = 8 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"iMU" = ( -/obj/structure/largecrate, +"iMZ" = ( +/obj/structure/closet/firecloset, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/starboard) "iNg" = ( /obj/structure/bookcase/legal/sop, /turf/simulated/floor/wood, @@ -7550,6 +8455,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"iPf" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "iPw" = ( /obj/structure/sink{ dir = 4; @@ -7600,6 +8509,16 @@ /obj/item/beach_ball, /turf/simulated/floor/grass, /area/medical/psych_ward) +"iQe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft) "iQH" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor, @@ -7645,20 +8564,16 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) -"iTr" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/hydroponics/garden) +"iTJ" = ( +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "iTP" = ( /turf/simulated/wall/r_wall, /area/maintenance/substation/tcomms) -"iUo" = ( -/obj/machinery/door/airlock/glass, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/Hangar_bay/deck2) +"iUg" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "iUy" = ( /obj/landmark{ name = "lightsout" @@ -7671,10 +8586,10 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"iVS" = ( -/obj/structure/sign/deck3, -/turf/simulated/wall/r_wall, -/area/engineering/engine_eva) +"iVA" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "iVT" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -7702,6 +8617,18 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"iWW" = ( +/obj/structure/sign/deck3{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "iXA" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled, @@ -7731,6 +8658,13 @@ /obj/structure/railing, /turf/simulated/floor/tiled, /area/crew_quarters/pool) +"iZs" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "iZx" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -7743,15 +8677,6 @@ "jan" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/forward/starboard) -"jap" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "jaO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -7790,6 +8715,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"jce" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"jcj" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "jcl" = ( /obj/structure/coatrack, /obj/effect/floor_decal/spline/fancy/wood{ @@ -7806,10 +8742,6 @@ }, /turf/simulated/floor/plating, /area/quartermaster/warehouse) -"jds" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/plating, -/area/space) "jdx" = ( /turf/simulated/floor/wood, /area/medical/psych/psych_2) @@ -7833,7 +8765,7 @@ /area/main_map/maintenance/deck_three) "jeM" = ( /obj/machinery/door/blast/regular{ - dir = 4 + dir = 2 }, /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) @@ -7846,21 +8778,24 @@ "jfJ" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"jfR" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/space) "jfY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"jgd" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"jgk" = ( +/obj/random/obstruction, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "jgu" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/item/radio/intercom{ @@ -7873,6 +8808,11 @@ }, /turf/simulated/floor/tiled, /area/medical/virologyaccess) +"jgR" = ( +/obj/machinery/atmospherics/mains_pipe/manifold4w/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "jgY" = ( /obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass/polarized{ @@ -7881,48 +8821,48 @@ }, /turf/simulated/floor/tiled/techfloor, /area/library) +"jhb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/chapel/office) "jhf" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"jhs" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet/sblucarpet, +/area/medical/psych/psych_2) "jiL" = ( /turf/simulated/floor/tiled, /area/hydroponics) +"jiP" = ( +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology) "jiS" = ( /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"jje" = ( -/obj/structure/ladder, -/obj/structure/barricade, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) -"jjB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "jkS" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) -"jkY" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/space) "jll" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"jly" = ( +/turf/simulated/wall/r_wall, +/area/chapel/office) +"jlD" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hydroponics/garden) "jmb" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -7934,7 +8874,7 @@ "jmd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "jmq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7972,6 +8912,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three) +"jpo" = ( +/turf/simulated/wall/r_wall, +/area/engineering/engine_gas) +"jps" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "jqn" = ( /obj/effect/floor_decal/spline/plain, /obj/structure/flora/ausbushes/fullgrass, @@ -7990,12 +8939,29 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"jrL" = ( -/obj/structure/sign/deck3{ - pixel_y = 32 +"jrz" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled, +/area/medical/psych) +"jrR" = ( +/obj/structure/table/standard, +/obj/item/folder/blue{ + pixel_x = 5 + }, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/syringe, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "jsc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8054,17 +9020,6 @@ /obj/structure/railing, /turf/simulated/open, /area/library) -"jwm" = ( -/obj/structure/table/woodentable, -/obj/item/paper_bin, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) -"jwV" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three) "jyp" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -8083,6 +9038,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"jyJ" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/forward/port) "jyQ" = ( /obj/item/suit_cooling_unit, /obj/item/suit_cooling_unit, @@ -8113,12 +9075,25 @@ "jzH" = ( /turf/simulated/floor/tiled/monotile, /area/security/brig) -"jAM" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 +"jzM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/reinforced, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) +"jBK" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/old_cargo/white, +/area/security/brig) +"jBN" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "jCp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, @@ -8164,10 +9139,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) -"jEQ" = ( -/obj/structure/table/bench/steel, -/turf/simulated/floor/wood, -/area/space) +"jEA" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "jFi" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -8188,34 +9165,9 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/security/brig) -"jGU" = ( -/obj/machinery/telecomms/server/presets/service, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "jHl" = ( /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"jHI" = ( -/obj/machinery/door/airlock/maintenance/engi, -/turf/simulated/floor/plating, -/area/engineering/engine_monitoring) -"jHP" = ( -/obj/machinery/door/airlock/atmos{ - name = "Civilian Atmospherics Backup"; - req_access = list(24) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/wall/prepainted/civilian, -/area/space) "jHS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -8228,16 +9180,18 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"jJp" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/simulated/floor/reinforced; - docking_controller = "cargo_bay"; - landmark_tag = "supply_dock"; - name = "NSV Triumph Cargo Dock" +"jHY" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +"jJE" = ( /turf/simulated/floor/reinforced, -/area/space) +/area/quartermaster/cargo_shelter_dock) "jJZ" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 8 @@ -8255,20 +9209,12 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"jMp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 +"jLZ" = ( +/obj/landmark{ + name = "lightsout" }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) -"jMt" = ( -/obj/effect/floor_decal/grass_edge, -/obj/machinery/seed_storage/garden, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/hydroponics/garden) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "jMB" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8299,12 +9245,19 @@ "jMZ" = ( /turf/simulated/open, /area/space) +"jNh" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "jNF" = ( /obj/machinery/door/airlock/glass{ name = "Vacant Shop" }, /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) +"jNS" = ( +/turf/simulated/open, +/area/rnd/xenobiology) "jOg" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -8381,16 +9334,33 @@ /area/chapel/main) "jSQ" = ( /obj/structure/closet/firecloset, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "jTJ" = ( /obj/structure/stairs/spawner/west, /turf/simulated/floor/plating, /area/medical/virologyaccess) -"jUd" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"jUl" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"jUu" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "jUD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -8430,6 +9400,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) +"jVl" = ( +/obj/structure/bed/chair/sofa/black, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "jVy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8464,11 +9438,6 @@ "jWM" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/aft) -"jXa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "jXf" = ( /turf/simulated/floor/tiled/white, /area/medical/psych_ward) @@ -8512,9 +9481,6 @@ }, /turf/simulated/floor/tiled, /area/medical/resleeving) -"jXZ" = ( -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "jYz" = ( /obj/effect/floor_decal/corner/green/border{ dir = 6 @@ -8526,10 +9492,30 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"jYO" = ( +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) +"jYV" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "jYZ" = ( /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) +"jZd" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "jZC" = ( /turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom1) @@ -8538,7 +9524,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/machinery/light/no_nightshift{ dir = 4 }, @@ -8561,18 +9547,12 @@ }, /turf/simulated/floor/tiled, /area/hydroponics/garden) -"kce" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced{ +"kck" = ( +/obj/structure/bed/chair/sofa/black/corner{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "kcN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -8598,16 +9578,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/starboard) -"kdM" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/starboard) +"kdV" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "kej" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel, @@ -8632,10 +9609,6 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"keQ" = ( -/obj/structure/ladder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "kfe" = ( /obj/structure/table/rack/steel, /obj/item/instrument/violin, @@ -8667,6 +9640,18 @@ }, /turf/simulated/open, /area/ai_upload) +"kgL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/wall{ + can_open = 1 + }, +/area/main_map/maintenance/deck_three/aft) "kgS" = ( /obj/structure/table/steel, /obj/item/trash/candle, @@ -8688,6 +9673,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"khF" = ( +/obj/item/stool/padded, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/security/brig) "khS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8708,7 +9700,7 @@ dir = 1 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) "kkb" = ( @@ -8720,9 +9712,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"kkq" = ( -/turf/simulated/floor, -/area/main_map/maintenance/deck_three/forward/port) +"kkh" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "kkD" = ( /obj/machinery/vending/medical, /obj/effect/floor_decal/industrial/outline/blue, @@ -8734,16 +9727,6 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) -"klF" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/cable/heavyduty{ - icon_state = "1-4" - }, -/obj/structure/cable, -/turf/simulated/floor/reinforced/airless, -/area/space) "kmq" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 @@ -8819,15 +9802,29 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"kow" = ( -/obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/effect/floor_decal/techfloor{ +"knF" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) +"koN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/area/rnd/research) "koU" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay3) @@ -8852,6 +9849,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"kpN" = ( +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kqT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8862,6 +9863,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"krr" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"krP" = ( +/turf/simulated/wall/r_wall/prepainted/medical, +/area/main_map/maintenance/deck_three/forward) "ksn" = ( /obj/structure/cryofeed, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -8872,11 +9880,26 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) +"ksq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"ksA" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "ksH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) +"ksU" = ( +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) "ksZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8924,6 +9947,10 @@ "kuX" = ( /turf/simulated/floor/plating, /area/security/brig) +"kvr" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/cargo_shelter_dock) "kwc" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -8942,6 +9969,23 @@ "kxI" = ( /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"kye" = ( +/obj/structure/table/reinforced, +/obj/item/rcd/advanced, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "kyh" = ( /obj/machinery/cryopod/robot, /turf/simulated/floor/tiled/techfloor/grid, @@ -8951,18 +9995,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"kzs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) "kzu" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"kzZ" = ( +/turf/simulated/wall, +/area/main_map/maintenance/engineering/deck2/power_line) "kAq" = ( /obj/machinery/light/small{ dir = 8 @@ -8989,6 +10029,11 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"kBd" = ( +/obj/structure/largecrate, +/obj/item/inducer, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "kBs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -9027,7 +10072,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -9035,10 +10079,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) -"kBQ" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "kCv" = ( /turf/simulated/floor/tiled, /area/rnd/xenobiology) @@ -9057,21 +10097,16 @@ /obj/structure/closet/l3closet/virology, /turf/simulated/floor/tiled, /area/medical/virologyaccess) -"kCX" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/purple/border{ +"kDm" = ( +/obj/machinery/computer/station_alert/all, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"kEc" = ( +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "kEk" = ( /obj/structure/cable{ icon_state = "32-1" @@ -9084,11 +10119,9 @@ /obj/structure/bookcase/manuals/engineering, /turf/simulated/floor/wood, /area/security/brig) -"kEO" = ( -/obj/structure/ladder, -/obj/structure/mopbucket, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +"kEZ" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/space) "kFk" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/sblucarpet, @@ -9113,11 +10146,14 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/rnd/test_area) -"kGz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three/starboard) +"kGt" = ( +/obj/item/stool/padded, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "kGK" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9148,19 +10184,18 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"kJu" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) "kKV" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"kLr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "kLO" = ( /obj/structure/sign/department/telecoms, /turf/simulated/wall/r_wall/prepainted/command, @@ -9193,18 +10228,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"kMD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) -"kMG" = ( -/obj/machinery/door/airlock/glass_external, -/turf/simulated/floor/plating, -/area/space) "kMO" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing{ @@ -9212,6 +10235,15 @@ }, /turf/simulated/floor/plating, /area/hydroponics/garden) +"kNp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "kNz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -9232,6 +10264,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"kPy" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "kPN" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, @@ -9249,24 +10285,31 @@ "kQk" = ( /turf/simulated/wall/r_wall, /area/rnd/storage) -"kQy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "kQF" = ( /obj/structure/sign/warning/compressed_gas, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/storage) +"kQR" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/catering/bar_coffee{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "kRY" = ( /obj/machinery/gravity_generator/main/station, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) -"kSx" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/reinforced/airless, -/area/space) +"kRZ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/carpet, +/area/medical/psych_ward) +"kSD" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "kSY" = ( /turf/simulated/floor/plating, /area/main_map/Hangar_bay/deck2) @@ -9289,6 +10332,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"kUY" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 6 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "kVd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -9315,14 +10368,25 @@ }, /turf/simulated/floor/wood, /area/medical/psych_ward) -"kWj" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +"kVJ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) "kWL" = ( /obj/structure/fitness/punchingbag, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"kWO" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/table/steel_reinforced, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "kXf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -9332,6 +10396,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"kYG" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "kZe" = ( /obj/structure/flora/tree/jungle, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -9342,18 +10412,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"kZo" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/cable/heavyduty{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "kZq" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -9366,12 +10424,35 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"kZG" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-8" + }, +/obj/structure/cable/heavyduty{ + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"kZQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/multi_tile/glass/civilian, +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "lau" = ( /obj/structure/cable/green{ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/tcomms) +"laL" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three) "laT" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "rnd_can_store" @@ -9433,9 +10514,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych_ward) -"lej" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/space) "lek" = ( /turf/simulated/floor/wood, /area/library) @@ -9483,18 +10561,6 @@ /obj/random/maintenance/security, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"lgI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) -"lhq" = ( -/obj/structure/bed/chair/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "lhH" = ( /obj/machinery/porta_turret/ai_defense, /turf/simulated/floor/bluegrid, @@ -9505,15 +10571,13 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"lhX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"liB" = ( +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/surgeryroom1) "liG" = ( /turf/simulated/wall/prepainted/medical, /area/medical/medbay_primary_storage) @@ -9531,7 +10595,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "ljK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9543,16 +10608,15 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck3) -"lkj" = ( -/obj/effect/floor_decal/techfloor{ - dir = 9 +"lkb" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/cable/heavyduty{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "llw" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, @@ -9567,10 +10631,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"llG" = ( -/obj/structure/closet/crate/miningcar, -/turf/simulated/floor/tiled/techmaint, -/area/space) "llP" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -9578,15 +10638,9 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel, /area/security/prison) -"llX" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "llY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9632,11 +10686,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"lqy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/hydroponics/garden) "lqJ" = ( /obj/machinery/light/small{ dir = 1 @@ -9647,7 +10696,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "lrm" = ( /obj/machinery/cryopod, @@ -9656,7 +10705,7 @@ /area/crew_quarters/sleep/cryo) "lrD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "lrM" = ( /obj/structure/cable/green{ @@ -9684,18 +10733,22 @@ /turf/simulated/floor/wood, /area/chapel/main) "lsy" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/prison) -"lsO" = ( -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "lti" = ( /obj/random/trash, /turf/simulated/floor/plating, /area/security/brig) +"ltr" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"ltt" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 9 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ltA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on, /turf/simulated/floor/plating, @@ -9703,6 +10756,17 @@ "luo" = ( /turf/simulated/floor/plating, /area/crew_quarters/sleep/cryo) +"lup" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "luL" = ( /obj/machinery/door/window/brigdoor/westright{ name = "Containment Pen"; @@ -9729,6 +10793,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"lxb" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "lya" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -9738,24 +10806,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) -"lyt" = ( -/obj/machinery/door/blast/regular{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "lyz" = ( /obj/structure/sign/deck/third, /turf/simulated/wall, /area/main_map/hallway/deck3) -"lyN" = ( -/turf/simulated/wall, -/area/space) "lyV" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/caution{ pixel_y = -32 }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "lzd" = ( @@ -9797,7 +10862,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "lAH" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -9811,6 +10877,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"lBi" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/steel, +/area/security/prison) "lCE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -9823,6 +10894,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"lCF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "lDq" = ( /obj/machinery/atmospherics/component/unary/freezer{ dir = 4; @@ -9849,17 +10929,16 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"lEi" = ( -/obj/machinery/door/airlock{ - name = "Chapel Morgue"; - req_access = list(27) - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward/port) "lEw" = ( /obj/random/maintenance/cargo, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) +"lET" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/medical/psych) "lFL" = ( /obj/machinery/light/small{ dir = 1 @@ -9883,20 +10962,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"lGE" = ( -/obj/machinery/door/airlock{ - name = "Secondary Janitorial Closet"; - req_access = list(26) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) "lHC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -9919,19 +10984,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) -"lHT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" - }, -/obj/structure/curtain/black, -/turf/simulated/floor, -/area/space) -"lIb" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/reinforced, -/area/space) "lII" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, @@ -9948,15 +11000,42 @@ /obj/machinery/light/no_nightshift, /turf/simulated/floor/wood, /area/medical/psych/psych_2) +"lKv" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/glass{ + name = "Chapel" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/chapel/office) "lKy" = ( /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) +"lKN" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "lLh" = ( /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) +"lLn" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/chapel/main) "lMp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -9964,7 +11043,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "lMr" = ( /obj/machinery/bomb_tester, @@ -9974,10 +11056,12 @@ /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/dark, /area/rnd/robotics/resleeving) -"lMC" = ( -/obj/machinery/door/airlock/maintenance/common, +"lMz" = ( +/obj/machinery/door/airlock/glass_external, +/obj/structure/fans/tiny, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/plating, -/area/space) +/area/main_map/Hangar_bay/deck2) "lNT" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -9994,29 +11078,27 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"lOo" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "lOt" = ( /obj/structure/cable{ icon_state = "1-4" }, /obj/structure/cable, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /turf/simulated/floor/plating, /area/ai_upload) "lOD" = ( /turf/simulated/floor/tiled, /area/rnd/test_area) -"lOK" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) +"lOF" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/chapel/office) "lPi" = ( /obj/structure/table/wooden_reinforced, /obj/item/reagent_containers/food/drinks/drinkingglass{ @@ -10048,15 +11130,22 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pilot_office) -"lRl" = ( +"lQw" = ( +/obj/structure/sign/deck3{ + pixel_y = 32 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"lRV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +/mob/living/simple_mob/animal/passive/snake/noodle, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "lSA" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -10074,21 +11163,12 @@ /obj/structure/table/reinforced, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/cafeteria) -"lST" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/crew_quarters/pool) -"lTb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +"lSY" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "lTn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -10115,6 +11195,10 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"lUU" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/chapel/main) "lUV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/holopad, @@ -10123,11 +11207,10 @@ name = "Mainframe Base" }, /area/tcommsat/chamber) -"lVp" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, +"lVD" = ( +/obj/machinery/door/airlock/maintenance/engi, /turf/simulated/floor/plating, -/area/crew_quarters/cafeteria) +/area/engineering/engine_gas) "lVE" = ( /obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/borderfloor{ @@ -10138,6 +11221,10 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"lWa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "lWk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -10165,12 +11252,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"lWP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "lXa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"lXT" = ( +/obj/item/storage/fancy/candle_box, +/obj/structure/table/wooden_reinforced, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "lYn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10193,10 +11299,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"lYS" = ( -/obj/effect/floor_decal/industrial/danger, -/turf/simulated/floor/reinforced/airless, -/area/space) +"lYM" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "maA" = ( /obj/machinery/computer/rcon{ dir = 4 @@ -10206,10 +11315,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_monitoring) -"maF" = ( -/obj/item/storage/fancy/whitecandle_box, -/turf/simulated/floor/tiled/techfloor, -/area/space) "maP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10231,7 +11336,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -10240,25 +11345,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"mbE" = ( -/obj/machinery/door/airlock/science{ - name = "Pathfinder"; - req_one_access = list(44) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/tether/exploration/pathfinder_office) -"mcu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 10 - }, -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/rdoffice) +"mco" = ( +/turf/simulated/floor/tiled/steel, +/area/main_map/maintenance/deck_three/aft) "mcT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -10274,27 +11363,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"mdq" = ( -/obj/landmark{ - name = "lightsout" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) -"mej" = ( -/obj/machinery/door/blast/regular{ - dir = 8; - id = "toxin_storage_vent"; - name = "Toxin Storage Vent" - }, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/rnd/storage) "meN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, @@ -10309,6 +11377,14 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"mfY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "mhx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10333,9 +11409,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"miU" = ( -/turf/simulated/floor/tiled/monotile, -/area/space) "mjo" = ( /obj/effect/floor_decal/corner/green/border{ dir = 1 @@ -10345,6 +11418,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"mjq" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "mjr" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/dirt, @@ -10364,6 +11441,11 @@ "mjZ" = ( /turf/simulated/floor/tiled/techfloor, /area/security/prison) +"mke" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "mkf" = ( /obj/effect/floor_decal/corner/green/border{ dir = 10 @@ -10388,12 +11470,58 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/port) +"mlY" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mmk" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/wood, +/area/medical/psych_ward) "mmp" = ( /obj/machinery/air_alarm{ pixel_y = 22 }, /turf/simulated/floor/bluegrid, /area/ai) +"mmO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"mnn" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/floodlight{ + anchored = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/quartermaster/cargo_shelter_dock) "mnq" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -10401,12 +11529,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"mnH" = ( -/obj/structure/bed/chair/sofa/black/left{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/medical/psych) "mnL" = ( /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/cafeteria) @@ -10447,6 +11569,22 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"mpB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "mqu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10454,7 +11592,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "mqB" = ( @@ -10477,6 +11615,10 @@ /obj/item/flame/lighter/random, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"mrb" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "mri" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -10498,6 +11640,15 @@ /obj/structure/table/sifwoodentable, /turf/simulated/floor/wood, /area/medical/medbay3) +"mrT" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) "mrY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10516,6 +11667,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"msH" = ( +/obj/machinery/seed_storage/garden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) "msQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10526,7 +11683,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "mtd" = ( /obj/structure/stairs/spawner/east, @@ -10542,7 +11700,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/medical/psych_ward) "mtk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10583,6 +11741,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"mvi" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "mvj" = ( /turf/simulated/floor/wood, /area/chapel/main) @@ -10617,9 +11781,15 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"myG" = ( -/turf/simulated/floor/wood, -/area/space) +"myB" = ( +/obj/effect/floor_decal/techfloor/orange/corner{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "myX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -10666,24 +11836,12 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"mAs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"mBE" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) -"mAF" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/area/main_map/maintenance/deck_three/starboard) "mBU" = ( /obj/machinery/turnstile/entry, /turf/simulated/floor/tiled/techfloor, @@ -10714,6 +11872,13 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) +"mDE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/vacant/vacant_shop) "mEU" = ( /obj/effect/floor_decal/corner/green/border{ dir = 4 @@ -10730,15 +11895,22 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"mFY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +"mGc" = ( +/obj/structure/cable/blue{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"mHi" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "mHp" = ( /obj/machinery/light/no_nightshift{ dir = 4 @@ -10761,6 +11933,16 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"mIv" = ( +/obj/structure/marker_beacon/red, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mIJ" = ( +/obj/machinery/camera/network/cargo{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "mIP" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/dark, @@ -10783,6 +11965,10 @@ /obj/machinery/holopad, /turf/simulated/floor/carpet/bcarpet, /area/security/brig) +"mIZ" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "mJk" = ( /obj/structure/table/wooden_reinforced, /obj/item/storage/fancy/cigar/cohiba{ @@ -10795,6 +11981,22 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pilot_office) +"mJn" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice, +/obj/structure/cable/green{ + icon_state = "32-1" + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three) +"mJs" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "mJG" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -10849,17 +12051,6 @@ icon_state = "techmaint" }, /area/security/brig) -"mKB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/space) -"mKL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "mKU" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -10883,30 +12074,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"mNf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "mNo" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled/steel, /area/security/brig) -"mNy" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "mOb" = ( /turf/simulated/floor/reinforced, /area/main_map/Hangar_bay/deck2) @@ -10921,15 +12092,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/hydroponics/garden) -"mPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) "mPm" = ( /obj/structure/table/standard, /obj/item/defib_kit/jumper_kit, @@ -10941,6 +12103,26 @@ /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"mQA" = ( +/obj/machinery/button/doorbell{ + id = "funnt" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) +"mRg" = ( +/turf/simulated/floor/plating, +/area/engineering/engine_gas) +"mRT" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/port) +"mRV" = ( +/obj/structure/largecrate, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "mSr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -10948,7 +12130,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "mSL" = ( /obj/structure/table/steel, @@ -10962,7 +12144,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "mTq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10979,8 +12161,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"mTD" = ( +/turf/simulated/open, +/area/medical/medbay3) +"mTF" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/reinforced/outdoors, +/area/quartermaster/cargo_shelter_dock) "mTG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) "mUe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ @@ -10988,6 +12177,15 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"mUH" = ( +/obj/machinery/holoplant, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "mUM" = ( /obj/structure/table/steel, /obj/item/integrated_circuit_printer, @@ -11035,6 +12233,22 @@ }, /turf/simulated/floor/tiled/steel, /area/security/prison) +"mXc" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"mXk" = ( +/obj/landmark/spawnpoint/latejoin/station/cryogenics, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) "mXE" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -11087,6 +12301,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"naq" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"nar" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "naB" = ( /obj/structure/bed, /obj/item/bedsheet/ian, @@ -11114,10 +12338,16 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"nbt" = ( +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "nbF" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/carpet/bcarpet, /area/library) +"nbG" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/crew_quarters/heads/chief) "nch" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, @@ -11133,22 +12363,47 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ndl" = ( /obj/structure/sign/deck/third, /turf/simulated/wall/r_wall, /area/main_map/hallway/deck3) +"ndB" = ( +/obj/machinery/door/airlock/engineering{ + name = "Hangar Substation" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) +"nef" = ( +/obj/machinery/camera/network/research{ + network = list("Xenobiology") + }, +/turf/simulated/floor/glass/reinforced, +/area/rnd/xenobiology) "neC" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/aft/starboard) -"nff" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +"neX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "nfG" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11173,6 +12428,20 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/security/brig) +"nhx" = ( +/obj/machinery/door/airlock{ + name = "Secondary Janitorial Closet"; + req_access = list(26) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "nhK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -11249,8 +12518,30 @@ dir = 8 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/medical/medbay3) +"njL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/brig) +"njQ" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/stamp/ce, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "nku" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -11260,16 +12551,19 @@ "nkZ" = ( /turf/simulated/open, /area/chapel/main) -"nlf" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/space) "nlA" = ( /obj/structure/table/standard, /obj/item/aiModule/reset, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"nlK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) "nlM" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -11303,6 +12597,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"npq" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "npx" = ( /obj/machinery/conveyor_switch/oneway, /obj/map_helper/conveyor/lever{ @@ -11320,8 +12619,29 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"nqR" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"nqW" = ( +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "nrl" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/borderfloorwhite{ @@ -11351,31 +12671,17 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/theatre) -"nrr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) -"nrM" = ( -/obj/machinery/telecomms/hub/preset, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/tcommsat/chamber) "nrT" = ( /obj/machinery/requests_console/preset/research{ pixel_y = -32 }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"nsb" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "nsj" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11401,7 +12707,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "ntc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11415,6 +12722,16 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"ntB" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) +"ntW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "nuz" = ( /obj/machinery/door/airlock/maintenance/rnd{ name = "Toxins Maintenance Access"; @@ -11443,19 +12760,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled, /area/medical/virologyaccess) +"nwe" = ( +/obj/structure/table/standard, +/obj/machinery/computer/atmoscontrol/laptop{ + monitored_alarm_ids = list("xenopenvent"); + req_one_access = list(47,24,11); + dir = 8 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "nxV" = ( /obj/structure/cable/green{ icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"nyc" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/reinforced, -/area/space) "nyq" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -11483,19 +12806,10 @@ "nyX" = ( /turf/simulated/wall/r_wall, /area/ai_upload) -"nzw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) -"nAl" = ( -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +"nzR" = ( +/obj/machinery/disposal, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "nAx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -11521,21 +12835,6 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"nCv" = ( -/obj/machinery/button/remote/blast_door{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - pixel_y = -26; - req_access = list(31) - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/reinforced, -/area/space) "nCH" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -11560,11 +12859,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"nDj" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/port) "nDx" = ( /obj/machinery/newscaster{ pixel_x = 30 @@ -11585,6 +12879,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"nDF" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "nEb" = ( /obj/structure/bed/chair/sofa/black{ dir = 1 @@ -11626,21 +12926,23 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"nFh" = ( -/obj/machinery/button/doorbell, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three) "nGw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) -"nGI" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/effect/floor_decal/grass_edge{ +"nHd" = ( +/obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/hydroponics/garden) +/turf/simulated/open, +/area/medical/psych) +"nHg" = ( +/obj/machinery/door/airlock/maintenance/engi, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/engineering/engine_monitoring) "nHu" = ( /obj/structure/sink/kitchen{ name = "sink"; @@ -11672,14 +12974,6 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) -"nJh" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Kitchen Maintenance Access"; - req_one_access = list(28) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/crew_quarters/kitchen) "nJq" = ( /obj/machinery/door/airlock/medical{ name = "Pre-Revival Processing"; @@ -11692,11 +12986,6 @@ "nJC" = ( /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"nKb" = ( -/obj/structure/ladder, -/obj/structure/plasticflaps, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "nKt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -11721,10 +13010,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) -"nMi" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +"nLY" = ( +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/item/stack/material/phoron{ + amount = 25 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "nMw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11732,7 +13029,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "nMQ" = ( /obj/structure/bed/chair{ @@ -11785,9 +13085,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/medical/resleeving) -"nQj" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/space) +"nQw" = ( +/obj/structure/table/standard, +/obj/item/gun/energy/taser/xeno, +/obj/item/multitool, +/obj/item/melee/baton/slime/loaded, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "nQI" = ( /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/greengrid/airless, @@ -11800,20 +13104,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "nSZ" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three) -"nTh" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "nTK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11852,10 +13148,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/test_area) -"nUw" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/space) "nUA" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -11879,6 +13171,12 @@ /obj/item/stool/padded, /turf/simulated/floor/wood, /area/security/brig) +"nVO" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "nVX" = ( /obj/effect/floor_decal/grass_edge, /turf/simulated/floor/outdoors/dirt, @@ -11896,28 +13194,20 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/steel, /area/security/brig) -"nYm" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 +"nYi" = ( +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/obj/structure/closet/crate/bin{ + anchored = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "nYp" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"nZw" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "nZL" = ( /obj/structure/table/woodentable, /obj/machinery/light{ @@ -11951,10 +13241,6 @@ }, /turf/simulated/floor/wood, /area/security/brig) -"oaT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "obA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -11964,6 +13250,23 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) +"obV" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/medical/psych) +"oce" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/grass_edge, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "ocY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -11982,14 +13285,37 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"odS" = ( +"odZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/bcarpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"oeb" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"oej" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) +"oem" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 10 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "oeC" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/security/brig) +"oeP" = ( +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "oft" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12002,6 +13328,19 @@ "ofE" = ( /turf/simulated/floor/carpet, /area/medical/psych_ward) +"ofI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/mob/living/simple_mob/animal/passive/bird/parrot/polly, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "ogm" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) @@ -12121,7 +13460,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "ojM" = ( /obj/machinery/turretid/stun{ @@ -12131,20 +13471,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) -"ojV" = ( -/turf/simulated/floor/reinforced/airless, -/area/main_map/maintenance/deck_three/aft) "ojZ" = ( /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"okr" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "olv" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/medical/morgue) +"olE" = ( +/obj/machinery/field_generator, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "olX" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -12152,6 +13498,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"oma" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_four, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "omL" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12215,11 +13567,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ooV" = ( /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) +"ooW" = ( +/obj/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "opJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -12245,27 +13604,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"opO" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/starboard) "opU" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/hallway/deck3) -"oqO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) "org" = ( /obj/structure/railing, /turf/simulated/floor/tiled, @@ -12277,31 +13627,34 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virologyaccess) -"osk" = ( -/obj/machinery/door/firedoor{ - dir = 8 +"osC" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/structure/table/wooden_reinforced, +/obj/item/flame/candle/candelabra/everburn, +/turf/simulated/floor/tiled, +/area/chapel/office) "osM" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"osY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/medical/psych) "ota" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"otp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/zpipe/up, -/obj/machinery/atmospherics/pipe/zpipe/up/aux, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "otq" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -12348,21 +13701,33 @@ /obj/structure/lattice, /turf/simulated/open, /area/maintenance/library) -"ouC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 +"ouI" = ( +/obj/structure/catwalk, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 5 +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) +"ouR" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "ovA" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) +"ovP" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_three/forward) "owc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -12385,15 +13750,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"oxC" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-8" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "oyb" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -12429,19 +13785,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"oyH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"ozb" = ( +/obj/structure/window/reinforced, +/obj/structure/table/standard, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/door/airlock/glass{ - name = "Garden" +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ozy" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -12470,6 +13825,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"ozX" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "chapel" + }, +/obj/structure/curtain/black, +/turf/simulated/floor, +/area/chapel/office) "oAd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -12557,6 +13921,12 @@ /obj/landmark/spawnpoint/job/ai, /turf/simulated/floor/tiled/techfloor, /area/ai) +"oCx" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "oCE" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) @@ -12608,30 +13978,30 @@ "oGv" = ( /turf/simulated/wall/prepainted/medical, /area/medical/psych_ward) -"oHc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"oGM" = ( +/obj/machinery/door/firedoor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"oIB" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "oIE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"oIF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) "oIR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -12648,6 +14018,12 @@ /obj/machinery/holoplant, /turf/simulated/floor/wood, /area/chapel/main) +"oJd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "oJq" = ( /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/bcarpet, @@ -12658,6 +14034,11 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three) +"oKo" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_three/port) "oKs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -12687,6 +14068,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "oLB" = ( @@ -12706,7 +14088,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "oOs" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -12714,14 +14097,19 @@ }, /turf/simulated/floor/wood, /area/hydroponics/garden) -"oPo" = ( -/obj/machinery/door/airlock/atmos{ - name = "Civilian Atmospherics Backup"; - req_access = list(24) +"oOY" = ( +/obj/item/storage/fancy/blackcandle_box, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) +"oPl" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Kitchen Maintenance Access"; + req_one_access = list(28) }, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/kitchen) "oPw" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -12732,18 +14120,48 @@ }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/brig) -"oQa" = ( -/obj/structure/railing{ - dir = 4 +"oPL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/water/deep/indoors, -/area/hydroponics/garden) +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) +"oQc" = ( +/obj/turbolift_map_holder/euthenia_medical, +/turf/simulated/open, +/area/medical/medbay3) "oQn" = ( /turf/simulated/wall/prepainted/civilian, /area/hydroponics) +"oQP" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"oRD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/structure/closet/crate/biohazard, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/virology) "oSv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12754,18 +14172,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"oSU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "oTn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -12796,7 +14208,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "oUm" = ( /obj/machinery/door/airlock/glass{ @@ -12818,22 +14231,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"oVx" = ( -/obj/structure/ladder, -/obj/structure/largecrate, -/turf/simulated/floor/plating, -/area/space) -"oVz" = ( -/obj/structure/bed/chair/wood{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "oVB" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "oWg" = ( @@ -12856,7 +14258,7 @@ layer = 2.6 }, /obj/item/storage/toolbox/electrical, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance) "oYW" = ( @@ -12873,12 +14275,39 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"oZN" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward) "paf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"pbd" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) +"pbQ" = ( +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"pbY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "pcf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -12900,16 +14329,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) -"pdl" = ( -/obj/spawner/window/reinforced/full/firelocks, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) +"pcY" = ( +/obj/structure/ladder/updown, +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "pdt" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -12957,8 +14381,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) "pet" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -12980,6 +14403,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"pfo" = ( +/obj/structure/bed/chair/sofa/black/left{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "pfF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black, /turf/simulated/floor/tiled/techmaint, @@ -13009,7 +14438,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "pgd" = ( /obj/structure/window/reinforced{ @@ -13028,6 +14457,16 @@ /obj/machinery/door/window/eastleft, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virologyaccess) +"pgD" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "pgR" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -13038,16 +14477,12 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"pgY" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ +"pia" = ( +/obj/machinery/light/spot/no_nightshift{ dir = 4 }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/structure/window/phoronreinforced, -/turf/simulated/floor/reinforced/airless, -/area/rnd/test_area) +/turf/simulated/floor/wood, +/area/chapel/main) "piv" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -13120,19 +14555,17 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"pld" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "ple" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"plp" = ( +/obj/effect/floor_decal/industrial/danger/corner, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "plD" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -13144,9 +14577,31 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/security/brig) +"plG" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "pml" = ( /turf/simulated/wall/prepainted/medical, /area/main_map/maintenance/deck_three/forward/starboard) +"pmA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) +"pmL" = ( +/obj/machinery/door/window/brigdoor/eastright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "pnf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13166,6 +14621,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"pnY" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 6 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "poi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -13229,16 +14690,23 @@ /turf/simulated/floor/wood, /area/medical/psych/psych_1) "pqb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"pqm" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "pqp" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -13251,6 +14719,22 @@ /obj/item/integrated_circuit_printer, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"pqT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "prj" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/railing, @@ -13287,12 +14771,32 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"psG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "psP" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/port) +"ptp" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "ptx" = ( /turf/simulated/floor/wood, /area/security/brig) +"ptP" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/chapel/main) "pur" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -13300,13 +14804,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"puJ" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/carpet, -/area/medical/psych_ward) "puL" = ( /obj/structure/railing, /obj/structure/railing{ @@ -13323,12 +14820,6 @@ }, /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) -"pvF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/space) "pwi" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 8 @@ -13348,15 +14839,33 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"pwT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) +"pxa" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) +"pxp" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_three, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "pxE" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -13379,21 +14888,6 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"pzZ" = ( -/obj/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled, -/area/space) -"pAn" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"pAF" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) "pAQ" = ( /obj/structure/holohoop{ dir = 8 @@ -13423,7 +14917,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "pBu" = ( /obj/machinery/door/airlock/glass{ @@ -13461,6 +14956,12 @@ /obj/structure/closet, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"pEd" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "pEp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -13478,6 +14979,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "pFP" = ( @@ -13492,16 +14994,10 @@ }, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"pGl" = ( -/obj/structure/flora/pottedplant/orientaltree, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/port) +"pGb" = ( +/obj/machinery/computer/timeclock/premade/north, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "pGM" = ( /obj/machinery/door/airlock/security{ name = "Observation"; @@ -13531,13 +15027,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"pHG" = ( -/obj/structure/bed/chair/wood{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "pIa" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/borderfloorwhite{ @@ -13557,17 +15046,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/medical/virologyaccess) -"pID" = ( -/obj/structure/stairs/spawner/west, -/obj/structure/railing, -/turf/simulated/floor/reinforced, -/area/space) -"pIF" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2-4" +"pIA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "pIY" = ( /turf/simulated/wall, /area/hydroponics/garden) @@ -13585,24 +15073,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"pJd" = ( -/obj/structure/table/steel, -/obj/item/storage/box/lights/mixed, -/obj/item/storage/box/lights/mixed, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/space) -"pJr" = ( -/obj/machinery/camera/network/cargo{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/space) "pJP" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 @@ -13610,6 +15080,34 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"pJY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"pKu" = ( +/obj/structure/table/standard, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen/red{ + pixel_x = -1; + pixel_y = 3 + }, +/obj/item/pen/blue{ + pixel_x = -5; + pixel_y = -1 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "pLE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13642,6 +15140,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel, /area/security/brig) +"pMU" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/xenobiology) "pNf" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/structure/cable/heavyduty{ @@ -13653,18 +15160,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/psych_ward) -"pNq" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) -"pND" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "pOa" = ( /obj/structure/sign/deck/third{ pixel_y = -32 @@ -13689,12 +15184,12 @@ /obj/structure/morgue, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/surgeryroom1) -"pQd" = ( -/obj/structure/railing{ - dir = 8 - }, +"pPJ" = ( +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) +"pRa" = ( /turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) +/area/engineering/engine_eva) "pSP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -13714,12 +15209,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"pTA" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) "pTQ" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"pTX" = ( +/obj/machinery/pda_multicaster, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "pUQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13734,9 +15244,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) -"pVf" = ( -/turf/simulated/floor/tiled/techmaint, -/area/space) "pVn" = ( /obj/structure/cryofeed{ dir = 4 @@ -13749,6 +15256,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) +"pVs" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "pWD" = ( /obj/structure/railing, /obj/structure/railing{ @@ -13768,6 +15281,15 @@ "pWX" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay3) +"pXi" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) +"pXp" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "pXA" = ( /obj/machinery/camera/network/research{ dir = 4; @@ -13798,12 +15320,14 @@ "qaD" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three/starboard) -"qcI" = ( -/obj/structure/bed/chair/sofa/black/right{ - dir = 4 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +"qaV" = ( +/obj/structure/railing, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_three/port) +"qcq" = ( +/obj/structure/closet/largecardboard, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "qdx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -13817,11 +15341,19 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/critical/east_bump, +/obj/machinery/power/apc/critical/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"qec" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled, +/area/crew_quarters/pool) "qeA" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, @@ -13835,6 +15367,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) +"qfb" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "qfX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -13850,12 +15386,12 @@ }, /turf/simulated/floor/wood, /area/library) -"qhv" = ( -/obj/machinery/telecomms/broadcaster/preset_right, -/turf/simulated/floor/tiled/dark{ - initial_gas_mix = "n2=100;TEMP=80" +"qgX" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/area/tcommsat/chamber) +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "qhN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -13865,6 +15401,14 @@ }, /turf/simulated/wall/r_wall/prepainted/command, /area/ai) +"qhV" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) +"qif" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "qjd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13889,6 +15433,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/rdoffice) +"qkj" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/triumph/surfacebase/sauna) "qkG" = ( /obj/structure/sink/puddle, /obj/effect/floor_decal/grass_edge{ @@ -13896,14 +15447,10 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"qkW" = ( -/obj/structure/stairs/spawner/west, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) +"qkL" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "qkX" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -13964,10 +15511,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "qoc" = ( /obj/structure/table/standard, @@ -13979,13 +15523,20 @@ /obj/item/melee/baton/slime/loaded, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"qou" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, +"qos" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, -/area/vacant/vacant_shop) +/area/medical/psych_ward) +"qoy" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "qoK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -13996,6 +15547,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "qoR" = ( @@ -14015,6 +15567,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/library) +"qpl" = ( +/obj/machinery/door/airlock{ + name = "Chapel Morgue"; + req_access = list(27) + }, +/turf/simulated/floor/plating, +/area/chapel/office) "qpI" = ( /obj/structure/flora/pottedplant/tropical, /turf/simulated/floor/wood, @@ -14031,14 +15590,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) -"qqh" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/industrial/danger{ +"qqu" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/engineering/deck2/power_line) "qqx" = ( /obj/effect/mist, /obj/effect/floor_decal/spline/plain{ @@ -14046,13 +15608,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"qqU" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/space) "qqX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -14062,15 +15617,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"qrf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/starboard) "qrM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -14087,7 +15633,8 @@ /obj/structure/sign/deck3{ pixel_y = -32 }, -/turf/simulated/wall, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "qth" = ( /obj/structure/disposalpipe/segment{ @@ -14103,17 +15650,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tcommsat/entrance) -"qto" = ( -/obj/structure/table/rack/shelf, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration/pathfinder, -/obj/item/clothing/head/helmet/space/void/exploration/pathfinder, -/obj/item/binoculars, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "qtu" = ( /obj/structure/railing/grey, /turf/simulated/open, @@ -14146,14 +15682,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "qup" = ( -/obj/machinery/atmospherics/component/binary/pump/high_power{ - dir = 8; - id = "emg_pump"; - name = "Emergency Pen Flood Manual Switch" - }, -/obj/structure/window/phoronreinforced, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/window/phoronreinforced{ +/obj/machinery/atmospherics/portables_connector{ dir = 4 }, /turf/simulated/floor/plating, @@ -14168,6 +15698,9 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"qvz" = ( +/turf/simulated/floor/plating, +/area/chapel/office) "qvD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14178,14 +15711,6 @@ "qvM" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) -"qvU" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "qxH" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14197,7 +15722,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "qyn" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -14207,10 +15733,10 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/hallway/deck3) -"qyq" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three) +"qyt" = ( +/obj/machinery/holopad, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "qzO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14275,6 +15801,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"qCG" = ( +/obj/machinery/button/remote/driver{ + dir = 4; + id = "enginecore"; + name = "Emergency Core Eject"; + pixel_x = 22 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "qCY" = ( /obj/machinery/ai_slipper, /obj/machinery/turretid/stun{ @@ -14318,27 +15860,45 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"qDO" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "qEk" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/cafeteria) -"qFr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"qEF" = ( +/obj/structure/railing/grey{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/turf/simulated/open, +/area/rnd/xenobiology) +"qER" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access = list(); + req_one_access = list(7,29) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/space) -"qFt" = ( -/obj/structure/marker_beacon/red, -/turf/simulated/floor/reinforced/airless, -/area/space) -"qFU" = ( -/obj/effect/floor_decal/industrial/danger/corner, -/turf/simulated/floor/reinforced, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"qFz" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/port) "qGh" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet{ @@ -14346,6 +15906,25 @@ }, /turf/simulated/floor/wood, /area/rnd/xenobiology) +"qGJ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"qHb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/storage) "qHk" = ( /obj/effect/floor_decal/borderfloorblack, /obj/structure/table/standard, @@ -14356,6 +15935,26 @@ /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/techfloor, /area/tether/exploration/pilot_office) +"qHI" = ( +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 2; + icon_state = "pdoor0"; + id = "engsec_ld_c"; + name = "CE Office Blast Doors"; + opacity = 0 + }, +/obj/effect/paint_stripe/sun, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/chief) "qHJ" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 8 @@ -14369,6 +15968,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 1 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "qHW" = ( @@ -14383,19 +15983,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"qIk" = ( -/obj/machinery/seed_storage/garden, -/turf/simulated/floor/tiled, -/area/hydroponics) -"qIt" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced, -/area/space) "qIQ" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -14414,12 +16001,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"qKn" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/chapel/main) "qLg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -14429,22 +16010,16 @@ "qLK" = ( /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"qMu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/holopad, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) -"qNi" = ( -/obj/machinery/light/small{ - dir = 4 - }, +"qMb" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) +/area/main_map/maintenance/deck_three/aft/starboard) +"qNl" = ( +/obj/machinery/door/airlock/external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/starboard) "qOJ" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/light/no_nightshift{ @@ -14452,22 +16027,22 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) +"qPi" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/tiled, +/area/chapel/office) "qPj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) -"qPx" = ( -/mob/living/simple_mob/animal/sif/fluffy/silky, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "qPy" = ( /obj/structure/railing, /obj/structure/railing{ @@ -14475,6 +16050,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/port) +"qQe" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, +/area/hydroponics/garden) "qQA" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 @@ -14502,9 +16081,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"qRx" = ( -/turf/simulated/wall/r_wall/prepainted/medical, -/area/space) "qRF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/glass{ @@ -14526,10 +16102,22 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"qTn" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/space) +"qSW" = ( +/obj/structure/bookcase/legal/corpreg, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/security/brig) +"qTA" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "qTT" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 6 @@ -14545,14 +16133,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) -"qUu" = ( -/obj/structure/stairs/spawner/east, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"qUc" = ( +/obj/machinery/door/airlock/glass{ + name = "Cryogenic Storage" }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/sleep/cryo) "qUw" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ @@ -14567,6 +16156,45 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"qVx" = ( +/obj/machinery/door/airlock/multi_tile/glass/polarized{ + dir = 4; + id_tint = "saunatint"; + name = "Sauna" + }, +/turf/simulated/floor/tiled, +/area/triumph/surfacebase/sauna) +"qVM" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/forward/port) +"qWa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"qWJ" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/obj/machinery/shield_diffuser, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"qWW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "qWY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -14586,6 +16214,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"qXX" = ( +/turf/simulated/floor/airless/ceiling, +/area/engineering/engine_gas) "qYd" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/plating, @@ -14596,10 +16227,18 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"qZR" = ( -/obj/structure/bed/chair/sofa/black/corner, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +"qZf" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 4 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/test_area) "rah" = ( /obj/structure/lattice, /turf/space, @@ -14614,16 +16253,6 @@ }, /turf/simulated/floor/plating, /area/rnd/storage) -"raD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "raT" = ( /obj/machinery/door/airlock/maintenance/rnd, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14662,16 +16291,9 @@ "rbv" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) -"rbU" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/structure/flora/pottedplant/minitree, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/port) +"rdd" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "ref" = ( /obj/structure/morgue/crematorium, /turf/simulated/floor/tiled/techfloor, @@ -14684,16 +16306,14 @@ /turf/simulated/floor/grass, /area/medical/psych_ward) "rgf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/purple{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "rgg" = ( /obj/machinery/door/airlock/multi_tile/glass/polarized{ @@ -14738,6 +16358,20 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet, /area/medical/psych_ward) +"rix" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) +"rjb" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "rjm" = ( /obj/structure/lattice, /turf/simulated/open, @@ -14756,15 +16390,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"rkJ" = ( -/obj/structure/table/bench/steel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) "rlc" = ( /obj/machinery/camera/network/security{ dir = 1 @@ -14777,6 +16404,12 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/security/brig) +"rlB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "rmc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, @@ -14799,6 +16432,14 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"rmr" = ( +/obj/structure/table/woodentable, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/wood, +/area/triumph/surfacebase/sauna) "rmv" = ( /obj/machinery/door/airlock/maintenance/rnd{ req_access = list(47) @@ -14820,7 +16461,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "roI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14832,6 +16476,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"rpb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "rpv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/dark{ @@ -14842,6 +16496,12 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward) +"rpP" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "rpR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -14868,8 +16528,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"rqW" = ( +/obj/structure/table/woodentable, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/carpet, +/area/medical/psych) "rre" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) "rri" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -14923,24 +16588,31 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/theatre) +"ruq" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/vacant/vacant_shop) "rva" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"rvn" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "rvG" = ( /turf/simulated/open, /area/main_map/maintenance/deck_three/starboard) +"rvL" = ( +/obj/structure/table/bench/steel, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "rvP" = ( /obj/structure/lattice, /turf/simulated/open, @@ -14960,6 +16632,13 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) +"ryr" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "ryJ" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -15013,6 +16692,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology) +"rBu" = ( +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "rBv" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/black{ @@ -15025,6 +16710,19 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass, /area/medical/psych_ward) +"rCE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/pool) "rCO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 @@ -15034,6 +16732,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) +"rDh" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-4" + }, +/obj/structure/cable, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rDM" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15044,10 +16752,12 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) -"rFt" = ( -/obj/machinery/atmospherics/pipe/simple/insulated, -/turf/simulated/floor/reinforced/airless, -/area/space) +"rFw" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "rFy" = ( /obj/machinery/atmospherics/valve{ name = "Waste" @@ -15057,12 +16767,14 @@ "rFz" = ( /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) -"rGu" = ( -/obj/structure/railing{ - dir = 4 +"rFF" = ( +/obj/machinery/door/airlock/glass{ + name = "Psychiatric Wing"; + req_one_access = list(5) }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/medical/psych_ward) "rGT" = ( /obj/machinery/air_alarm/monitor/isolation{ alarm_id = "isolation_two"; @@ -15077,6 +16789,10 @@ /obj/item/clothing/ears/earmuffs, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"rIm" = ( +/obj/structure/lattice, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/aft/starboard) "rIo" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/window/reinforced, @@ -15089,8 +16805,10 @@ /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "rJt" = ( -/obj/structure/sign/deck3, -/turf/simulated/wall, +/obj/structure/sign/deck3{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "rJz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15141,10 +16859,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"rMn" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/turf/simulated/floor/reinforced, +"rLw" = ( +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) +"rLM" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three) "rMs" = ( /obj/effect/floor_decal/techfloor, /obj/structure/window/reinforced{ @@ -15152,10 +16882,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"rMK" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/reinforced, -/area/space) "rNw" = ( /turf/simulated/floor/airless, /area/space) @@ -15165,10 +16891,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"rNJ" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/crew_quarters/pool) "rNM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15179,7 +16901,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "rNP" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -15200,12 +16923,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) -"rPh" = ( -/obj/machinery/light/fairy{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) "rPk" = ( /obj/structure/railing, /turf/space, @@ -15225,6 +16942,15 @@ "rPG" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_three/forward) +"rPP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "rQH" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, @@ -15253,18 +16979,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) -"rSy" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 9 - }, -/turf/simulated/floor/airless/ceiling, -/area/engineering/engine_eva) "rSB" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing{ @@ -15279,18 +16993,6 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) -"rTd" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_three) "rTH" = ( /obj/machinery/door/airlock{ name = "Bathroom" @@ -15328,9 +17030,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) +"rWN" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "rXJ" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"rXQ" = ( +/obj/machinery/door/airlock{ + name = "Chapel Office" + }, +/obj/machinery/door/firedoor, +/obj/item/barrier_tape_segment/engineering, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "sax" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -15338,6 +17055,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"saJ" = ( +/turf/simulated/floor/glass/reinforced, +/area/rnd/xenobiology) "sbe" = ( /obj/structure/flora/ausbushes/sunnybush, /obj/effect/floor_decal/spline/plain{ @@ -15401,10 +17121,22 @@ /obj/machinery/atmospherics/component/unary/freezer, /turf/simulated/floor/tiled, /area/rnd/test_area) -"sgQ" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +"sfz" = ( +/obj/machinery/vending/hydronutrients{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"sfS" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled, +/area/chapel/office) "shd" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -15412,9 +17144,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"sho" = ( -/turf/simulated/floor/tiled/steel_ridged, -/area/tether/exploration/pathfinder_office) "sij" = ( /obj/structure/table/rack/shelf/steel, /obj/item/radio/off, @@ -15439,6 +17168,12 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/prison) +"siV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "siX" = ( /obj/structure/table/steel, /obj/item/material/minihoe, @@ -15492,6 +17227,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"slN" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "cargo_bay"; + landmark_tag = "supply_dock"; + name = "NSV Triumph Cargo Dock" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "smb" = ( /obj/structure/window/reinforced{ dir = 1 @@ -15520,28 +17265,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"smy" = ( -/obj/structure/table/woodentable, -/obj/item/folder/yellow{ - pixel_y = 5 - }, -/obj/item/pen, -/obj/item/paper{ - desc = ""; - info = "Central Command greets you, Pathfinder. If you're reading this memo, this is to remind you of your mission. Exploration is not for leisure: Nanotrasen's main interest in the Virgo system is to acquire new specimens of wildlife. Not only this, but the compiling of all Virgo flora is as important as the acquisition of fauna. Most importantly, your mission requires you to leave no crew behind. No discoveres are worth an explorer's life. We wish you a good expedition, Pathfinder."; - name = "Central Command memo"; - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/paper{ - desc = ""; - info = "I greet you, Pathfinder. I hope this message finds you well. I am Kaexae Ke'teq'xum, the first pathfinder to set foot in the very system your Tether is build, Virgo. I am too old to continue my research here, and so, between pathfinders, I only wish to grant you my luck in exploring these planets to depths I could not reach. Yours is a truly advanced shuttle and station, but its jewel is in its crew. Use it well, and discoveries will flow anew. May the stars shine bright to guide you."; - name = "Personal fax from Kaexae Ke'teq'xum"; - pixel_y = 3 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "snm" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -15596,7 +17319,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "spY" = ( /obj/effect/floor_decal/spline/plain{ @@ -15633,6 +17357,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"sqV" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "srs" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15656,12 +17387,22 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"sut" = ( -/obj/structure/bed/chair/sofa/black/left{ +"stN" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/carpet, -/area/medical/psych) +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) +"stT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "suv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15676,20 +17417,16 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, /area/security/brig) -"suZ" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 1 - }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/reinforced/airless, -/area/space) +"suW" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/engineering/deck2/power_line) "svC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) "svM" = ( @@ -15697,6 +17434,9 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck3) +"svP" = ( +/turf/simulated/wall/prepainted/civilian, +/area/chapel/office) "swu" = ( /obj/machinery/light/small{ dir = 8 @@ -15713,28 +17453,28 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/medical/psych) -"syU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/plating, -/area/space) "syV" = ( /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"sBc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +"szj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) +"szI" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "sCe" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -15757,14 +17497,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/hallway/deck3) +"sDV" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/chapel/office) +"sEg" = ( +/obj/structure/barricade, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "sEC" = ( /turf/simulated/wall/prepainted/medical, /area/medical/resleeving) -"sEO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "sEQ" = ( /obj/structure/table/rack/shelf/steel, /obj/item/roller, @@ -15789,14 +17534,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"sGF" = ( -/obj/machinery/light/fairy{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck3) "sHF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -15875,7 +17614,7 @@ dir = 4 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -15883,14 +17622,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) -"sKl" = ( -/obj/machinery/door/airlock/glass{ - name = "Cryogenic Storage" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/sleep/cryo) "sKp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -15931,10 +17662,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) "sLm" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/disease2/diseaseanalyser, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -15944,10 +17672,45 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) +"sMl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/command{ + name = "Chief Engineer"; + req_access = list(10) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"sME" = ( +/obj/machinery/telecomms/bus/preset_two/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "sNb" = ( /obj/structure/railing, /turf/simulated/floor/plating, /area/hydroponics/garden) +"sNQ" = ( +/obj/structure/flora/pottedplant/orientaltree, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/chapel/office) "sPf" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/structure/railing, @@ -16018,7 +17781,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "sQs" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -16090,6 +17854,10 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"sSQ" = ( +/obj/structure/bookcase, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft) "sSR" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -16126,12 +17894,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"sTW" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "sUa" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, @@ -16196,11 +17958,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"sWu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/port) +"sXi" = ( +/obj/machinery/door/blast/regular{ + dir = 8; + id = "toxin_storage_vent"; + name = "Toxin Storage Vent" + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/rnd/storage) "sXp" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 8 @@ -16247,15 +18016,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) -"tbw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/space) -"tbJ" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/space) +"tbD" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_two, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "tbO" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16271,23 +18038,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"tcx" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "tcK" = ( /obj/machinery/telecomms/server/presets/supply, /turf/simulated/floor/tiled/dark{ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"tdl" = ( -/obj/item/storage/fancy/blackcandle_box, -/turf/simulated/floor/tiled/techfloor, +"tdA" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/reinforced/outdoors, /area/space) "teQ" = ( /obj/machinery/air_alarm{ @@ -16296,6 +18060,18 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"teR" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/structure/cable/heavyduty{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "teS" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 4 @@ -16318,6 +18094,12 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three/aft/port) +"tgt" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) "tgx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -16380,22 +18162,27 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"tid" = ( -/obj/machinery/door/airlock/engineering{ - name = "Hangar Substation" +"tib" = ( +/obj/structure/cable/green{ + icon_state = "0-8" }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "16-0" }, -/turf/simulated/floor/plating, -/area/main_map/Hangar_bay/deck2) -"tip" = ( -/obj/item/stool/padded, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 1 }, -/turf/simulated/floor/carpet/bcarpet, -/area/crew_quarters/theatre) +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "tis" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -16425,6 +18212,14 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) +"tkb" = ( +/obj/machinery/disposal/wall{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "tkG" = ( /obj/effect/floor_decal/corner/green{ dir = 8 @@ -16459,6 +18254,18 @@ }, /turf/simulated/floor/wood, /area/library) +"tne" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"tnu" = ( +/obj/machinery/telecomms/relay/preset/triumph/deck_one, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "too" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -16473,6 +18280,19 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"toF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/aft/port) "toX" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -16507,7 +18327,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/library) "tqI" = ( @@ -16555,9 +18375,17 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"trW" = ( +/obj/structure/largecrate, +/obj/item/hardsuit/industrial/old/spring, +/obj/item/hardsuit_module/foam_sprayer, +/obj/random/powercell, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "tsd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "tsy" = ( /turf/simulated/floor/tiled/white, @@ -16584,6 +18412,9 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/test_area) +"ttJ" = ( +/turf/simulated/floor/reinforced/overhang, +/area/space) "ttR" = ( /obj/machinery/holoplant, /turf/simulated/floor/tiled/steel_ridged, @@ -16593,6 +18424,9 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/rnd/xenobiology) +"tug" = ( +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "tux" = ( /turf/simulated/floor/tiled/steel, /area/security/prison) @@ -16608,12 +18442,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) -"tvG" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "tvM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16621,15 +18449,12 @@ /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"twq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"twI" = ( +/obj/machinery/doorbell_chime{ + id_tag = "funnt" }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) +/area/main_map/maintenance/deck_three) "twW" = ( /obj/structure/table/standard, /obj/item/multitool, @@ -16641,22 +18466,20 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "txP" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) -"tzk" = ( -/obj/structure/railing{ - dir = 1 +"tyR" = ( +/obj/structure/bed/chair/wood{ + dir = 4 }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three) -"tzl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/space) +/obj/effect/floor_decal/spline/fancy/wood, +/obj/landmark/spawnpoint/job/clown, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "tzv" = ( /obj/machinery/air_alarm{ dir = 8; @@ -16689,6 +18512,14 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) +"tCE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/wood, +/area/chapel/main) "tCW" = ( /obj/structure/table/marble, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -16704,8 +18535,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"tEl" = ( +/turf/simulated/wall/prepainted/civilian, +/area/maintenance/lower/vacant_site) "tEr" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 9 @@ -16730,28 +18565,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"tGv" = ( -/obj/machinery/disposal, -/turf/simulated/floor/wood, -/area/space) -"tHe" = ( -/obj/structure/cable/green{ - icon_state = "32-8" - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/obj/machinery/door/firedoor, -/obj/structure/lattice, -/turf/simulated/open, -/area/space) "tJt" = ( /turf/simulated/wall, /area/rnd/robotics/resleeving) @@ -16778,12 +18591,36 @@ "tLp" = ( /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_2) +"tMt" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "tMG" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"tMQ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/water/deep/indoors, +/area/hydroponics/garden) "tNp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -16797,14 +18634,11 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) -"tNA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/aux{ - dir = 4 +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "tNE" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/resleeving) @@ -16818,7 +18652,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "tOj" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -16829,6 +18664,12 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) +"tOU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "tOZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16846,31 +18687,6 @@ "tPC" = ( /turf/simulated/floor/carpet/bcarpet, /area/library) -"tPK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) -"tQb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/int{ - req_access = list(27); - name = "Chapel Access" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward/port) "tQs" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, @@ -16882,10 +18698,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/hydroponics/garden) -"tQt" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plating, -/area/space) "tQO" = ( /obj/structure/railing{ dir = 8 @@ -16895,10 +18707,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/storage) -"tQR" = ( -/obj/structure/closet/largecardboard, -/turf/simulated/floor/reinforced, -/area/space) "tRh" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -16937,16 +18745,12 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"tSJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor{ - dir = 4 - }, +"tSD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/forward/starboard) +/area/main_map/Hangar_bay/deck2) "tTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16990,18 +18794,20 @@ /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled/techfloor, /area/rnd/rdoffice) -"tVd" = ( -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +"tUS" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "tVn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/monotile, /area/security/brig) +"tVw" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/medical/medbay3) "tVK" = ( /obj/structure/closet/hydrant{ pixel_x = 32 @@ -17071,11 +18877,15 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck3) -"tZE" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 1 +"tZj" = ( +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) +"uak" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-4" }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/reinforced/outdoors, /area/space) "ual" = ( /obj/machinery/atmospherics/component/unary/freezer{ @@ -17101,8 +18911,25 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"uaU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"ubc" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/rnd/xenobiology) "ubp" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, @@ -17153,6 +18980,13 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"udq" = ( +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "udv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17177,6 +19011,23 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled, /area/rnd/test_area) +"uec" = ( +/obj/effect/floor_decal/techfloor/orange/corner, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"uex" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "ueM" = ( /obj/item/barrier_tape_segment/engineering, /turf/simulated/open, @@ -17209,11 +19060,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"ugh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "ugi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17227,6 +19073,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"ugz" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "ugA" = ( /obj/structure/window/reinforced{ dir = 1 @@ -17260,6 +19113,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"uhs" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "uhz" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, @@ -17289,19 +19148,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) -"uig" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/space) "uih" = ( /obj/machinery/telecomms/server/presets/common, /turf/simulated/floor/tiled/dark{ @@ -17317,10 +19163,6 @@ /obj/item/retail_scanner, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"ujK" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "ujP" = ( /obj/structure/railing/grey{ dir = 8 @@ -17345,12 +19187,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three) -"ukS" = ( -/obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three) +"ukB" = ( +/turf/simulated/open, +/area/quartermaster/cargo_shelter_dock) "ulm" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -17363,6 +19204,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"ulw" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "uly" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 @@ -17393,22 +19240,43 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) +"unt" = ( +/obj/machinery/button/remote/blast_door{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + pixel_y = -26; + req_access = list(31) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "unz" = ( /obj/machinery/telecomms/processor/preset_four, /turf/simulated/floor/tiled/dark{ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"unQ" = ( -/obj/structure/railing{ - dir = 8 +"unA" = ( +/obj/structure/railing/grey{ + dir = 1 }, -/obj/structure/catwalk, -/obj/structure/railing, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/open, +/area/rnd/xenobiology) +"uoA" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three) "uoR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -17457,6 +19325,15 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"upP" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/water/deep/indoors, +/area/hydroponics/garden) "upZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 @@ -17481,6 +19358,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"urq" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "urs" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -17501,6 +19384,12 @@ }, /turf/simulated/floor/outdoors/dirt, /area/hydroponics/garden) +"usm" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "ust" = ( /turf/simulated/floor/tiled/monotile, /area/security/prison) @@ -17515,8 +19404,26 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"uuJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"uwa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/beige/border, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "uwC" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -17536,24 +19443,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/test_area) -"uwN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/landmark{ - name = "lightsout" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) -"uxE" = ( -/obj/effect/floor_decal/spline/fancy/wood, +"uwT" = ( /obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green, /turf/simulated/floor/wood, -/area/crew_quarters/theatre) +/area/medical/psych_ward) +"uxL" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/Hangar_bay/deck2) "uyl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -17562,15 +19463,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"uyO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/reinforced, -/area/space) -"uyU" = ( -/obj/machinery/holopad, -/turf/simulated/floor/reinforced, -/area/space) +"uyI" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "uyV" = ( /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) @@ -17610,17 +19508,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_1) -"uAG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/wall{ - can_open = 1 - }, -/area/main_map/maintenance/deck_three/aft) "uAJ" = ( /obj/structure/lattice, /obj/structure/railing{ @@ -17635,12 +19522,10 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/plating, /area/security/brig) -"uBz" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/space) +"uBx" = ( +/obj/effect/floor_decal/industrial/loading, +/turf/simulated/floor/tiled/monotile, +/area/security/prison) "uBL" = ( /turf/simulated/floor/grass, /area/security/brig) @@ -17665,9 +19550,13 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/test_area) +"uDn" = ( +/turf/simulated/floor, +/area/chapel/office) "uDr" = ( /obj/machinery/light/small, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "uDG" = ( /obj/structure/railing{ @@ -17676,16 +19565,23 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"uEO" = ( +"uEW" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 2 + }, +/turf/simulated/wall/prepainted/security, +/area/security/brig) +"uEY" = ( /obj/structure/stairs/spawner/east, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) -"uFc" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "uFT" = ( /obj/structure/railing{ dir = 4 @@ -17699,20 +19595,6 @@ /obj/item/tool/crowbar, /turf/simulated/floor/plating, /area/security/brig) -"uGJ" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" - }, -/obj/structure/cable/heavyduty{ - icon_state = "0-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"uGR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/starboard) "uHx" = ( /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall/prepainted/science, @@ -17733,14 +19615,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/prison) -"uIP" = ( -/obj/structure/bookcase/legal/corpreg, -/turf/simulated/floor/wood, -/area/security/brig) "uJn" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) +"uKh" = ( +/obj/effect/floor_decal/grass_edge, +/obj/machinery/seed_storage/garden, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "uKj" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17785,6 +19669,12 @@ "uMe" = ( /turf/simulated/wall/prepainted/civilian, /area/hydroponics/garden) +"uMi" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "uMP" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -17813,6 +19703,15 @@ /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"uNO" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-2" + }, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "uNX" = ( /obj/structure/railing{ dir = 1 @@ -17841,9 +19740,24 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/robotics/resleeving) +"uOa" = ( +/obj/machinery/shield_diffuser, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "uOf" = ( /turf/simulated/wall/prepainted/civilian, /area/triumph/surfacebase/sauna) +"uOi" = ( +/obj/structure/closet/emcloset, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) +"uOK" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/steel, +/area/security/brig) "uOL" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/tiled/dark{ @@ -17857,7 +19771,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -17866,7 +19780,6 @@ "uPq" = ( /obj/machinery/button/windowtint{ id = "draama"; - layer = 3.3; name = "Mystery Window Tint Control"; pixel_x = -24; range = 10 @@ -17900,15 +19813,23 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"uQa" = ( -/obj/machinery/doorbell_chime, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three) "uQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virology) +"uQs" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) +"uRc" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "uRh" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/black, @@ -17920,17 +19841,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"uRB" = ( -/obj/structure/catwalk, -/turf/simulated/floor/water/deep/indoors, -/area/hydroponics/garden) -"uRJ" = ( -/obj/structure/closet/secure_closet/pathfinder, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) "uSq" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/effect/floor_decal/grass_edge{ @@ -17943,11 +19853,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) +"uTd" = ( +/obj/structure/bed/chair/sofa/black/right{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "uTy" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, /area/medical/psych_ward) +"uVh" = ( +/obj/spawner/window/reinforced/full/firelocks, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "uVy" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, @@ -17955,7 +19878,7 @@ "uVV" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "uXm" = ( @@ -18005,7 +19928,6 @@ }, /obj/machinery/door/blast/shutters{ id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, /turf/simulated/floor/plating, @@ -18014,16 +19936,15 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/security/prison) +"uZc" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck3) "uZt" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/medbay_primary_storage) -"vav" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/aux, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "vaw" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 1 @@ -18037,7 +19958,9 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) "vbd" = ( -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/light/small, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "vbt" = ( /obj/machinery/door/firedoor, @@ -18055,12 +19978,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/main_map/hallway/deck3) -"vcc" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three) "vci" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Medbay Deck 3 Entrance"; @@ -18069,6 +19986,11 @@ /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/steel_ridged, /area/medical/medbay3) +"vcy" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/cafeteria) "vdC" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/syringegun, @@ -18086,18 +20008,18 @@ "vdM" = ( /turf/simulated/floor/tiled/white, /area/medical/medbay3) -"vei" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/east, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 +"vfd" = ( +/obj/landmark/spawnpoint/job/chaplain, +/turf/simulated/floor/wood, +/area/chapel/main) +"vfG" = ( +/obj/machinery/door/window/brigdoor/southright{ + name = "Containment Pen"; + req_access = list(55) }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck3) +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "vfI" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -18127,12 +20049,6 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"vgG" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) "vhj" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/surgery, @@ -18158,6 +20074,10 @@ }, /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) +"vhR" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "vhY" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing{ @@ -18168,18 +20088,44 @@ "vhZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance/common, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"via" = ( +/obj/structure/barricade, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "vie" = ( /turf/simulated/wall/r_wall, /area/tether/exploration/pilot_office) +"viF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "vjz" = ( /obj/structure/closet/secure_closet/psych, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) +"vjD" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/hanger_cafe) "vkf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -18193,7 +20139,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "vkD" = ( @@ -18217,6 +20163,9 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +"vmg" = ( +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "vmn" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, @@ -18242,7 +20191,7 @@ /area/main_map/maintenance/deck_three/aft) "vnz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) "vnI" = ( /obj/machinery/light/small{ @@ -18293,6 +20242,9 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/hydroponics/garden) +"vpU" = ( +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/quartermaster/cargo_shelter_dock) "vqr" = ( /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/tiled/techmaint, @@ -18325,12 +20277,40 @@ "vrF" = ( /turf/simulated/floor/grass, /area/medical/psych_ward) +"vsk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/medical/psych) "vsl" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on{ dir = 1 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) +"vsx" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/station_engineer, +/turf/simulated/floor/tiled, +/area/engineering/engine_monitoring) "vsA" = ( /obj/machinery/door/airlock/maintenance/rnd, /turf/simulated/floor/tiled/techmaint, @@ -18389,19 +20369,11 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"vwU" = ( -/obj/machinery/door/airlock/glass/mining{ - name = "Cargo Bay"; - req_access = list(31); - req_one_access = list() - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "vwV" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/rnd/test_area) "vxF" = ( @@ -18447,18 +20419,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) -"vzL" = ( -/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 = 8 - }, -/turf/simulated/floor/plating, -/area/space) "vAf" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -18477,6 +20437,10 @@ /obj/structure/ladder/up, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/port) +"vAZ" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/main_map/maintenance/deck_three/forward/port) "vBa" = ( /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/techmaint, @@ -18503,10 +20467,12 @@ /obj/effect/floor_decal/techfloor/corner, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"vDi" = ( -/obj/machinery/door/airlock/maintenance/command, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward) +"vDK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "vFz" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -18533,6 +20499,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"vFY" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "vGi" = ( /obj/structure/table/standard, /obj/item/storage/box/bodybags{ @@ -18553,6 +20526,34 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) +"vHr" = ( +/obj/machinery/door/window/brigdoor/southleft{ + req_access = list(55); + name = "Containment Pen" + }, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"vHS" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) +"vHY" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"vIZ" = ( +/obj/landmark/spawnpoint/job/xenobiologist, +/turf/simulated/floor/glass/reinforced, +/area/rnd/xenobiology) "vJE" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -18575,18 +20576,13 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) -"vLT" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 8 +"vLv" = ( +/obj/structure/bed/chair/wood{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) +/obj/landmark/spawnpoint/job/mime, +/turf/simulated/floor/wood, +/area/crew_quarters/theatre) "vMd" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ @@ -18610,10 +20606,13 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"vNt" = ( -/obj/spawner/window/reinforced/full/firelocks, +"vNh" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/port) "vNI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18653,7 +20652,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "vPF" = ( /turf/simulated/wall/r_wall, @@ -18674,12 +20674,6 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) -"vQA" = ( -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/space) "vQF" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 1 @@ -18703,7 +20697,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -18749,12 +20743,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/prison) -"vTB" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/brflowers, -/obj/effect/floor_decal/grass_edge, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/hydroponics/garden) "vUi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18767,15 +20755,23 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"vUn" = ( -/obj/structure/railing, -/turf/simulated/floor/reinforced, -/area/space) +"vUw" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/security/prison) "vVb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"vVo" = ( +/obj/machinery/atmospherics/pipe/simple/insulated{ + dir = 5 + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "vVB" = ( /obj/structure/railing{ dir = 1 @@ -18785,12 +20781,6 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three/starboard) -"vVT" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/carpet/sblucarpet, -/area/medical/psych/psych_2) "vWh" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -18811,37 +20801,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"vWD" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) "vWE" = ( /turf/simulated/floor/plating, /area/space) -"vXa" = ( -/obj/machinery/door/airlock/maintenance/engi{ - name = "Elevator Shaft Access"; - req_one_access = null +"vXf" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/forward/starboard) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck3) "vXr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) -"vXR" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "vYz" = ( /obj/machinery/camera/network/research{ dir = 4 @@ -18864,15 +20838,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/theatre) -"vZR" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/engine_monitoring) "waf" = ( /obj/structure/railing, /obj/structure/railing{ @@ -18880,12 +20845,9 @@ }, /turf/simulated/open, /area/main_map/maintenance/deck_three) -"waJ" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/main_map/maintenance/deck_three/forward/starboard) +"wbq" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/forward) "wbz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -18915,6 +20877,12 @@ }, /turf/simulated/floor/plating, /area/hydroponics) +"wcF" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "wcY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18928,20 +20896,15 @@ /obj/structure/cable/green{ icon_state = "4-9" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) -"wdG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "2-8" +"wdM" = ( +/obj/machinery/door/firedoor{ + dir = 2 }, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck3) "weH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18961,6 +20924,19 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"wfs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "wfS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -18990,18 +20966,20 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/tcomms) -"wia" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) +"whN" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "wiB" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/tiled, /area/rnd/test_area) -"wjE" = ( -/turf/simulated/wall/r_wall/prepainted/cargo, +"wjA" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_gas) +"wjX" = ( +/obj/structure/catwalk, +/turf/space, /area/space) "wkm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -19015,6 +20993,12 @@ }, /turf/simulated/floor/carpet, /area/security/brig) +"wlW" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "wmo" = ( /obj/machinery/vending/hydronutrients, /obj/effect/floor_decal/corner/green{ @@ -19052,6 +21036,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"woO" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/aft/starboard) "woS" = ( /obj/machinery/button/remote/blast_door{ id = "xenobiovs"; @@ -19093,16 +21083,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/security/brig) +"wqc" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_monitoring) "wqA" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"wqC" = ( -/obj/machinery/atmospherics/pipe/simple/insulated{ - dir = 6 +"wqJ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/carpet/blucarpet, +/area/crew_quarters/heads/chief) "wrj" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/closet/emcloset, @@ -19140,13 +21136,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) -"wsf" = ( -/obj/structure/ladder, -/obj/structure/ore_box, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft) +/area/main_map/maintenance/deck_three/aft/starboard) "wsx" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -19197,7 +21189,8 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "wtr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -19206,7 +21199,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) "wtw" = ( /obj/structure/table/rack/shelf, @@ -19215,10 +21209,6 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"wtI" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/space) "wtN" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19227,13 +21217,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) -"wuv" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 +"wtS" = ( +/obj/structure/cable/green{ + icon_state = "16-0" }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/robotics/surgeryroom1) +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/flight_deck) +"wuy" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hanger_cafe) "wuL" = ( /obj/structure/closet/crate/hydroponics{ desc = "All you need to start your own honey farm."; @@ -19254,15 +21249,6 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"wvv" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/medical/psych) "wvZ" = ( /obj/machinery/shower{ dir = 4 @@ -19293,14 +21279,10 @@ icon_state = "techmaint" }, /area/security/brig) -"wwf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, +"wwa" = ( +/obj/machinery/door/airlock/glass_external, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/airless/ceiling, /area/space) "wwF" = ( /obj/effect/floor_decal/spline/plain{ @@ -19308,11 +21290,6 @@ }, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"wwG" = ( -/obj/map_helper/network_builder/power_cable/green/auto, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/tiled, -/area/crew_quarters/cafeteria) "wyl" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, @@ -19329,10 +21306,6 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/hydroponics/garden) -"wzH" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/crew_quarters/theatre) "wAb" = ( /turf/simulated/floor/tiled, /area/hydroponics/garden) @@ -19342,10 +21315,26 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) +"wAU" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/hydroponics) +"wBl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_three/port) "wBm" = ( /obj/landmark/spawnpoint/job/ai/secondary, /turf/simulated/floor/greengrid, /area/ai) +"wBx" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "wBN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/bed/padded, @@ -19371,12 +21360,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"wDe" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "wDE" = ( /obj/random/trash, /obj/structure/cable/green{ @@ -19401,6 +21384,19 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three) +"wEr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/hanger_cafe) "wEB" = ( /obj/machinery/computer/atmos_alert{ dir = 4 @@ -19447,6 +21443,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"wFr" = ( +/obj/item/stool/padded, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/entertainer, +/turf/simulated/floor/carpet/bcarpet, +/area/crew_quarters/theatre) "wFE" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, @@ -19500,6 +21504,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/Hangar_bay/deck2) +"wHI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/port) "wHX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19515,6 +21529,10 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) +"wIx" = ( +/obj/effect/floor_decal/industrial/danger/corner, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "wJg" = ( /obj/structure/bed/chair{ dir = 4 @@ -19526,7 +21544,10 @@ /area/security/brig) "wKe" = ( /obj/structure/closet/emcloset, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "wKf" = ( /obj/structure/cable/green{ @@ -19541,8 +21562,30 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"wLy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) +"wLW" = ( +/obj/machinery/door/airlock/glass{ + name = "Chapel" + }, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "wNi" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -19554,14 +21597,16 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) -"wPd" = ( -/obj/structure/catwalk, -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 +"wOb" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) +"wOe" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "wPh" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled, @@ -19579,6 +21624,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/security/prison) +"wPD" = ( +/obj/machinery/telecomms/broadcaster/preset_right/triumph, +/turf/simulated/floor/tiled/dark{ + initial_gas_mix = "n2=100;TEMP=80" + }, +/area/tcommsat/chamber) "wQd" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -19587,6 +21638,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_three/starboard) "wQr" = ( @@ -19613,6 +21667,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"wRf" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/engineering/deck2/power_line) "wRg" = ( /obj/machinery/recharger/wallcharger{ pixel_x = -22 @@ -19651,12 +21709,25 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"wSn" = ( +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/Hangar_bay/deck2) "wSs" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"wSC" = ( +/obj/structure/bed/chair/sofa/black/left{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/psychiatrist, +/turf/simulated/floor/carpet, +/area/medical/psych) "wSK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -19670,25 +21741,17 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"wSZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/glass{ - name = "Chapel" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" +"wTr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/space) -"wTa" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/tether/exploration/pathfinder_office) +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "wUe" = ( /obj/machinery/pipedispenser, /obj/effect/floor_decal/industrial/warning/full, @@ -19701,19 +21764,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) -"wUU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/exploration/pilot_office) "wVA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck3) +"wVN" = ( +/obj/machinery/door/airlock/medical{ + name = "Morgue"; + req_access = list(6) + }, +/turf/simulated/floor/tiled/techfloor, +/area/medical/morgue) "wVX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -19722,18 +21786,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"wXb" = ( -/obj/structure/table/bench/steel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) -"wXh" = ( -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) "wXJ" = ( /obj/machinery/computer/borgupload, /turf/simulated/floor/tiled/techfloor, @@ -19762,22 +21817,25 @@ }, /turf/simulated/floor/wood, /area/library) -"xad" = ( -/obj/landmark{ - name = "lightsout" +"wYJ" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/effect/floor_decal/grass_edge{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/xenobiology) +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/hydroponics/garden) "xae" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 8 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"xar" = ( -/obj/structure/bed/chair/sofa/black, -/turf/simulated/floor/carpet/bcarpet, -/area/space) +"xbc" = ( +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "xbw" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/psych_ward) @@ -19787,6 +21845,13 @@ }, /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology) +"xbX" = ( +/obj/structure/table/bench/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "xdf" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck3) @@ -19802,20 +21867,11 @@ "xdq" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_three/aft) -"xdz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "xdN" = ( /turf/simulated/floor/tiled/techmaint, /area/tcommsat/entrance) "xet" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "xez" = ( @@ -19841,6 +21897,19 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) +"xfC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) +"xfO" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/cargo_shelter_dock) "xgq" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, @@ -19869,10 +21938,15 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor, /area/security/brig) -"xhR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +"xhP" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -19880,6 +21954,9 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/medical/psych) "xii" = ( @@ -19920,7 +21997,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "xjC" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -19929,15 +22006,18 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"xjO" = ( -/obj/structure/bed/chair/office/light{ +"xjH" = ( +/obj/machinery/light/spot/no_nightshift{ dir = 4 }, -/obj/landmark/spawnpoint/job/xenobiologist, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled/techmaint, +/area/security/prison) +"xjJ" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/monowhite, /area/rnd/xenobiology) "xku" = ( /obj/structure/bed/chair/sofa/black/left{ @@ -19966,32 +22046,24 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water/deep/indoors, /area/hydroponics/garden) -"xkK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_three/aft/starboard) "xmI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/starboard) +"xnv" = ( +/obj/landmark/spawnpoint/job/bartender, +/turf/simulated/floor/wood, +/area/main_map/hanger_cafe) "xof" = ( /obj/structure/table/sifwoodentable, /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/wood, /area/medical/medbay3) -"xoM" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/main_map/maintenance/deck_three/forward/starboard) "xpm" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/substation/tcomms) @@ -20045,16 +22117,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/surgeryroom1) -"xtt" = ( -/obj/machinery/door/airlock/lift, -/turf/simulated/floor/holofloor/tiled/dark, -/area/space) -"xtN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/space) "xtV" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, @@ -20066,18 +22128,36 @@ }, /turf/simulated/floor/wood, /area/medical/psych/psych_2) -"xuE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/map_helper/network_builder/power_cable/green/auto, -/turf/simulated/floor/tiled, -/area/hydroponics/garden) "xvc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) +"xvH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/white, +/area/medical/psych) +"xvL" = ( +/turf/simulated/wall/r_wall/prepainted/security, +/area/space) +"xvY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "xwb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -20100,13 +22180,26 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/theatre) +"xwh" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) +"xwm" = ( +/turf/simulated/wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/port) +"xwy" = ( +/obj/machinery/washing_machine, +/obj/machinery/light/spot/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/security/brig) "xwK" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/wood, /area/vacant/vacant_shop) -"xxo" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/main_map/maintenance/deck_three/forward/starboard) "xyY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -20119,10 +22212,6 @@ /obj/effect/floor_decal/corner/beige/bordercorner, /turf/simulated/floor/tiled/white, /area/medical/psych) -"xzI" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/tether/exploration/pathfinder_office) "xAK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/retro/on{ dir = 4 @@ -20145,6 +22234,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/port) +"xCe" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "xCx" = ( /obj/machinery/door/airlock/research{ name = "Toxins Lab"; @@ -20218,18 +22311,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) +"xEg" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/main_map/Hangar_bay/deck2) "xEJ" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_monitoring) -"xFo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo) "xFx" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/virologyaccess) @@ -20245,6 +22332,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology) +"xFQ" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 5 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/vacant_site) "xFR" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, @@ -20298,6 +22392,14 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) +"xJj" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xKX" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple, /obj/machinery/meter, @@ -20324,21 +22426,6 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/techmaint, /area/security/prison) -"xMz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) "xMD" = ( /obj/structure/fence{ dir = 4 @@ -20348,16 +22435,14 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"xMG" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/tether/exploration/pilot_office) "xNb" = ( /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) +"xNe" = ( +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xNF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -20389,13 +22474,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"xPi" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/obj/landmark/spawnpoint/job/xenobiologist, -/turf/simulated/floor/tiled/monotile, -/area/rnd/xenobiology) "xPj" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20405,6 +22483,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"xPF" = ( +/obj/machinery/door/airlock/atmos{ + name = "Civilian Atmospherics Backup"; + req_access = list(24) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/wall/prepainted/civilian, +/area/main_map/maintenance/deck_three/port) "xPL" = ( /obj/machinery/atmospherics/pipe/vent/high_volume{ dir = 4 @@ -20461,6 +22554,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/rdoffice) +"xRo" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/starboard) "xRW" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -20513,6 +22613,23 @@ /obj/machinery/holoplant, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) +"xTP" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/stairs/spawner/south, +/turf/simulated/floor/plating, +/area/main_map/Hangar_bay/deck2) +"xTU" = ( +/obj/machinery/door/airlock{ + name = "Chapel Morgue"; + req_access = list(27) + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three/forward/port) "xUh" = ( /obj/structure/railing/grey{ dir = 4 @@ -20528,6 +22645,16 @@ "xUy" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/atmospheric_substation/medical) +"xUD" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/pilot, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "xVc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -20538,12 +22665,20 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) "xVj" = ( /obj/structure/bed/psych, /turf/simulated/floor/wood, /area/medical/psych/psych_2) +"xVq" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "xVC" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; @@ -20570,15 +22705,29 @@ /obj/machinery/pipedispenser, /turf/simulated/floor/tiled, /area/rnd/test_area) -"xVM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"xWi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_three/port) +"xWL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_three/starboard) "xWX" = ( /obj/structure/closet/secure_closet/genpop, /obj/structure/window/reinforced{ @@ -20595,25 +22744,20 @@ "xXU" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_three/forward/starboard) -"xYD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_three/aft/port) "xYL" = ( /obj/structure/morgue{ dir = 2 }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) -"xZe" = ( -/obj/item/storage/fancy/candle_box, -/turf/simulated/floor/tiled/techfloor, -/area/space) +"xZb" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/light/spot/no_nightshift, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/cargo_shelter_dock) "xZj" = ( /obj/structure/closet/crate/corporate/nanotrasen, /turf/simulated/floor/tiled/techmaint, @@ -20642,6 +22786,11 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"yaw" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/cargo_shelter_dock) "yaR" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -20661,9 +22810,6 @@ /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled/white, /area/engineering/gravity_gen) -"ybO" = ( -/turf/simulated/floor/reinforced/airless, -/area/engineering/engine_eva) "ybP" = ( /obj/machinery/computer/power_monitor{ dir = 4 @@ -20680,6 +22826,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/retro/on, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three) +"ycb" = ( +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/maintenance/substation/flight_deck) "yce" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -20688,20 +22837,38 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"ycj" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ycp" = ( /obj/structure/table/standard, /turf/simulated/floor/wood, /area/security/brig) +"ycE" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/main_map/maintenance/deck_three/aft) "ycN" = ( /obj/structure/closet/firecloset, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) +"ydc" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/crew_quarters/cafeteria) "ydr" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/wood, /area/medical/psych/psych_1) "ydK" = ( /obj/structure/closet/emcloset, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/forward/starboard) "ydS" = ( @@ -20713,27 +22880,19 @@ }, /turf/simulated/floor/tiled/steel, /area/security/brig) -"yer" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ +"yeC" = ( +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ +/obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "0-2" }, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled/techfloor, +/area/tether/exploration/pilot_office) "yfn" = ( /obj/landmark{ name = "carpspawn" @@ -20750,10 +22909,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/sleep/cryo) -"ygv" = ( -/obj/machinery/computer/timeclock/premade/north, -/turf/simulated/floor/wood, -/area/space) "ygJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/bluegrid{ @@ -20797,15 +22952,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych_ward) -"yjI" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/space) "yjY" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing{ @@ -20816,15 +22962,8 @@ "ykj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_three/aft/starboard) -"ykH" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/direction_bump/south, -/turf/simulated/floor/reinforced, -/area/space) "ylv" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -20843,12 +22982,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"ylN" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_three/forward/starboard) (1,1,1) = {" vva @@ -21021,28 +23154,28 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva +mUe +opN +opN +xbW +opN +opN +opN +xbW +opN +opN +opN +xbW +opN +opN +opN +xbW +opN +opN +opN +qjY +aje +aje "} (2,1,1) = {" vva @@ -21215,66 +23348,30 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -"} -(3,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva +gLg +dwG +aZd +eqa +kpf +aje +dwG +eqa +kpf +aje +eEb +eqa +aZd +cdt +dwG +eqa +kpf +aje +dwG +eqa +kpf +aje +"} +(3,1,1) = {" vva vva vva @@ -21413,26 +23510,8 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(4,1,1) = {" vva vva vva @@ -21463,6 +23542,30 @@ vva vva vva vva +gLg +aZd +aZd +aZd +qth +aje +aZd +aZd +qth +aje +qth +aZd +aZd +cdt +aZd +gAi +qth +aje +aZd +gAi +qth +aje +"} +(4,1,1) = {" vva vva vva @@ -21607,26 +23710,8 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(5,1,1) = {" vva vva vva @@ -21651,6 +23736,30 @@ vva vva vva vva +gLg +aZd +aZd +aZd +qth +aje +aZd +aZd +qth +aje +qth +aZd +aZd +cdt +aZd +aZd +qth +aje +aZd +aZd +qth +aje +"} +(5,1,1) = {" vva vva vva @@ -21758,17 +23867,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -21793,15 +23891,6 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -dAV dAV dAV dAV @@ -21813,18 +23902,6 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -vva -vva -"} -(6,1,1) = {" -vva -vva -vva -vva vva vva vva @@ -21853,6 +23930,30 @@ vva vva vva vva +gLg +skX +skX +luL +bQc +aje +skX +xrN +bQc +aje +bQc +cxK +skX +aje +skX +too +bQc +aje +skX +bUR +bQc +aje +"} +(6,1,1) = {" vva vva vva @@ -21952,17 +24053,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22006,27 +24096,6 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -"} -(7,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva vva vva vva @@ -22055,6 +24124,30 @@ vva vva vva vva +gLg +dyx +jPo +elz +fLa +aje +jPo +elz +fLa +aje +fTu +elz +ugA +aje +aVI +elz +fLa +aje +jPo +elz +fLa +aje +"} +(7,1,1) = {" vva vva vva @@ -22146,17 +24239,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22166,6 +24248,14 @@ vva vva vva vva +nbG +nbG +nbG +nbG +sMl +nbG +nbG +nbG vva vva vva @@ -22200,26 +24290,6 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -"} -(8,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva vva vva vva @@ -22248,6 +24318,30 @@ vva vva vva vva +gLg +hMU +hMU +hMU +hMU +gzH +hMU +hMU +hMU +hMU +hMU +hMU +hMU +woS +hMU +hMU +hMU +wRg +hMU +hMU +iHw +aje +"} +(8,1,1) = {" vva vva vva @@ -22340,17 +24434,6 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22359,6 +24442,14 @@ vva vva vva vva +nbG +hbV +xbc +jYV +mmO +nYi +htA +nbG vva vva vva @@ -22393,16 +24484,8 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(9,1,1) = {" vva vva vva @@ -22429,6 +24512,30 @@ vva vva vva vva +gLg +kCv +kCv +kCv +kCv +kCv +kCv +pOc +oTn +kCv +kCv +kCv +kCv +kCv +kCv +kCv +pTh +myX +kCv +kCv +wFN +aje +"} +(9,1,1) = {" vva vva vva @@ -22529,22 +24636,19 @@ vva vva vva vva +nbG +fUm +aAJ +lWa +qoy +vDK +xbc +aeD vva vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva vva @@ -22563,6 +24667,18 @@ vva vva vva vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva vva vva vva @@ -22576,27 +24692,8 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV vva vva -"} -(10,1,1) = {" vva vva vva @@ -22609,6 +24706,34 @@ vva vva vva vva +gLg +kCv +kCv +kCv +kCv +kCv +kCv +kCv +bcP +kCv +kCv +kCv +kCv +kCv +kCv +kCv +hyw +kCv +kCv +kCv +kCv +aje +"} +(10,1,1) = {" +vva +vva +vva +vva vva vva vva @@ -22705,6 +24830,14 @@ vva vva vva vva +nbG +frM +iTJ +iTJ +ofI +wqJ +gKB +qHI vva vva vva @@ -22767,28 +24900,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +wUe +ttW +gSP +pfh +hox +kCv +kCv +qKh +xXQ +jHl +jHl +jHl +jHl +jHl +xXQ +akT +kCv +kCv +npx +otG +aje "} (11,1,1) = {" vva @@ -22891,14 +25024,14 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva +nbG +kDm +bEU +qyt +lRV +iTJ +iuo +itl vva vva vva @@ -22961,28 +25094,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +uwH +uwH +uwH +uwH +uwH +pMq +kCv +qKh +evz +pWL +qoc +pHd +dRH +cZF +evz +akT +kCv +qWZ +aje +bQc +aje "} (12,1,1) = {" vva @@ -23041,39 +25174,23 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva +vva +vva +vva +vva +vva +vva +vva vva vva vva @@ -23100,6 +25217,22 @@ vva vva vva vva +vva +nbG +njQ +pXi +psG +gqm +wcF +pbQ +nbG +vva +vva +vva +vva +vva +vva +vva dAV dAV dAV @@ -23155,28 +25288,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +pXA +hpl +pDZ +skX +pgd +fxw +kCv +qKh +iyb +hbl +jHl +jHl +dge +nrT +iyb +akT +kCv +yfv +skX +sQF +aje "} (13,1,1) = {" vva @@ -23279,14 +25412,14 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva +nbG +ouR +cUV +eoC +qCG +ajw +kye +nbG vva vva vva @@ -23349,28 +25482,28 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +fLv +iul +hpl +hpl +gJK +dtT +fxw +rva +bua +khS +khS +khS +khS +khS +vkf +dHQ +uie +mtS +kPN +azA +fGz +aje "} (14,1,1) = {" vva @@ -23444,15 +25577,7 @@ vva vva vva vva -qFt -vva -vva -vva -vva -vva -vva -vva -vva +mIv vva vva vva @@ -23481,6 +25606,14 @@ vva vva vva vva +nbG +nbG +nbG +nbG +nbG +nbG +nbG +nbG vva vva vva @@ -23534,8 +25667,7 @@ vva vva vva vva -qFt -vva +mIv vva vva vva @@ -23544,27 +25676,28 @@ vva vva vva vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +qGh +xje +jmG +mjH +drR +tju +kCv +jHl +ipG +roX +roX +roX +roX +jHS +jHl +jHl +ped +iQI +eRr +jUD +aje "} (15,1,1) = {" vva @@ -23638,7 +25771,7 @@ vva vva vva vva -dff +kEZ vva vva vva @@ -23728,10 +25861,7 @@ vva vva vva vva -dff -vva -vva -vva +kEZ vva vva vva @@ -23740,25 +25870,28 @@ vva vva vva vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +gLg +aje +aje +aje +aje +aje +aje +rmv +aje +aje +mxF +jHl +jHl +jHl +xFI +jHl +jHl +evl +opM +aje +aje +aje "} (16,1,1) = {" vva @@ -23832,7 +25965,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -23891,56 +26024,45 @@ vva vva vva vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dff -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dAV +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva dAV dAV dAV dAV dAV dAV +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +kEZ +vva +vva +vva +vva +vva +vva +vva dAV dAV dAV @@ -23951,8 +26073,19 @@ dAV dAV dAV dAV -vva -vva +aje +mxF +ddA +jHl +jHl +xFI +jHl +jHl +eRK +gWu +rBp +ppe +aje "} (17,1,1) = {" vva @@ -24026,7 +26159,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24116,8 +26249,7 @@ vva vva vva vva -dff -vva +kEZ vva vva vva @@ -24125,14 +26257,6 @@ vva vva vva vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV dAV dAV dAV @@ -24143,10 +26267,19 @@ dAV dAV dAV dAV -dAV -dAV -vva -vva +aje +knt +mJM +eXz +jXG +awI +roI +wSl +wSK +kCv +hgH +ual +aje "} (18,1,1) = {" vva @@ -24220,7 +26353,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24258,21 +26391,21 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24310,9 +26443,7 @@ vva vva vva vva -dff -vva -vva +kEZ vva vva vva @@ -24320,10 +26451,6 @@ vva vva vva vva -vva -vva -dAV -dAV dAV dAV dAV @@ -24334,13 +26461,19 @@ dAV dAV dAV dAV -dAV -dAV -dAV -dAV -dAV -vva -vva +aje +aje +aje +aje +aje +bRL +evz +aje +kCv +kCv +hgH +exK +aje "} (19,1,1) = {" vva @@ -24414,7 +26547,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24449,27 +26582,27 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24504,11 +26637,7 @@ vva vva vva vva -dff -vva -vva -vva -vva +kEZ vva vva vva @@ -24533,8 +26662,12 @@ dAV dAV dAV dAV -vva -vva +aje +kCv +kCv +fcv +fOQ +ijo "} (20,1,1) = {" vva @@ -24608,7 +26741,7 @@ vva vva vva vva -dff +sVT vva vva vva @@ -24640,33 +26773,33 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ sVT sVT sVT -dWI -dWI -dWI -dPc -dPc -dPc -dWI -dWI -dWI +etj +etj +etj +tne +tne +tne +etj +etj +etj sVT sVT sVT -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24698,11 +26831,7 @@ vva vva vva vva -dff -vva -vva -vva -vva +kEZ vva vva vva @@ -24727,8 +26856,12 @@ dAV dAV dAV dAV -vva -vva +aje +wPh +wPh +jkS +jkS +aje "} (21,1,1) = {" vva @@ -24801,9 +26934,9 @@ vva vva vva vva -dff -dff -dff +qmG +qmG +qmG vva vva vva @@ -24831,42 +26964,39 @@ vva vva vva vva -dff -dff -dff -dff -dff -ojV +kEZ +kEZ +kEZ +kEZ +kEZ +gaO jWM jWM jWM jWM -dff -dff -wqC -sTW -wqC -rFt -rFt -rFt -sTW -wqC -sTW -dff -dff +ttJ +ttJ +pnY +vVo +pnY +fDt +fDt +fDt +vVo +pnY +vVo +ttJ +ttJ rre rre rre rre -dff -dff -dff -dff -dff -dff -vva -vva -vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -24891,13 +27021,12 @@ vva vva vva vva -dff -dff -dff -vva vva vva vva +kEZ +kEZ +kEZ vva vva vva @@ -24921,8 +27050,12 @@ dAV dAV dAV dAV -vva -vva +idd +idd +idd +idd +idd +idd "} (22,1,1) = {" vva @@ -24995,9 +27128,9 @@ vva vva vva vva -dff -dff -dff +qmG +ntB +qmG vva vva vva @@ -25022,12 +27155,12 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM jWM jWM @@ -25035,8 +27168,8 @@ jWM vny vny jWM -dff -dff +ttJ +ttJ dFe dFe dFe @@ -25046,8 +27179,8 @@ bYV dFe dFe dFe -dff -dff +ttJ +ttJ rre sbe iNJ @@ -25055,12 +27188,12 @@ rre gcl xgX rre -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25085,9 +27218,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -25190,13 +27323,13 @@ vva vva qmG qmG +kSY qmG qmG qmG vva vva vva -vva dAV dAV dAV @@ -25213,24 +27346,24 @@ vva vva vva vva -dff -dff -dff -dff -dff -ojV +kEZ +kEZ +kEZ +kEZ +kEZ +gaO jWM jWM jWM jWM vny -vny +mco vny vny vny jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -25240,8 +27373,8 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre hKm keq @@ -25252,12 +27385,12 @@ rre vAf sqh rre -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25278,12 +27411,11 @@ vva vva vva vva -sVT -sVT -sVT -sVT -sVT -vva +oCb +oCb +oCb +oCb +oCb vva vva vva @@ -25309,6 +27441,7 @@ dAV dAV dAV dAV +dAV vva vva "} @@ -25383,9 +27516,9 @@ vva qmG qmG qmG -kSY -kSY -kSY +qmG +qmG +qmG qmG qmG qmG @@ -25404,27 +27537,27 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM jWM jWM jWM vny vny +xdq vny -vny -vny +mco vny vny vny jWM -dff -dff +ttJ +ttJ gnJ urZ urZ @@ -25434,28 +27567,27 @@ mhM urZ urZ xDD -dff -dff +ttJ +ttJ rre -aWO +eou bId uBL eRb tpm -hcS +iMk fsf iOQ rre gcl xgX rre -dff -dff -dff -dff -dff -dff -vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25470,17 +27602,16 @@ vva vva vva vva -sVT -sVT -sVT -vWE -vWE -vWE -sVT -sVT -sVT -vva vva +oCb +oCb +oCb +nDe +nDe +nDe +oCb +oCb +oCb vva vva vva @@ -25503,6 +27634,8 @@ dAV dAV dAV dAV +dAV +dAV vva vva "} @@ -25580,8 +27713,8 @@ kSY kSY kSY kSY -kSY -kSY +dEA +ntB qmG qmG vva @@ -25595,30 +27728,30 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM jWM jWM jWM xGX +sSQ +xdq vny vny +xdq vny +mco vny -vny -vny -vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -25628,15 +27761,15 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre rKq uBL uBL uBL tpm -hcS +iMk oia ckD uXY @@ -25646,12 +27779,12 @@ rre gcl xgX rre -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -25663,17 +27796,17 @@ vva vva vva vva -sVT -sVT -vWE -pVf -pVf -pVf -pVf -pVf -pVf -sVT -sVT +oCb +oCb +nDe +nDe +nDe +nDe +nDe +nDe +nDe +oCb +oCb vva vva vva @@ -25771,12 +27904,12 @@ qmG kSY kSY kSY -qmG -cZP -kSY kSY kSY kSY +tug +tug +tug qmG qmG qmG @@ -25786,33 +27919,33 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ jWM +sSQ vny vny vny vny +xdq vny vny +xdq vny vny vny -vny -vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ gnJ jmb jmb @@ -25822,54 +27955,54 @@ mhM jmb jmb xDD -dff -dff +ttJ +ttJ rre kmX uBL dcR bId tpm -hcS -nVL +iMk +khF xgU cUh lNT -hcS -hcS +iMk +iMk xGK awS rre rre rre rre -dff -dff -dff -dff -dff -dff -vva -vva -vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ vva vva -vva -sVT -sVT -sVT -vWE -vWE -pVf -yjI -nYm -sVT -vWE -pVf -pVf -sVT -sVT -sVT +aje +aje +aje +aje +aje +aje +aje +aje +nDe +eSK +mrT +epr +oCb +nDe +nDe +nDe +oCb +oCb +oCb vva vva vva @@ -25966,47 +28099,47 @@ kSY kSY kSY kSY -pQd -pQd -kSY -kSY -kSY kSY kSY +oej +uxL +uxL +uxL +uxL qmG qmG qmG qmG -sVT -sVT -sVT -sVT -dff -dff +qmG +qmG +qmG +qmG +kEZ +kEZ mVx mVx mVx -dff -bYV -dff +ttJ +ttJ +ttJ jWM +sSQ vny vny vny vny +xdq vny vny +xdq vny vny vny -vny -vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ mhM jmb jmb @@ -26016,56 +28149,56 @@ gnJ jmb jmb cVW -dff -dff +ttJ +ttJ rre nHu uBL uBL ftq tpm -hcS +iMk hMG aTB grs ycp -hcS +iMk khj jCW dFi bIM -bIM +hCv xMD rre rre rre rre -dff -dff -dff -dff -dff -sVT -sVT -sVT -sVT -sVT -vWE -vWE -vWE -vWE -pVf -vWE -vWE -sVT -sVT -sVT -pVf -vWE -sVT -sVT -sVT -sVT +kEZ +kEZ +kEZ +kEZ +kEZ +aje +anH +anH +anH +ifo +jNS +jNS +aje +nDe +eSK +nDe +nDe +nDe +nDe +nDe +nDe +nDe +oCb +oCb +oCb +oCb vva vva vva @@ -26149,7 +28282,7 @@ vva vva vva vva -dff +kEZ qmG qmG kSY @@ -26157,8 +28290,16 @@ kSY kSY kSY kSY +pTA +xTP +qmG kSY kSY +hZv +hZv +hZv +hZv +hZv kSY kSY kSY @@ -26166,24 +28307,17 @@ kSY kSY kSY kSY -kSY -kSY -kSY -kSY -kSY -vWE -vWE -vWE vie mVx pxE mVx uzs mVx -dff -bYV -dff +eHm +eHm +eHm jWM +sSQ vny vny vny @@ -26195,12 +28329,11 @@ vny vny vny vny -vny -vny -vny +mco +mco jWM -dff -dff +ttJ +ttJ gnJ jmb jmb @@ -26210,20 +28343,20 @@ mhM jmb jmb xDD -dff -dff +ttJ +ttJ rre wmo uBL bId uBL tpm -xIG +uEW nVL aTB grs rOe -hcS +iMk nDh aTj kcQ @@ -26236,32 +28369,32 @@ hcS rre rre rre -dff -dff -dff -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -pVf -pVf -pVf -jMZ -jMZ -sVT -pVf -pVf -fnD -vWE -vWE -bCw -fBa -drw +eHm +eHm +eHm +aje +anH +anH +anH +ifo +jNS +jNS +aje +nDe +eSK +eSK +eSK +eSK +eSK +eSK +eSK +eSK +qNl +nDe +nDe +aCu +ugz +jgd vva dAV dAV @@ -26343,7 +28476,8 @@ vva vva vva vva -dff +kEZ +qmG qmG qmG qmG @@ -26352,7 +28486,7 @@ qmG qmG qmG qmG -aTt +izE kSY kSY izE @@ -26362,8 +28496,7 @@ qmG qmG qmG qmG -qmG -qmG +lxb qmG mVx mVx @@ -26374,27 +28507,27 @@ bZH sbJ bdf mVx -dff +ttJ bYV -dff +ttJ jWM +sSQ vny vny vny vny +xdq vny -bMK -eTk -kEO -keQ +vny +xdq vny vny vny vny vny jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -26404,10 +28537,10 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre -aWO +eou eRb uBL bId @@ -26417,7 +28550,7 @@ hOM mIX grs hxR -hcS +iMk mNo dVc hcS @@ -26430,32 +28563,32 @@ uzo gjF xSy rre -dff -dff -dff -mUe -opN -opN -xbW -opN -opN -opN -xbW -opN -opN -opN -xbW -opN -opN -opN -xbW -opN -opN -opN -qjY +ttJ +ttJ +ttJ +aje +anH +anH +anH +ifo +ksA +uhs +aje +aje +aje +aje +aje +aje aje aje -cUp +rmv +aje +aje +aje +aje +aje +aje +bzp vva dAV dAV @@ -26537,13 +28670,14 @@ vva vva vva vva -dff +kEZ qmG jhf jhf jhf jhf jhf +kYG jhf jhf jhf @@ -26553,8 +28687,7 @@ jhf jhf jhf jhf -jhf -jhf +kYG jhf jhf jhf @@ -26562,33 +28695,33 @@ jhf mVx lPi pet -xMG +ddj aNF bZH aUy npC mVx -dff +ttJ bYV -dff +ttJ jWM +xdq +xdq +xdq +xdq +xdq +xdq vny vny -vny -vny -vny -wsf -ikZ -keQ -keQ +xdq vny vny vny vny vny jWM -dff -dff +ttJ +ttJ gnJ urZ urZ @@ -26598,8 +28731,8 @@ mhM urZ urZ xDD -dff -dff +ttJ +ttJ rre aWO bId @@ -26611,7 +28744,7 @@ ptx aTB grs kEq -hcS +iMk nXH dVc hcS @@ -26624,32 +28757,32 @@ gjF xSy gjF rre -dff -bYV -dff -gLg -dwG -aZd -eqa -kpf -aje -dwG -eqa -kpf +ttJ +ttJ +ttJ aje -eEb -eqa -aZd -cdt -dwG -eqa -kpf +nef +saJ +saJ +ifo +ifo +pMU +fxt +idH +gjx +unA +jNS +jNS +dqG +gRy +anH +ozb +jNS +jNS +fyg +anH aje -dwG -eqa -kpf -aje -cUp +bzp vva dAV dAV @@ -26731,7 +28864,7 @@ vva vva vva vva -dff +kEZ qmG jhf jhf @@ -26762,27 +28895,27 @@ nQJ aNF aNF mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny +vny vny vny -nKb -keQ -keQ -keQ +xdq vny vny vny vny vny jWM -dff -dff +ttJ +ttJ mhM urZ urZ @@ -26792,8 +28925,8 @@ gnJ urZ urZ cVW -dff -dff +ttJ +ttJ rre siX sjz @@ -26805,7 +28938,7 @@ ptx aTB grs iDM -hcS +iMk bAl dVc kWL @@ -26816,34 +28949,34 @@ xSy gjF xSy gjF -xSy +jBK rre -dff -bYV -dff -gLg -aZd -aZd -aZd -qth +ttJ +ttJ +ttJ aje -aZd -aZd -qth +saJ +saJ +saJ +ifo +ifo +eqL +qEF +grH +anH +unA +jNS +jNS +amo +anH +anH +vHr +jNS +jNS +fyg +ycj aje -qth -aZd -aZd -cdt -aZd -gAi -qth -aje -aZd -gAi -qth -aje -cUp +bzp vva vva vva @@ -26925,7 +29058,7 @@ vva vva sVT sVT -dff +kEZ qmG jhf jhf @@ -26953,48 +29086,48 @@ nnl nnl pfm ogM -ogM +aQi jyQ mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny vny vny -hjD -keQ -keQ -keQ +vny +xdq vny vny vny vny vny jWM -dff -dff -bYV -bsz -bsz -bsz -bYV -bsz -bsz -bsz -bYV -dff -dff +ttJ +ttJ +gnJ +qUw +qUw +cVW +xPL +mhM +qUw +qUw +xDD +ttJ +ttJ rre -hcS -hcS -hcS -hcS -hcS -hcS +iMk +iMk +iMk +iMk +iMk +iMk xCM kmQ uhH @@ -27012,32 +29145,32 @@ gjF xSy gbf rre -dff -bYV -dff -gLg -aZd -aZd -aZd -qth +ttJ +ttJ +ttJ aje -aZd -aZd -qth +saJ +saJ +saJ +ifo +ifo +vIZ +saJ +saJ +anH +eqL +qEF +qEF +pVs +saJ +vIZ +vfG +qEF +qEF +grH +anH aje -qth -aZd -aZd -cdt -aZd -aZd -qth -aje -aZd -aZd -qth -aje -cUp +bzp sVT sVT vva @@ -27116,12 +29249,12 @@ vva vva vva sVT -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ qmG -jhf +bzx jhf mOb mOb @@ -27140,48 +29273,48 @@ mOb mOb mOb jhf -cos +fdh mVx aNF aNF mVx -hbP -bXA +yeC +rFw bXA thw mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny vny vny -jje -doQ -keQ -keQ +vny +xdq vny vny vny vny jWM jWM -sVT -dff -dff -bzA -bzA -bzA -bYV -bzA -bzA -bzA -dff -dff -sVT +ttJ +ttJ +rWN +oem +ltt +ttJ +hXt +ttJ +oem +ltt +rWN +ttJ +ttJ rre rre uAM @@ -27206,35 +29339,35 @@ eJn eFd aYm rre -dff -bYV -dff -gLg -skX -skX -luL -bQc -aje -skX -xrN -bQc -aje -bQc -cxK -skX -aje -skX -too -bQc +ttJ +ttJ +ttJ aje -skX -bUR -bQc +szI +anH +anH +ifo +ifo +saJ +saJ +saJ +jLZ +anH +anH +anH +anH +saJ +saJ +anH +anH +anH +anH +anH aje -cUp -dff -dff -dff +bzp +kEZ +kEZ +kEZ sVT vva vva @@ -27308,12 +29441,12 @@ vva vva vva vva -dff -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ qmG jhf jhf @@ -27335,18 +29468,18 @@ mOb mOb jhf cos -vNt -jMZ -jMZ +eHp +tug +tug aNF fiW -mdq +ayC bXA qHk mVx -dff +ttJ bYV -dff +ttJ jWM vny vny @@ -27356,26 +29489,26 @@ vny vny vny vny -vny +xdq vny vny vny vny jWM jWM -sVT -dff -dff -gQn -gQn -gQn -dff -gQn -gQn -gQn -dff -dff -sVT +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ rre rre fXE @@ -27386,8 +29519,8 @@ wpW nDx iNg atE -uIP -hcS +qSW +iMk dYU nyq hcS @@ -27400,37 +29533,37 @@ xSy dvX oPw rre -dff -bYV -dff -gLg -dyx -jPo -elz -fLa -aje -jPo -elz -fLa +ttJ +ttJ +ttJ aje -fTu -elz -ugA -aje -aVI -elz -fLa -aje -jPo -elz -fLa +saJ +saJ +saJ +ifo +ifo +saJ +saJ +saJ +anH +ijC +fxt +fxt +pVs +saJ +saJ +vHr +fxt +fxt +ubc +anH aje -ciN -fBa -fBa -drw -dff -dff +xNe +ugz +ugz +jgd +kEZ +kEZ vva vva vva @@ -27502,9 +29635,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ sVT sVT sVT @@ -27529,59 +29662,59 @@ mOb mOb jhf cos -vNt -jMZ -jMZ +eHp +tug +tug aNF hbP -wUU +gEn bXA ezE mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny -vny -vny -vny -vny -vny -vny -vny -vny +xdq vny vny jWM jWM -sVT -dff -dff -bzA -bzA -bzA -bYV -bzA -bzA -bzA -dff -dff -sVT +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM +jWM rre rre wrw -hcS -hcS -hcS -hcS -hcS -hcS -hcS -hcS -hcS +iMk +iMk +iMk +iMk +iMk +iMk +iMk +iMk +iMk bLA nyq hcS @@ -27594,37 +29727,37 @@ dvX xSy dvX rre -dff -bYV -dff -gLg -hMU -hMU -hMU -hMU -gzH -hMU -hMU -hMU -hMU -hMU -hMU -hMU -woS -hMU -hMU -hMU -wRg -hMU -hMU -iHw +ttJ +ttJ +ttJ +aje +saJ +saJ +saJ +ifo +ifo +ijC +fxt +ubc +anH +unA +jNS +jNS +dqG +saJ +saJ +vfG +jNS +jNS +fyg +anH aje sVT sVT sVT -cUp -dff -dff +bzp +kEZ +kEZ vva vva vva @@ -27696,9 +29829,9 @@ vva vva vva vva -qFt -dff -dff +mIv +kEZ +kEZ sVT sVT sVT @@ -27723,27 +29856,27 @@ mOb mOb jhf cos -nQj -dNp -dNp +xEg +fmo +fmo mVx mri -mAs +szj bXA mQs mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq vny vny +jWM vny -cgK -eTk vny vny vny @@ -27751,31 +29884,31 @@ vny vny vny jWM -dff -dff -bYV -dFe -dFe -dFe -bYV -dFe -dFe -dFe -bYV -dff -dff +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny rre pqp xOL uGp -hcS +iMk nhe -hcS +iMk fbj sHT sHT wvZ -hcS +iMk bLA nyq lbn @@ -27786,39 +29919,39 @@ xSy dvX xSy dvX -xSy +jBK rre -dff -bYV -dff -gLg -kCv -kCv -kCv -kCv -kCv -kCv -pOc -oTn -kCv -kCv -kCv -kCv -kCv -kCv -kCv -pTh -myX -kCv -kCv -wFN +ttJ +ttJ +ttJ +aje +saJ +saJ +saJ +ifo +ifo +cUr +qEF +grH +anH +cUr +qEF +qEF +amo +saJ +saJ +xjJ +qEF +qEF +grH +anH aje sVT sVT sVT -cUp -dff -qFt +bzp +kEZ +mIv vva vva vva @@ -27890,9 +30023,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ sVT sVT sVT @@ -27917,22 +30050,36 @@ mOb mOb jhf cos -iJv -pVf -pVf +wSn +jhf +jhf aNF -hbP -gEA -bXA +xUD +oPL +hRZ mQs mVx -dff +ttJ bYV -dff +ttJ jWM vny vny vny +xdq +vny +vny +jWM +vny +vny +vny +vny +vny +vny +vny +jWM +vny +vny vny vny vny @@ -27944,25 +30091,11 @@ vny vny vny vny -jWM -dff -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -dff rre qAv wDE vws -hcS +iMk rlk xPW mua @@ -27982,37 +30115,37 @@ dvX xSy dvX rre -dff -bYV -dff -gLg -kCv -kCv -kCv -kCv -kCv -kCv -kCv -bcP -kCv -kCv -kCv -kCv -kCv -kCv -kCv -hyw -kCv -kCv -kCv -kCv +ttJ +ttJ +ttJ +aje +iUg +anH +anH +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +saJ +saJ +anH +anH +anH +anH +anH aje sVT sVT sVT -cUp -dff -dff +bzp +kEZ +kEZ vva vva vva @@ -28084,12 +30217,12 @@ vva vva vva vva -dff -dff -nff -ciN -dff -kSx +kEZ +kEZ +hXc +xNe +kEZ +kpN qmG jhf jhf @@ -28111,21 +30244,35 @@ mOb mOb jhf cos -pVf -pVf -pVf +jhf +jhf +jhf aNF liP -kCX +efb pct agK mVx -dff +ttJ bYV -dff +ttJ +jWM +vny +iQe +vny +xdq +vny +vny +jWM +vny +vny +vny +vny +vny +vny +vny jWM vny -oIF vny vny vny @@ -28138,37 +30285,23 @@ vny vny vny vny -jWM -dff -dff -mhM -urZ -urZ -xDD -bYV -gnJ -urZ -urZ -cVW -dff -dff rre gMD lti oeC -hcS +iMk iPw -hcS +iMk mKh avV fDS iPG -hcS +iMk bIM vwS bIM mUN -mUN +xwy xMD xSy dvX @@ -28176,37 +30309,37 @@ pAQ dvX xSy rre -dff -bYV -dff -gLg -wUe -ttW -gSP -pfh -hox -kCv -kCv -qKh -xXQ -jHl -jHl -jHl -jHl -jHl -xXQ -akT -kCv -kCv -npx -otG +ttJ +ttJ +ttJ aje -dTX -rGu -fJB -wPd -dff -dff +iUg +anH +anH +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +ifo +vIZ +saJ +vHr +fxt +fxt +ubc +anH +aje +bRB +mlY +vFY +rLw +kEZ +kEZ vva vva vva @@ -28280,10 +30413,10 @@ vva vva vva sVT -nff -ciN -unQ -dff +hXc +xNe +xJj +kEZ qmG jhf jhf @@ -28305,47 +30438,47 @@ mOb mOb jhf cos -nQj -osk -osk +xEg +fmo +fmo mVx mVx -aaO -aNF +dsi +vie mVx mVx -dff +ttJ bYV -dff +ttJ jWM xdq -uAG +kgL xdq jWM jWM jWM jWM +xdq +vny +vny +vny +vny +vny +vny jWM -jWM -jWM -jWM -jWM -jWM -jWM -jWM -sVT -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -sVT +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny +vny rre rre rre @@ -28358,9 +30491,9 @@ rre rre rre rre -hVs -mNf -hVs +dLd +njL +dLd rre rre rre @@ -28370,35 +30503,35 @@ rre rre rre rre -dff -bYV -dff -gLg -uwH -uwH -uwH -uwH -uwH -pMq -kCv -qKh -evz -pWL -qoc -pHd -dRH -cZF -evz -akT -kCv -qWZ +ttJ +ttJ +ttJ aje -bQc +hHL +hHL +jiP +ifo +ifo +jiP +epn +jiP +jiP +kdV +anH +ifo +ifo +saJ +saJ +vfG +jNS +jNS +fyg +ycj aje -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ sVT vva vva @@ -28476,7 +30609,7 @@ vva vva vva sVT -cUp +bzp sVT qmG jhf @@ -28499,97 +30632,97 @@ mOb mOb jhf cos -vNt -pVf -pVf -vNt -pVf -lhX -asI -asI -cmq -dff +eHp +jhf +jhf +eHp +jhf +uaU +cKv +hyQ +bXy +ttJ bYV -dff +ttJ cKv cNP -xYD +ioT qvM -cKv -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -fUX -dff -mhM -jmb -jmb -xDD -bYV -gnJ -jmb -jmb -cVW -dff -uFc -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +aLq +qvM +qvM +qvM +aLq +qvM +qvM +qvM +qvM +qvM +qvM +jpo +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +vny +vny +vny +vny +vny +vny +xvL +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ rre sUa wCg bIM rre -dff -dff -dff -dff -dff -dff -dff -dff -dff -bYV -dff -gLg -pXA -hpl -pDZ -skX -pgd -fxw -kCv -qKh -iyb -hbl -jHl -xad -xPi -nrT -iyb -akT -kCv -yfv -skX -sQF +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +aje +anH +anH +anH +ifo +ifo +anH +anH +eei +jiP +kdV +anH +ifo +ifo +saJ +saJ +xjJ +qEF +qEF +dCv +anH aje -dff +kEZ sVT sVT vva @@ -28670,8 +30803,8 @@ vva vva vva rPk -cUp -dff +bzp +kEZ qmG jhf jhf @@ -28693,97 +30826,97 @@ mOb mOb jhf cos -vNt -bmG -bmG -vNt -pVf -lhX -asI -asI -cmq -dff +eHp +oeb +oeb +eHp +jhf +uaU +cKv +hyQ +bXy +ttJ bYV -dff +ttJ cKv cNP -nzw +gUP +qvM +aLq +qvM +qvM +qvM +aLq +qvM cNP -cKv -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -fUX -dff -gnJ -jmb -jmb -cVW -bYV -mhM -jmb -jmb -xDD -dff -uFc -bYV -bYV -bYV -bYV -bYV -bYV +cNP +cNP +cNP +cNP +lVD +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +vny +vny +vny +vny +vny +vny +xvL bYV bYV bYV bYV bYV +kEZ +kEZ rre bAl qjd -uBW +uOK rre -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -bYV -dff -fLv -iul -hpl -hpl -gJK -dtT -fxw -rva -bua -khS -khS -khS -khS -khS -vkf -dHQ -uie -mtS -kPN -azA -fGz +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +aje +anH +anH +ifo +ifo +ifo +ifo +anH +fXn +hHL +pMU +idH +ifo +ifo +anH +anH +plp +bus +bus +bus +bus aje -dff +kEZ vva vva vva @@ -28864,8 +30997,8 @@ vva vva vva rPk -cdq -dff +qWJ +kEZ qmG jhf jhf @@ -28886,103 +31019,103 @@ mOb mOb mOb jhf -cos -nQj -nQj -nQj -nQj -pVf -lhX -asI -asI -cmq -dff +fdh +xEg +xEg +xEg +xEg +jhf +uaU +cKv +cNP +bXy +ttJ bYV -dff +ttJ cKv qvM -nzw +gUP qvM -cKv -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -fUX -dff -mhM -jmb -jmb -xDD -bYV -gnJ -jmb -jmb -cVW -dff -uFc -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff +aLq +qvM +qvM +qvM +aLq +qvM +cNP +qvM +qvM +qvM +qvM +jpo +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +vny +vny +ycE +vny +vny +xvL +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ rre bRt rwP -bIM +uBW rre -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -dff -gLg -qGh -xje -jmG -mjH -drR -tju -kCv -jHl -eDJ -roX -roX -roX -roX -jHS -jHl -jHl -ped -iQI -eRr -jUD +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ +ttJ aje -dff -vva -vva -vva -vva -vva +ifo +aFm +nQw +hCW +pKu +jrR +nwe +nLY +hHL +unA +fyg +ifo +ifo +anH +anH +ezx +dFl +vmg +vmg +dFl +aje +kEZ +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29059,9 +31192,9 @@ vva vva vva rah -dff +kEZ qmG -jhf +bzx jhf mOb mOb @@ -29081,50 +31214,50 @@ mOb mOb jhf cos -iJv -pVf -pVf -pVf -pVf -lhX -asI -asI -dFJ -cKv -cKv -cKv -cKv -hyW -raD -hyW -cKv -cKv +jhf +jhf +jhf +jhf +jhf +uaU cKv +cNP cKv cKv cKv cKv cKv +hyW +arh +hyW +aLq +aLq +qFz +aLq +aLq +aLq +okr +aLq iTP iTP iTP iTP -sVT -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -sVT -rre -rre -rre +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre rre rre @@ -29149,34 +31282,34 @@ oCb oCb oCb oCb -gLg -aje aje +rmv aje aje aje aje -rmv aje aje -mxF -jHl -jHl -jHl -xFI -jHl -jHl -evl -opM aje aje +ifo +ifo +ifo +ifo +ifo +ifo +tkb +cgY +mGc +aTI +bHI aje rah -vva -vva -vva -vva -vva +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29253,7 +31386,7 @@ vva vva vva rah -dff +kEZ jeM jhf mOb @@ -29274,22 +31407,22 @@ mOb mOb mOb jhf -eVa -tzl -tzl -tzl -qFr -tzl -mFY -mKB -mKB -gMZ -ksH -erV +bFt +tSD +tSD +tSD +dxC +tSD +ptp +eDc +dsL +dsL +gok +toF qvM hyW bOc -huS +aDc hxF aLq qvM @@ -29297,35 +31430,35 @@ qvM qvM qvM rCO -qvM +cNP qvM iTP lKy lKy iTP -dff -dff -mhM -urZ -urZ -xDD -bYV -gnJ -urZ -urZ -cVW -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM bIM +hCv bIM bIM -bIM -bIM -bIM -bIM -fkB +fVq bIM dYU bIM @@ -29340,37 +31473,37 @@ jFV rre nDe nDe -dWB -nDe +eey nDe +edw dPN +kPy +kPy eey nDe -nDe -nDe xAK nDe -eSK nDe +fQi aje -mxF -xjO -jHl -jHl -xFI -jHl -jHl -eRK -gWu -rBp -ppe +ifo +ifo +ifo +ifo +aAx +kSD +aje +olE +cUG +eYX +olE aje rah -vva -vva -vva -vva -vva +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29447,7 +31580,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -29468,22 +31601,22 @@ mOb mOb mOb jhf -cos -gDb -xzI -xzI -mbE -gDb -gDb -asI -nQj -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +qvM qvM -lRl -sWu -jXa -gqu -frY +qvM +dpX +dsL +dVK +kNp +jzM mkp ksH ksH @@ -29497,28 +31630,28 @@ wha xpm xpm iTP -dff -dff -gnJ -urZ -urZ -cVW -bYV -mhM -urZ -urZ -xDD -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM iHr kcQ kcQ kcQ -nTh -kcQ -kcQ kcQ kcQ sYE @@ -29534,37 +31667,37 @@ rre rre nDe nDe -dWB +eey ths -nDe +kPy dlL -fNv -ykj -ykj +iGe +iGe +nlK ykj xjj -eSK -eSK -eSK +nDe +nDe +nDe +aje +anH +anH +anH +anH +aAx +ifo +aje +aje +pgD +pmL aje -knt -mJM -eXz -jXG -awI -roI -wSl -wSK -kCv -hgH -ual aje rah -vva -vva -vva -vva -vva +wjX +wjX +wjX +wjX +wjX vva dAV dAV @@ -29641,7 +31774,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -29662,22 +31795,22 @@ mOb mOb mOb jhf -cos -gDb -btT -jXZ -sBc -jXZ -sho -asI -asI -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +tfK +tfK lfp rsH bDW qvM dOe -cNP +hzS iDn hyW qvM @@ -29691,26 +31824,26 @@ iTP lKy xpm iTP -dff -dff -mhM -urZ -urZ -xDD -bYV -gnJ -urZ -urZ -cVW -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM eFY jzH -jzH -jzH -qMu dsR dsR dsR @@ -29719,7 +31852,7 @@ tVn hlI ufg bIM -hcS +iMk foM wkm bON @@ -29728,30 +31861,30 @@ rre nDe nDe nDe -dWB +eey msQ -ykj +iGe rgf +kPy +kPy eey -eSK -nDe -qYE +iDQ pwi +fQi nDe nDe -eSK aje aje aje aje aje -bRL +qER evz aje -kCv -kCv -hgH -exK +jUl +gjG +aZd +aZd aje rah vva @@ -29835,7 +31968,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -29856,22 +31989,22 @@ mOb mOb mOb jhf -cos -xzI -wTa -wTa -qPx -jXZ -gDb -asI -asI -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +hyQ +hyQ rjm fpS bDW qvM qvM -cNP +kLr cNP aLq eLh @@ -29885,28 +32018,28 @@ iTP oyE lau iTP -dff -dff -gnJ -qUw -qUw -cVW -xPL -mhM -qUw -qUw -xDD -dff -dff +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre bIM cBC baA baA baA -mAF -baA -baA baA baA wJg @@ -29922,32 +32055,32 @@ rre nDe nDe nDe -dWB +eey vPw -nDe -mcu -dbO +kPy +jzz +jzz cXj jzz aDu aDu aDu aDu -eSK +nDe nDe nDe hZU -dKw +qMb iqq -xMz +koN uRt aje -kCv -kCv -fcv -fOQ -ijo -suZ +aZd +aZd +aZd +aZd +aje +kEZ vva vva vva @@ -30029,7 +32162,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30050,20 +32183,20 @@ mOb mOb mOb jhf -cos -xzI -jwm -smy -uwN -nMi -gDb -asI -asI -dFJ +eIx +mOb +mOb +mOb +mOb +mOb +mOb +cKv +rjm +rjm rjm oCJ bDW -aLq +qvM gNU gNU gNU @@ -30081,24 +32214,24 @@ bbl jzg jzg jzg -cBh -tvG -dfU -mTG -wia -mTG -tvG -dfU -cBh -mTG -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny rre gaB bIM bIM -bIM -bIM -bIM muL bIM bIM @@ -30107,7 +32240,7 @@ mNo mNo ydS bIM -hcS +iMk cAH xqw naB @@ -30116,9 +32249,9 @@ rre nDe nDe nDe -dWB +pqm vPw -nDe +kPy jzz qup qpM @@ -30127,19 +32260,19 @@ niE nsN cix aDu -eSK -eSK -eSK -eSK -eSK +nDe +fQi +nDe +nDe +nDe dDD wFj rmn aje -wPh -wPh -jkS -jkS +aZd +aZd +aZd +aZd aje rah vva @@ -30223,7 +32356,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30241,19 +32374,19 @@ mOb mOb mOb mOb +jhf +jhf +jhf +eIx mOb mOb -jhf -cos -gDb -gxi -kWj -mKL -dKj -gDb -asI -asI -dFJ +mOb +mOb +mOb +mOb +cKv +hyQ +hyQ rjm fpS bDW @@ -30263,7 +32396,7 @@ tcK sIT iUQ lzd -ass +sIT dTg sIT gTx @@ -30275,18 +32408,21 @@ fRt wbJ oXn jzg -rvn -oaT -oaT -kQy -tNA -fud -iuw -iuw -ioF -mTG -vWE -rre +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy tVU hsO lsy @@ -30294,9 +32430,6 @@ lsy lsy lsy lsy -lsy -lsy -lsy fDD siI suv @@ -30310,9 +32443,9 @@ rre nDe nDe nDe -dWB +eey vPw -nDe +kPy jzz sXp qpM @@ -30325,7 +32458,7 @@ nDe nDe qYE nDe -nDe +fQi iqq wFj rmn @@ -30417,7 +32550,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30435,32 +32568,32 @@ mOb mOb mOb mOb +jhf +rpb +siV +vHS +mOb mOb mOb -jhf -cos -gDb -gsM -uRJ -qto -gSo -gDb -asI -asI -dFJ +mOb +mOb +mOb +cKv +hyQ +hyQ rjm fpS bDW qvM gNU -jGU +dwL sIT -fJt +sME bFs sIT sJr sIT -cRw +tMt jzg pOC ftF @@ -30469,27 +32602,27 @@ dnk exk jPL jzg -ybO -ybO -gLk -hAT -tNA -xdz -sgQ -ybO -ybO -mTG -vWE -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ kep lsy xWX cHQ rIo -xWX -cHQ -rIo lsy kej tvM @@ -30519,7 +32652,7 @@ jzz jzz jzz jzz -nDe +fQi iqq pAZ rmn @@ -30611,7 +32744,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30629,19 +32762,19 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ -dFJ +lWP +cKv +cKv +cKv +cKv +cKv +cKv +cKv +cKv +cKv +mRT +mRT ktu dtO bDW @@ -30649,10 +32782,10 @@ qvM gNU irh iNA -fJt -fJt +oma +pxp sIT -qhv +wPD sIT sKP jzg @@ -30663,27 +32796,27 @@ sij exk fot jzg -uEO -uEO -gLk -hAT -tNA -xdz -sgQ -uEO -uEO -mTG -vWE -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ lsy xWX cHQ rIo -xWX -cHQ -rIo lsy llP upr @@ -30700,7 +32833,7 @@ teW teS eey vPw -nDe +kPy jzz iOW xKX @@ -30805,7 +32938,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -30823,12 +32956,12 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx cKv -cNP +qvM +qvM +aLq cNP cNP cNP @@ -30857,27 +32990,27 @@ omL bHu iRT jzg -mTG -mTG -iVS -hAT -tNA -xdz -iVS -mTG -mTG -mTG -vWE -sVT +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ lsy gKR cHQ gwQ -gKR -cHQ -gwQ lsy hGG xtV @@ -30885,7 +33018,7 @@ rPn aZc uHP dyu -cHQ +xjH cHQ lsy dKw @@ -30999,7 +33132,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31017,14 +33150,14 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx cKv +aLq +aLq +aLq cNP qvM -qvM bkR qvM qvM @@ -31037,10 +33170,10 @@ cNP gNU cUm sIT -fJt -nrM +tnu +dAZ sIT -clW +dZg iEg rpv qtn @@ -31051,21 +33184,21 @@ cQB exk cyt jzg -lgI -oaT -oaT -dyP -pND -vav -ugh -ugh -ouC -mTG -vWE -sVT -mjZ -mjZ -mjZ +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ mjZ @@ -31073,7 +33206,7 @@ mjZ mjZ mjZ vuQ -fYC +uBx uYO dTn aZc @@ -31088,7 +33221,7 @@ tja lUr eey vPw -nDe +kPy jzz kPW iEJ @@ -31102,7 +33235,7 @@ kuI kuI kuI dms -vWD +oGM opJ rmn foL @@ -31193,7 +33326,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31211,13 +33344,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx cKv -egQ aLq +cLa +aLq +egQ aLq cKv cKv @@ -31236,7 +33369,7 @@ edl sIT poP sIT -hgb +tbD jzg obA xdN @@ -31245,27 +33378,27 @@ ucc exk cyt jzg -jMp -hLM -ybO -ybO -ybO -ybO -ybO -otp -rSy -mTG -vWE -sVT +qXX +qXX +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +mRg +wjA +vny +vny +lsy mjZ mjZ ust xez xez xez -xez -xez -xez kGK uHY uHY @@ -31282,7 +33415,7 @@ eey eey eey wsT -nDe +kPy jzz nik tEr @@ -31387,7 +33520,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31405,13 +33538,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk jeo +kJa +jeo +bHk jeo psP jMZ @@ -31430,7 +33563,7 @@ nCu sIT rrN sIT -fJt +pTX jzg vJE wFO @@ -31449,22 +33582,22 @@ xEJ xEJ xEJ xEJ -vWE -sVT -mjZ -mjZ -mjZ -mjZ -mjZ +pRa +mTG +vny +vny +lsy mjZ +vUw mjZ mjZ +vUw dOm mBU ust ust ust -kej +lBi lsy nDe nDe @@ -31581,7 +33714,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31599,13 +33732,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP +jeo bHk jeo +bHk jeo psP jMZ @@ -31645,8 +33778,8 @@ nLn xEJ xEJ xEJ -lsy -lsy +vny +vny lsy lsy lsy @@ -31670,7 +33803,7 @@ ilQ nDe eey vPw -nDe +kPy iqq iqq dvl @@ -31775,7 +33908,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31793,13 +33926,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk jeo +bHk +bHk +bHk jeo psP sVT @@ -31819,9 +33952,9 @@ fxX fxX fxX dfd -cZD -iMU -oVx +jNh +tZj +hhu xEJ kZq cSu @@ -31829,11 +33962,11 @@ mAg mAg mAg mAg -vZR +vsx mAg -vZR +eMG mAg -vZR +vsx mAg fmq pTQ @@ -31842,13 +33975,13 @@ xEJ oCE oCE nSZ -tpN +fcL tpN fCk dyA dyA -oCE -lzR +mvi +uoA lsy tux tux @@ -31864,7 +33997,7 @@ nDe ilQ eey vPw -nDe +kPy iqq qlk jYZ @@ -31888,7 +34021,7 @@ rFy nUv dnu hBQ -suZ +cmv vva vva vva @@ -31969,7 +34102,7 @@ vva vva vva rah -dff +kEZ jeM mOb mOb @@ -31987,13 +34120,13 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk jeo +jeo +tOU +cja bwU psP bYV @@ -32013,7 +34146,7 @@ cYJ lhH fxX dfd -hZy +jgk xEJ xEJ xEJ @@ -32034,15 +34167,15 @@ lSC eKh xEJ oCE -oCE -wSX -pDI +hRB +uVh +mJn pDI uFT dyA dyA -oCE -gHG +ewo +oIB lsy dax dax @@ -32058,7 +34191,7 @@ nDe ilQ eey vPw -nDe +kPy iqq dpj hZT @@ -32163,7 +34296,7 @@ vva vva vva rah -dff +kEZ jeM jhf mOb @@ -32181,12 +34314,12 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +lWP psP -bHk +jeo +jeo +ffL jeo jeo psP @@ -32207,7 +34340,7 @@ fxX cYJ fxX dfd -cZD +jNh xEJ cgd ian @@ -32223,20 +34356,20 @@ mdd snm hWz xTg -fIj -nLn -nLn -jHI -hEY -hEY -dRj +guB +wqc +wqc +nHg +ijR +rpP +bOE dyA dyA dyA dyA dyA -oCE -pdv +ewo +cLQ lsy lsy lsy @@ -32357,12 +34490,10 @@ vva vva vva rah -dff +kEZ qmG +bzx jhf -jhf -mOb -mOb mOb mOb mOb @@ -32378,9 +34509,11 @@ mOb mOb mOb jhf -cos +eIx psP -bHk +jeo +jeo +ffL jeo jeo psP @@ -32401,7 +34534,7 @@ fxX bHo fxX dfd -hZy +jgk xEJ xEJ xEJ @@ -32424,28 +34557,28 @@ xEJ oCE oCE nSZ -oJF +mvB oJF waf dyA +dyA +ewo hEY -hEY -hEY -ujK -eSK +woO +kPy nRV tsd tsd tsd xVc oiL -kMD +bbH iCp wVX -kMD -ipp -kMD -jjB +bbH +pmA +bbH +wfs oNC iqq uMP @@ -32550,8 +34683,8 @@ vva vva vva rPk -qqh -dff +dND +kEZ qmG jhf jhf @@ -32569,12 +34702,12 @@ mOb mOb mOb mOb -mOb -mOb jhf -cos +eIx psP -bHk +jeo +jeo +ffL jeo jeo psP @@ -32595,15 +34728,15 @@ gwi xDS fxX dfd -iMU -vWE -vWE -vWE -lyN -eym -tbw -bmJ -bQV +tZj +rdd +rdd +rdd +kzZ +iWW +odZ +mfY +suW sdT jiS wSL @@ -32618,29 +34751,29 @@ nSZ wyl lzR nSZ -tpN +fcL tpN fCk dyA +dyA +ewo hEY -hEY -hEY -ujK -eSK +nDe +kPy tDD -eSK -eSK -eSK +kPy +kPy +kPy oUk -eSK -eSK +kPy +kPy nsT pBj +kPy eSK -eSK -eSK -eSK -xkK +kPy +kPy +buJ iqq iqq oCe @@ -32654,7 +34787,7 @@ lGh poz aFG jZC -fRy +bZB jVy oWY jZC @@ -32744,7 +34877,7 @@ vva vva vva mMp -ciN +xNe sVT qmG jhf @@ -32756,23 +34889,23 @@ mOb mOb mOb mOb -jhf -jhf -jhf -jhf -jhf -jhf -jhf -jhf -jhf -jhf -cos -nDj -bHk -bHk -jeo +aTe +aTe +aTe +aTe +aTe +aTe +aTe +aTe +qWW +bEM +whN +whN +pbY +iKW +hXV psP -dff +kEZ dfd qtu ujP @@ -32789,15 +34922,15 @@ bHo bHo aeP dfd -tQt -vWE -vWE -vWE -lMC -btL -nlf -vzL -bQV +fjW +rdd +rdd +rdd +wRf +qWa +fvT +dfp +suW uCC uCC wSL @@ -32812,27 +34945,27 @@ nSZ nSZ nSZ nSZ -tpN +fcL tpN fCk diF -hEY -hEY -oCE +dyA +lSY +coQ eey -nDe -pwi +gmN +qTA nDe nDe qtG -jjB -eSK -qYE +wfs +kPy +qGJ ple xae -nDe +gmN eey -dKw +uOi cjM sow qWY @@ -32938,8 +35071,8 @@ vva vva sVT mMp -ciN -ciN +xNe +xNe qmG jhf jhf @@ -32950,6 +35083,7 @@ mOb mOb mOb mOb +aTe jhf jhf jhf @@ -32957,16 +35091,15 @@ jhf jhf jhf jhf -jhf -jhf -jhf -cos +eIx psP +mrb jeo -bHk +jeo +wBl jeo psP -dff +kEZ dfd jXx wBm @@ -32983,15 +35116,15 @@ bHo wBm wBQ dfd -ukS -vWE -vWE -vWE -lyN -xVM -tbw -yer -bQV +vhR +rdd +rdd +rdd +kzZ +pJY +odZ +tib +suW uCC uCC wSL @@ -33010,21 +35143,21 @@ wSX wSX nSZ nSZ -dRj -dRj -eey +bRW +ryr eey eey eey eey eey eey -eSK -eSK eey +kPy +kPy eey eey eey +tUS eey eey eey @@ -33131,9 +35264,9 @@ vva vva sVT sVT -dff -vXR -ciN +kEZ +xVq +xNe qmG jhf jhf @@ -33144,23 +35277,23 @@ mOb mOb mOb mOb -jhf +aTe jhf izE yix yix yix -sVT -lIb -ghj -ghj -pdl +eCt +wuy +cLs psP psP -bHk +psP +psP +wBl jeo psP -dff +kEZ dfd qtu xDS @@ -33184,8 +35317,8 @@ hZt hZt hZt nyX -cao -bQV +qqu +suW xEJ xEJ wSL @@ -33201,11 +35334,11 @@ gYO wSL oCE oCE -hEY -hEY -hEY -hEY -hEY +oCE +oCE +oCE +oCE +oCE eey nDe nDe @@ -33324,10 +35457,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -33338,20 +35471,20 @@ mOb mOb mOb mOb +aTe jhf -jhf -iUo +mke jhf taY hcc -sVT -tGv -myG -myG -hel -myG +eCt +nzR +oeP +oeP +pIA +nzR psP -bHk +wBl jeo psP bYV @@ -33395,11 +35528,11 @@ avv wSL oCE oCE -hEY -hEY -hEY -hEY -hEY +oCE +oCE +oCE +oCE +oCE eey nDe nDe @@ -33431,7 +35564,7 @@ dzu rJE jEd piJ -gvc +gcT qaC quj flC @@ -33518,10 +35651,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -33532,20 +35665,20 @@ mOb mOb mOb mOb +aTe jhf -jhf -iUo +qif jhf wGL olX -sVT -ygv -eQQ -eQQ -bsb -myG +eCt +pGb +hhj +hhj +fqF +nar psP -bHk +wBl jeo psP bYV @@ -33591,9 +35724,9 @@ oCE uqF vnz mSO -qyq -qyq -qyq +eey +eey +eey eey dWB dWB @@ -33624,8 +35757,8 @@ wQr xDZ gnr swR -wuv -jZC +oWY +liB qUa oWY gkv @@ -33712,10 +35845,10 @@ vva vva vva sVT -dff -dff -lYS -ciN +kEZ +kEZ +gGy +xNe qmG jhf jhf @@ -33726,20 +35859,20 @@ mOb mOb mOb mOb +aTe jhf -jhf -izE -lIb -lIb -lIb -sVT -myG -eQQ -eQQ -bsb -myG +hMB +vjD +vjD +vjD +eCt +oeP +hhj +hhj +wEr +hGu psP -bHk +wBl jeo psP bYV @@ -33783,17 +35916,17 @@ avv wSL oCE oCE -hEY -bHh -qyq -oCE oCE +bHh eey nDe -dWB +rIm +rIm nDe nDe nDe +mRV +trW dWB nDe nDe @@ -33818,7 +35951,7 @@ boD kcN kjn swR -wuv +oWY jZC pou lrZ @@ -33832,7 +35965,7 @@ kGg fur fur rwY -nAl +uOa vva dAV dAV @@ -33906,12 +36039,12 @@ vva vva vva sVT -dff -dff -lYS -ciN +kEZ +kEZ +gGy +xNe qmG -jhf +bzx jhf mOb mOb @@ -33920,21 +36053,21 @@ mOb mOb mOb mOb +aTe jhf -jhf -yix -hwb -qcI -eQQ -myG -myG -azN -odS -oHc -myG +vjD +kck +uTd +hhj +oeP +oeP +gXZ +itK +eXQ +oeP xFR -bHk -bwU +bAt +bNk psP bYV dfd @@ -33977,17 +36110,17 @@ fhE wSL lFL oCE -hEY -bHh -qyq -oCE oCE +bHh eey -dWB +nDe +ecG +ecG +nDe eey -dWB -dWB -dWB +nDe +nDe +mRV dWB nDe nDe @@ -34012,7 +36145,7 @@ lMy uNZ jJZ swR -qUu +ceE dhv tTD dhv @@ -34026,7 +36159,7 @@ kGg cUK fur rwY -nAl +uOa vva dAV dAV @@ -34100,10 +36233,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -34114,18 +36247,18 @@ mOb mOb mOb mOb +aTe jhf -jhf -yix -xar -kBQ -eQQ -myG -myG -xtN -aVx -oSU -myG +vjD +jVl +eju +hhj +oeP +oeP +oJd +ooW +rlB +oeP psP bHk jeo @@ -34171,17 +36304,17 @@ avv wSL oCE oCE -hEY -bHh -qyq -oCE oCE +bHh eey nDe -dWB nDe nDe nDe +hBS +mRV +mRV +kBd dWB nDe nDe @@ -34193,13 +36326,13 @@ nDe nDe nDe eey -rXJ +ijZ owc qaD rXJ -rXJ -rXJ -vbd +ulw +ulw +ulw rXJ eHc eHc @@ -34220,7 +36353,7 @@ kGg fur fur rwY -nAl +uOa vva dAV dAV @@ -34294,10 +36427,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -34308,18 +36441,18 @@ mOb mOb mOb mOb +aTe jhf -jhf -yix -qZR -gfE -eQQ -myG -myG -rkJ -jEQ -wXb -jEQ +vjD +fHc +pfo +hhj +oeP +oeP +xbX +rvL +fqJ +rvL psP bHk jeo @@ -34367,8 +36500,8 @@ oCE dMb lrD wUf -qyq -oCE +eey +nDe fMH fMH fMH @@ -34387,7 +36520,7 @@ eey eey eey eey -tNw +itS cAZ vhZ tNW @@ -34395,18 +36528,18 @@ tNW xmI tNW goY -vXr +ntW kdI -vXr -vXr -vXr +ntW +ntW +ntW lAD -vXr +ntW dtY lyV foL -lOK -duF +cLz +iGW poT cwE cBe @@ -34488,10 +36621,10 @@ vva vva vva sVT -dff -dff -nff -ciN +kEZ +kEZ +hXc +xNe qmG jhf jhf @@ -34502,18 +36635,18 @@ mOb mOb mOb mOb +aTe jhf -jhf -qmG -lIb -lIb -lIb -sVT -myG -hmr -hmr -hmr -hmr +eCt +vjD +vjD +vjD +eCt +oeP +wOb +wOb +wOb +wOb psP bHk jeo @@ -34527,8 +36660,8 @@ bYV bYV bYV bYV -dff -dff +kEZ +kEZ bYV jWc jWc @@ -34541,10 +36674,10 @@ stI vlH eAh hZt -oCE -oCE -dlc -fSs +aAu +aAu +nSZ +lCF oCE wSL xvc @@ -34559,12 +36692,12 @@ avv wSL oCE oCE -hEY +oCE rkx fMH fMH fMH -awX +mUH qAl fMH kyh @@ -34573,34 +36706,34 @@ pVn pVn pVn fMH -rbv +edY bBQ scp qaD wKe -rXJ -rXJ -rXJ +bFU +xRo +itS eNE -qrf -qaD -tNw -rXJ +pwT +itS +itS +ouI pFL -qNi +aXg dDp -rXJ +itS uNX -rXJ -rXJ -rXJ -pld -rXJ -rXJ -jSQ +itS +itS +itS +aOu +itS +itS +iMZ foL -kce -pgY +qZf +bDa dDv tCv shd @@ -34683,9 +36816,9 @@ vva vva sVT sVT -dff -nff -ciN +kEZ +hXc +xNe qmG jhf jhf @@ -34702,12 +36835,12 @@ mOb mOb mOb mOb -lIb -myG -myG -myG -myG -myG +vjD +oeP +oeP +oeP +xnv +nar psP jDJ nLs @@ -34736,8 +36869,8 @@ fuh afn hZt iAl -oCE -dlc +aAu +nSZ aXJ slE wSL @@ -34753,12 +36886,12 @@ idO wSL oCE oCE -hEY +oCE rkx fMH dTd luo -rFz +huF dpu fMH daR @@ -34767,16 +36900,16 @@ ygf ygf kIE fMH -rbv +edY bBQ scp qaD jSQ -twq -sEO -sEO -hQF -dtY +xvY +stT +stT +bSR +wTr pLU pLU pLU @@ -34878,8 +37011,8 @@ vva vva sVT sVT -nff -ciN +hXc +xNe qmG jhf jhf @@ -34896,12 +37029,12 @@ jhf jhf jhf mOb -lIb -myG -myG -myG -myG -myG +vjD +oeP +oeP +oeP +oeP +oeP psP bHk jeo @@ -34929,9 +37062,9 @@ stI ldh mUP hZt +aAu oCE -oCE -dlc +nSZ lqJ rJg wSL @@ -34947,29 +37080,29 @@ wSL wSL nSZ nSZ -vcc +iAp rkx fMH dTd luo -rFz -xFo -sKl -lkj -qvU -kow -kow -cTM -sKl -fyY -kGz -kzs -lsO -sEO -aBp -rXJ -qNi -pld +huF +fFz +qUc +jUu +jHY +mXk +mXk +bKz +qUc +xWL +gpT +itV +dAz +rPP +lup +itS +itS +aOu vbd pLU fPd @@ -34980,7 +37113,7 @@ eqh hBM hBM ohX -gks +qHb kJc qOJ bdZ @@ -35073,29 +37206,29 @@ vva vva sVT mMp -ciN +xNe qmG jhf jhf jhf -jhf +mXc jhf jhf jhf jhf ojZ nku -jhf +mXc jhf jhf jhf mOb -sVT -hmr -hmr -hmr -hmr -tGv +eCt +ebF +kQR +epJ +wOb +nzR psP bHk bHk @@ -35125,23 +37258,23 @@ nlA hZt oCE oCE -dlc +nSZ aED -hEY -hEY -dRj -hEY -hEY -hEY -hEY -hEY -hEY -hEY -hEY -hEY -hEY -dRj -hEY +oCE +oCE +wlW +oCE +oCE +oCE +oCE +oCE +oCE +oCE +oCE +oCE +oCE +wlW +oCE rkx fMH fMH @@ -35159,12 +37292,12 @@ wQg rbv umQ qaD -qaD -qaD -qaD -qaD -qVh -qaD +mBE +uec +nVO +nVO +myB +uuJ pLU pGT bIV @@ -35267,20 +37400,20 @@ vva vva vva mMp -ciN -qmG -qmG -qmG +xNe qmG qmG qmG -hIN qmG qmG qmG -tid -qmG -qmG +iFS +psP +xFR +dIS +ndB +dIS +dIS jhf jhf mOb @@ -35319,26 +37452,26 @@ fBl hZt oCE oCE -dlc +iri mSr -kVk -kVk -siE -kVk -kVk -kVk +aHN +aHN +aHN +aHN +aHN +aHN pfX lrD lrD lrD sFU -hEY -hEY -dRj -hEY -fSs oCE oCE +oCE +oCE +lCF +oCE +kkh fMH otE bkr @@ -35347,17 +37480,17 @@ wsM gev gev gev -aVO +dvH amh +mBE rbv -rbv -rbv +bFU rri -rXJ -rXJ -bBQ -scp -vbd +mBE +iVA +vVB +puL +oCx qsC pLU wFE @@ -35376,11 +37509,11 @@ juz nbl pLU pLU -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -35461,23 +37594,23 @@ vva vva vva rPk -ciN -ciN -ciN -ciN -kMG -vWE -vWE -vWE -sVT -vWE -sVT -cHo -vWE -wjE -vwU -vwU -lIb +xNe +xNe +xNe +xNe +lMz +kSY +kSY +kSY +psP +jeo +dIS +tgt +ksU +vpU +gdg +faG +iPf tXu xgq jeo @@ -35511,30 +37644,30 @@ hZt hZt hZt hZt -dlc -dlc -dlc -fSs -oCE -oCE nSZ +nSZ +nSZ +lCF oCE oCE -hEY -hGW +nSZ oCE oCE oCE +hGW +dyA +dyA +dyA lhN oCE oCE -dlc -dlc +nSZ +oCE mSr -kVk -kVk -siE -rTd +aHN +aHN +fXv +hAU gQv fMH bOG @@ -35543,15 +37676,15 @@ bOG bOG lrm fMH -hIk -rbv +tNw rbv -iGJ -vbd -vbd +bFU +qVh +mBE +iVA hyi iPH -vbd +oCx qaD pLU wFE @@ -35570,10 +37703,10 @@ juz nbl laT pLU -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -35656,22 +37789,22 @@ vva vva vva rJV -dWI -dWI -dWI -sVT -vWE -vWE -vWE -sVT -vWE -sVT -gZb -vWE -wjE -pVf -pVf -wFh +etj +etj +etj +qmG +kSY +kSY +kSY +psP +jeo +dIS +wtS +ksU +vpU +gdg +gdg +jJE tXu piv bHk @@ -35686,7 +37819,7 @@ weH weH vVb hTM -lST +emV emV emV emV @@ -35714,22 +37847,22 @@ ame ame ame ame -vcc +oCE dyA -kJu -oJF -hHP dyA +dyA +dyA +dyA +oCE oCE +nSZ oCE -dlc -dlc rkx oCE pdv -dlc -dlc -dlc +fMH +fMH +fMH fMH ksn ksn @@ -35737,15 +37870,15 @@ ksn ksn ksn fMH +mBE rbv -rbv -rbv +bFU qaD -rXJ -vbd +mBE +bFU wzc wzc -vbd +mBE biY pLU uCq @@ -35763,10 +37896,10 @@ huR juz xNF erR -mej -nAl -dff -dff +sXi +uOa +kEZ +kEZ vva vva vva @@ -35852,20 +37985,20 @@ vva vva vva vva -dff -sVT -sVT -sVT -sVT -sVT -sVT -sVT -sVT -wjE -wjE -pVf -pVf -wFh +kEZ +qmG +qmG +qmG +qmG +psP +vNh +dIS +dIS +ycb +vpU +gdg +gdg +jJE tXu jeo bHk @@ -35901,23 +38034,23 @@ iMc nSZ uqF fXp -kVk +aHN cAq ame wNL wNL wNL ame -jwV +lFL +dyA +dyA +dyA dyA -tzk -tpN -fCk dyA -oCE oCE oCE nSZ +oCE rkx oCE oCE @@ -35931,15 +38064,15 @@ fMH fMH fMH fMH -qaD -qaD -qaD +mBE +rbv +bFU qaD tNw -vbd +bFU wzc wzc -vbd +mBE dky kQk kQk @@ -36046,20 +38179,20 @@ vva vva vva vva -dff -dff -dff -dff -sVT -qTn -vWE -mNy -bVj -bmN -bVj -bVj -pVf -wFh +kEZ +kEZ +kEZ +kEZ +psP +cSL +jeo +nsj +eMv +usm +kVJ +kVJ +gdg +jJE vqr bHk bHk @@ -36074,7 +38207,7 @@ nLs meN aIc hTM -gqr +urq emV gsh mJG @@ -36082,7 +38215,7 @@ mJG mJG dmd emV -iFG +mIZ hTM oCE aVF @@ -36102,39 +38235,39 @@ xdf xdf xdf ame -hEY +iAp +dyA +dyA +dyA dyA -hXp -pDI -uFT dyA -oCE oCE oCE nSZ +oCE rkx -hEY -hEY -hEY -hEY -hEY +oCE +oCE +oCE +oCE +oCE hUd -vbd -vbd -vbd -vbd -vbd -vbd -vbd -vbd -vbd -iGJ -vbd -vbd +uQs +uQs +uQs +uQs +uQs +uQs +iER +rbv +bFU +qaD +mBE +iVA vVB puL -vbd -vbd +oCx +bFU oGv gYv qlA @@ -36147,11 +38280,11 @@ vuD uTy tYw rCx -qRx -dff -dff -dff -dff +xbw +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -36243,19 +38376,19 @@ vva vva vva vva -dff -sVT -qTn -vWE -pVf -jds -wjE -pVf -bVj -llG -wFh -tXu +kEZ +psP +cSL jeo +bHk +eTK +tXu +nqR +pxa +hvh +jJE +tXu +oxh jeo jeo onb @@ -36283,11 +38416,11 @@ yav eia aHN tbO -kVk +aHN ukp nqt siE -kVk +aHN cAq oCE gHG @@ -36296,16 +38429,16 @@ xdf xdf xdf ame -hEY -oCE -oCE -oCE oCE oCE oCE oCE oCE nSZ +nSZ +nSZ +nSZ +oCE pqb nSZ nSZ @@ -36316,18 +38449,18 @@ tNE tNE tNE tNE -rXJ -qNi -rXJ -rXJ -rXJ -rXJ +mHi +gxJ +gxJ +fKs +gxJ +uyI qaD -rXJ -rXJ +mBE +iVA bBQ scp -vbd +oCx uDr oGv cBP @@ -36341,8 +38474,8 @@ vuD rfI vrF iPT -cmq -dff +cqE +kEZ vva vva vva @@ -36438,16 +38571,16 @@ dAV dAV vva vva -sVT -pVf -pVf -pVf -jds -wjE -pVf -bVj -llG -wFh +psP +bHk +bHk +bHk +eTK +tXu +gdg +pxa +hvh +jJE tXu jeo jeo @@ -36473,16 +38606,16 @@ emV emV hTM oCE -nFh -oCE nSZ nSZ -hEY +nSZ +nSZ +oCE lhN hGW nSZ oCE -hEY +oCE uke ups ame @@ -36490,18 +38623,18 @@ svM svM svM ame -hEY +oCE gHG lzR oCE oCE +nSZ oCE oCE oCE oCE -nSZ rkx -hEY +oCE oCE oCE tNE @@ -36521,8 +38654,8 @@ uZt uZt rvG scp -vbd -rXJ +oCx +bFU oGv oGv oGv @@ -36535,8 +38668,8 @@ vuD fDU rfI wQd -cmq -dff +cqE +kEZ vva vva vva @@ -36632,16 +38765,16 @@ dAV dAV vva vva -sVT -vWE -pVf -vWE -jds -wjE -pVf -bVj -pVf -wFh +psP +jeo +bHk +jeo +eTK +tXu +gdg +pxa +dqt +jJE tXu jeo jeo @@ -36667,11 +38800,11 @@ emV emV hTM oCE -uQa -oCE nSZ +twI +nSZ +mQA oCE -hEY fZV oCE nSZ @@ -36691,9 +38824,9 @@ iAX iAX iAX rJt -nSZ -nSZ -nSZ +oCE +oCE +oCE qnP lrD rJg @@ -36729,8 +38862,8 @@ vuD duk dSR rfI -qRx -dff +xbw +kEZ vva vva vva @@ -36826,16 +38959,16 @@ dAV dAV vva vva -sVT -vWE -pVf -vWE -jds -wjE -pVf -bVj -pVf -wFh +psP +jeo +bHk +jeo +wHI +tXu +gdg +pxa +dqt +jJE tXu jeo jeo @@ -36879,17 +39012,17 @@ jll xdf xdf xdf -oDa +flF xdf xdf wQx iAX fMp fMp -hEY -hEY +oCE +oCE bHh -hEY +oCE oCE oCE tNE @@ -36910,7 +39043,7 @@ uZt rvG scp lMp -rXJ +bFU oGv oGv oGv @@ -36923,8 +39056,8 @@ tkG sSR sSR sSR -qRx -dff +xbw +kEZ vva vva vva @@ -37020,16 +39153,16 @@ dAV dAV vva vva -sVT -ukS -pVf -vWE -cHo -wjE -pVf -bVj -pVf -wFh +psP +xgq +bHk +jeo +pbd +tXu +gdg +pxa +dqt +jJE tXu tXu tXu @@ -37073,18 +39206,18 @@ lnf xdf xdf xdf -oDa +wdM xdf xdf wQx iAX oCE -hEY -hEY oCE -vnI oCE oCE +vnI +oCE +fZV oCE tNE bgw @@ -37097,7 +39230,7 @@ uLf huv uLh wrj -xTH +lwa arU ucD uZt @@ -37117,8 +39250,8 @@ fHR fHR fHR fHR -qRx -dff +xbw +kEZ vva vva vva @@ -37214,21 +39347,21 @@ dAV dAV vva vva -sVT -tQt -pVf -vWE -tHe -wjE -nyc -qqU -jAM -jAM -uBz -wFh -tQR -rMn -pJr +psP +piv +bHk +jeo +bdD +tXu +bXr +iZs +oQP +aQt +xwh +jJE +qcq +htR +mIJ ppk eUq ibb @@ -37273,8 +39406,8 @@ sJu sJu sJu jsB -hEY -hEY +oCE +oCE tSn tSn caT @@ -37311,8 +39444,8 @@ fHR mub fHR fHR -qRx -dff +xbw +kEZ vva vva vva @@ -37408,21 +39541,21 @@ dAV dAV vva vva -sVT -sVT -nUw -sVT -sVT -wjE -wFh -rMK -rMK -rMK -rMK -rMK -rMK -rMK -rMK +psP +psP +hOk +psP +psP +tXu +cXQ +iAT +eXb +iAT +iAT +iAT +iAT +iAT +iAT ppk uyV mCP @@ -37463,11 +39596,11 @@ jsB vZb uPq kfe -nZw +bJU ulm ylv vpb -hEY +oCE cFv tSn ref @@ -37505,8 +39638,8 @@ fHR fHR fHR fHR -qRx -dff +xbw +kEZ vva vva vva @@ -37602,21 +39735,21 @@ dAV dAV vva vva -sVT -pID -pVf -dJS -pAF -pAF -pAF -dJS -wFh -wFh -wFh -wFh -wFh -eCW -rMK +psP +oKo +bHk +ger +xfO +xfO +kvr +ger +jEA +jJE +jJE +jJE +jJE +sEg +xZb ppk uyV oho @@ -37626,7 +39759,7 @@ ibb kMi hSA hTM -gqr +urq emV wwF hJx @@ -37634,7 +39767,7 @@ hJx hJx chI emV -iFG +mIZ hTM pDI caq @@ -37647,21 +39780,21 @@ byq byq sDv nuW -hqD +gqn nuW dCm xdf eoD -xdf +ltr jsB -tip +wFr chE fqx rNP tXn -pHG +fwR jsB -hEY +oCE rSB tSn dbl @@ -37686,7 +39819,7 @@ uZt rvG scp lMp -rXJ +bFU oGv rzD ofE @@ -37699,8 +39832,8 @@ lsd fHR fHR oYW -qRx -dff +xbw +kEZ vva vva vva @@ -37796,26 +39929,26 @@ dAV dAV vva vva -sVT -vUn -pVf -pAF -jMZ -jMZ -jMZ -pAF -uyO -uyO -uyO -uyO -uyO -uyO -pvF +psP +qaV +bHk +xfO +ukB +ukB +ukB +xfO +wBx +itw +hpg +hpg +hpg +hpg +cQy kmv tmF lYv aCf -boh +sqV ibb qPy hSA @@ -37893,8 +40026,8 @@ oGv fHR fHR aUl -qRx -dff +xbw +kEZ vva vva vva @@ -37990,21 +40123,21 @@ dAV dAV vva vva -sVT -pVf -pVf -pAF -jMZ -jMZ -jMZ -miU -wFh -wFh -qFU -vQA -jkY -wFh -qIt +psP +bHk +bHk +xfO +ukB +ukB +ukB +eRZ +jJE +jJE +wIx +dMB +jps +jJE +eNj jMM tMG wHX @@ -38044,12 +40177,12 @@ xdf uYB ghr urn -urn +kGt bnj gRI -oVz +aHl jsB -hEY +oCE oCE tSn mOA @@ -38074,7 +40207,7 @@ koU iCi scp lMp -rXJ +bFU xbw xbw xbw @@ -38087,8 +40220,8 @@ oGv fHR fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38184,21 +40317,21 @@ dAV dAV vva vva -sVT -pVf -vWE -pAF -jMZ -jMZ -jMZ -miU -wFh -uyU -ahp -blw -jfR -fUh -nCv +psP +bHk +jeo +xfO +ukB +ukB +ukB +eRZ +jJE +eKp +plG +mnn +gcJ +pEd +unt ppk fow wmK @@ -38216,7 +40349,7 @@ uOf uOf uOf bmd -feM +qVx uOf uOf byq @@ -38243,7 +40376,7 @@ tXn gRI fGi jsB -hEY +oCE oCE tSn xet @@ -38268,7 +40401,7 @@ koU rvG scp lMp -rXJ +bFU vkM ceK rgz @@ -38278,11 +40411,11 @@ ixl jXf uhz oGv -fHR +mmk fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38378,21 +40511,21 @@ dAV dAV vva vva -sVT -pVf -vWE -pAF -jMZ -jMZ -jMZ -pAF -wFh -wFh -tZE -jAM -uBz -wFh -ykH +psP +bHk +jeo +xfO +ukB +ukB +ukB +xfO +jJE +jJE +wOe +aQt +xwh +jJE +jce ppk uyV ffQ @@ -38402,13 +40535,13 @@ ibb tqI iOT hTM -rNJ -vSG +qec +rCE hAr org uOf -uJn -gYG +rmr +qkj hFt dLA eDH @@ -38420,8 +40553,8 @@ dll iAy eEe tXi -qou -xwK +ruq +mDE xwK bdq aTs @@ -38433,11 +40566,11 @@ uYB vqG bZZ bZZ -lhq +vLv gRI -pHG +tyR jsB -hEY +oCE oCE tSn wGn @@ -38462,7 +40595,7 @@ koU rvG scp aDy -uGR +vXr lHP wnp ldj @@ -38475,8 +40608,8 @@ oGv fHR fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38572,21 +40705,21 @@ dAV dAV vva vva -sVT -pVf -vWE -dJS -pAF -pAF -pAF -dJS -wFh -wFh -wFh -wFh -wFh -wFh -wFh +psP +bHk +jeo +ger +xfO +xfO +kvr +ger +jJE +jJE +jJE +jJE +jJE +jJE +hrW ppk ibb ibb @@ -38631,7 +40764,7 @@ nCZ yaj pfV jsB -hEY +oCE oCE tSn xYL @@ -38669,8 +40802,8 @@ oGv fHR fHR gQl -cmq -dff +cqE +kEZ vva vva vva @@ -38766,22 +40899,22 @@ dAV dAV vva vva -sVT -pVf -pVf -jMZ -jMZ -wjE -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -jUd +psP +bHk +bHk +fMZ +fMZ +vpU +cXQ +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +krr bHk bHk bHk @@ -38789,11 +40922,11 @@ bHk nsj bHk bHk -iks -iks -jHP -iks -iks +xwm +xwm +xPF +opU +opU uOf uOf gLW @@ -38802,8 +40935,8 @@ ceR ceR mnq uOf -qkW -vWE +rLM +iMc byq vqV syV @@ -38823,9 +40956,9 @@ rtp rtp jsB gDL -oVz +gjj jsB -hEY +oCE pdv tSn xYL @@ -38859,12 +40992,12 @@ vdM vdM pNj jLy -puJ +ofE fHR fHR aUl -qRx -dff +xbw +kEZ vva vva vva @@ -38960,22 +41093,22 @@ dAV dAV vva vva -sVT -wjE -cPA -wjE -wjE -wjE -ghY -vQA -vQA -vQA -vQA -vQA -vQA -vQA -eEn -wjE +psP +vpU +yaw +vpU +vpU +vpU +fBD +dMB +dMB +dMB +dMB +dMB +dMB +dMB +asc +vpU jeo jeo jeo @@ -38983,12 +41116,12 @@ jeo jeo jeo bHk -lyN -bPF -syU -lyN -pJd -eLa +nLs +nqW +rix +ame +gAS +bdy uOf wqA pur @@ -38996,8 +41129,8 @@ hxC hxC hsd uOf -cpy -wtI +laL +nsb byq sKT syV @@ -39017,9 +41150,9 @@ nuW nuW rgg gDL -wzH +dZq jsB -hEY +oCE oCE tSn xYL @@ -39057,8 +41190,8 @@ ofE fHR fHR xbw -qRx -dff +xbw +kEZ vva vva vva @@ -39154,22 +41287,22 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU jeo jeo jeo @@ -39177,12 +41310,12 @@ jeo jeo jeo bHk -lyN -wdG -iwI -lyN -uig -cCp +gLB +xWi +neX +ame +uex +hHq uOf wqA pur @@ -39190,8 +41323,8 @@ hxC hxC hsd uOf -pVf -vWE +iMc +oCE bIY bYH fLh @@ -39211,9 +41344,9 @@ bQR lot nrp fYa -uxE +igF jsB -hEY +oCE lzR tSn xYL @@ -39247,12 +41380,12 @@ vdM tGc pNj bzh -ofE -fHR -fHR +kRZ +qos +uwT xbw -dff -dff +kEZ +kEZ vva vva vva @@ -39348,22 +41481,22 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU jeo jeo xgq @@ -39371,12 +41504,12 @@ piv leC jeo bHk -lyN -vWE -vWE -lyN -wwf -pzZ +nLs +jeo +jeo +ame +lAc +rBu uOf wqA ieI @@ -39384,30 +41517,30 @@ qqx qqx prU uOf -pVf -vWE +oCE +oCE byq cLO bZK bZK akn byq -nuW +dYT iuS -ame -rPh +nuW +hUC ogm ldF ogm -cOG -ame -nhK +hUC nuW +nhK +gdu jsB jcl afc jsB -hEY +oCE gHG tSn xYL @@ -39419,10 +41552,10 @@ tSn vdM tGc vdM -dJS -vNt -vNt -pAF +fOF +agk +agk +tVw fOF koU koU @@ -39441,11 +41574,11 @@ pBu ugi oGv nZL -ofE +kRZ fHR fqY xbw -dff +kEZ vva vva vva @@ -39542,22 +41675,22 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU ame ame ame @@ -39565,12 +41698,12 @@ ame ame ame bFK -lyN -lyN -oPo -lyN -lGE -lyN +nLs +nLs +fUQ +ame +nhx +ame uOf uOf uOf @@ -39578,8 +41711,8 @@ uOf uOf uOf uOf -htm -iks +bFK +opU byq byq bBI @@ -39588,24 +41721,24 @@ bBI byq hUC bHT -sGF +hUC ttR ldF ldF ldF ttR -sGF +hUC wfS hUC jsB rtp rtp jsB -wEo +npq nSZ tSn tSn -tSn +wVN tSn tSn tSn @@ -39613,11 +41746,11 @@ tSn fsG oAd vdM -xtt -jMZ -jMZ -jMZ -xoM +tVw +mTD +mTD +oQc +tVw ooC ahG oKU @@ -39635,11 +41768,11 @@ sVs wsR oGv jLy -ofE +kRZ fHR fqY xbw -dff +kEZ vva vva vva @@ -39736,24 +41869,24 @@ dAV dAV vva vva -dff -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -jJp -wjE -xdf +kEZ +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +slN +vpU xdf +uZc kBs xdf xdf @@ -39762,20 +41895,20 @@ xdf xdf svM xdf -kBs +stN lAc xdf xdf xdf xdf ogm +vXf ogm -ogm -xdf xdf xdf xdf xdf +qDO xdf kBs xdf @@ -39807,20 +41940,20 @@ vci vdM ius kUM -xtt -jMZ -jMZ -jMZ -vXa +fVo +mTD +mTD +mTD +tVw qoK oVB -jfJ -xXU -jfJ +fXD +fXD +fXD uaO fHn sSb -vVT +jhs tLp etJ dLN @@ -39829,11 +41962,11 @@ ana nEg oGv fHR -fHR +qos fHR fqY xbw -dff +kEZ vva vva vva @@ -39931,21 +42064,21 @@ vva vva vva vva -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU jFO vkD ozy @@ -40001,16 +42134,16 @@ iYL vdM vdM vdM -xtt -jMZ -jMZ -jMZ -xoM +agk +mTD +mTD +mTD +err qoK -jfJ -jfJ -xXU -jfJ +fXD +bWB +kWO +fXD fIR fHn hLT @@ -40020,14 +42153,14 @@ nTK lJM fHn ana -lTb -oUm -fHR -fHR +xvH +rFF +qos +qos fHR fqY xbw -dff +kEZ vva vva vva @@ -40125,21 +42258,21 @@ vva vva vva vva -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU xdf lAc xdf @@ -40153,7 +42286,7 @@ xdf xdf xdf xdf -vei +fWa kFm baM dYO @@ -40195,17 +42328,17 @@ rsr vdM vdM vdM -dJS -pAF -pAF -pAF -xxo +fOF +tVw +tVw +tVw +fOF qoK -xXU -xXU -xXU -xXU -xXU +fXD +jfJ +jfJ +fXD +fXD fHn tLp wsx @@ -40214,14 +42347,14 @@ nTK jdx fHn cFp -mPf +xfC oUm fHR fHR fHR fqY xbw -dff +kEZ vva vva vva @@ -40319,21 +42452,21 @@ vva vva vva vva -lyt -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wFh -wjE +mTF +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +jJE +vpU xdf lAc xdf @@ -40364,21 +42497,21 @@ dCm opU hUC bHT -dTL +hUC ttR ldF ldF ldF ttR -dTL +hUC wfS hUC aZp dHC dHC xii -svM -svM +buX +eJQ lyz arD kzk @@ -40395,10 +42528,10 @@ arD arD arD wKf -xXU -jfJ -jfJ +fXD jfJ +kEc +fXD atr fHn tKI @@ -40408,14 +42541,14 @@ wIs jdx fHn tKH -bve +dXq oGv oGv oGv eIu eIu xbw -dff +kEZ vva vva vva @@ -40513,60 +42646,60 @@ vva vva vva vva -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE -wjE +vpU +vpU +vpU +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu +tXu xdf lAc xdf ame glo -thH -thH -thH -thH -thH -thH -thH -thH -thH -thH -bFK -tis -ogm -kFm -bFK -pVf -vWE -ukS -iks -vWE -vWE -vWE -iks -nuW +hGF +aVb +aVb +aVb +aVb +aVb +aVb +aVb +aVb +aVb +dhi +jgR +hZl +jBN +dhi +xFQ +fKO +rjb +tEl +fKO +fKO +fKO +tEl +dYT iuS -ame -rPh +nuW +hUC ogm ldF ogm -cOG -ame -nhK +hUC nuW +nhK +gdu aZp hAx mKU @@ -40585,12 +42718,12 @@ bac jVk jVk fzo -jVk +opO qxH -jVk +opO spz -xXU -jfJ +fXD +dUw wGE wGE wGE @@ -40602,8 +42735,8 @@ ota qpI fHn ana -eKZ -sut +uwa +wSC eyF xbw xbw @@ -40707,27 +42840,27 @@ vva vva vva vva -dff -dff -dff -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -lyN +kEZ +kEZ +kEZ +psP +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +nLs xdf lAc xdf ame qzS -thH +jyJ qzS qzS qzS @@ -40742,14 +42875,14 @@ tis xdf kFm ame -pVf -vWE -tQt -iks -vWE -vWE -vWE -dTq +hua +fKO +qfb +tEl +fKO +fKO +fKO +via nuW ljK lot @@ -40779,10 +42912,10 @@ eIH jfJ jfJ arD -jfJ +fXD ncy -jfJ -jfJ +fXD +fXD wdc wGE wGE @@ -40796,13 +42929,13 @@ fHn fHn fHn ana -eKZ -lII +uwa lII +rqW vYY -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -40902,26 +43035,26 @@ vva vva vva vva -dff -dff -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -lyN +kEZ +kEZ +psP +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +nLs cry mHY cry ame qzS -thH +jyJ qzS qzS sVT @@ -40936,14 +43069,14 @@ dsX qEk rmc mnL -pVf -vWE -wtI -iks -vWE -vWE -vWE -dTq +hua +fKO +qkL +tEl +fKO +fKO +fKO +via nuW nuW nuW @@ -40982,20 +43115,20 @@ wGE xNJ kNz kNz -bEV +kNz dHw jDq vUi wsC -vLT +viF kNz jDq -eKZ +uwa bPl -mnH +gLb vYY -dff -dff +kEZ +kEZ vva vva vva @@ -41098,29 +43231,29 @@ vva vva vva vva -sVT -sVT -sVT -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vWE -lyN +psP +psP +psP +jeo +jeo +jeo +jeo +jeo +jeo +jeo +jeo +nLs xdf lAc xdf ame qzS -thH +jyJ qzS qzS sVT -uzO -uzO +ttJ +ttJ gbn ooV lSL @@ -41130,18 +43263,18 @@ gmJ ooV uVy mnL -pVf -pVf -pVf -iks -vWE -vWE -vWE -iks -dTq -dTq -iks -iks +lYM +fIa +xFQ +tEl +fKO +fKO +fKO +tEl +via +via +tEl +tEl svM dCm vbt @@ -41166,8 +43299,8 @@ arD vNI vMd jan -tcx -dff +ksq +ttJ jan jan jan @@ -41179,12 +43312,12 @@ cYT uYb xyY aVt -oqO -xhR -nrr -xhR -xhR -tPK +xhP +cmw +pqT +vsk +wLy +mpB vYY vYY vYY @@ -41294,27 +43427,27 @@ vva vva vva vva -sVT -sVT -sVT -sVT -sVT -sVT -sVT -sVT -sVT -lyN +psP +psP +psP +psP +psP +psP +psP +psP +psP +nLs xdf lAc xdf ame qzS -thH +jyJ qzS qzS sVT uzO -uzO +ttJ gbn ooV pIZ @@ -41324,18 +43457,18 @@ pEp nyE uVy mnL -cBg -vWE -pVf -tbJ -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vNt +eBy +fKO +udq +pXp +xCe +fKO +fKO +fKO +fKO +fKO +fKO +mjq xdf xdf nsI @@ -41360,8 +43493,8 @@ ubp eIH jfJ jan -jrL -dff +lQw +ttJ jan jan jan @@ -41491,11 +43624,11 @@ vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ iAX xdf xdf @@ -41503,12 +43636,12 @@ lAc xdf ndl qzS -thH +jyJ qzS qzS sVT cHY -uzO +ttJ gbn lOf dPy @@ -41516,20 +43649,20 @@ dPy dPy cOM ooV -wwG +bQK mnL -kdM -vWE -pVf -iks -vWE -vWE -vWE -vWE -vWE -vWE -vWE -vNt +uEY +fKO +hua +tEl +fKO +fKO +fKO +fKO +fKO +fKO +fKO +mjq jLT ica udD @@ -41554,12 +43687,12 @@ arD oSv jfJ jan -dff -llX -jan -jan -jan -tSJ +ttJ +eYt +dZZ +dZZ +dZZ +obV wGE ana vWB @@ -41568,10 +43701,10 @@ iUy oTq vYY rNw -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -41686,10 +43819,10 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ iAX xdf bpe @@ -41697,12 +43830,12 @@ fiK xdf iAX qzS -thH +jyJ qzS sVT sVT sVT -haM +wwa gbn ooV dPy @@ -41713,10 +43846,10 @@ ooV ooV mnL mnL -vWE -pVf -iks -iks +eQf +hua +tEl +tEl oQn oQn oQn @@ -41748,23 +43881,23 @@ arD lWv jfJ jan -dff -bLS -jan -wXh -ikt -ylN +ttJ +tdA +dZZ +gaS +jrz +osY wGE cFp xrC wbz wbz -wvv +kUY vYY rNw -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -41880,18 +44013,18 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ iAX -xdf +mJs oIE gQI faU iAX qzS -thH +jyJ qzS sVT vWE @@ -41905,20 +44038,20 @@ pIZ fGw msh ooV -ooV +ydc mnL -vWE -pVf -vWE -vWE +fKO +qgX +fKO +fKO oQn nPn bUr -fYM -qIk +sfz +msH fEt oQn -xdf +iwK ldF nsI dHC @@ -41942,12 +44075,12 @@ jfJ fhU nmL jan -dff +ttJ sVT -jan -wXh -wXh -vgG +dZZ +gaS +gaS +lET sxt crZ isT @@ -41956,9 +44089,9 @@ bBm bBm vYY rNw -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -42074,20 +44207,20 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ iAX xdf xdf xdf xdf iAX +gBi +adR qzS -thH -qzS -haM +bJm vWE vWE vWE @@ -42101,13 +44234,13 @@ cmh cmh tXe mnL -vWE -pVf -vWE -wtI +fKO +qgX +fKO +qkL oQn -jiL -jiL +gHN +gHN jiL jiL jiL @@ -42136,12 +44269,12 @@ jVk qeU jfJ jan -dff +ttJ sVT -waJ -waJ -wXh -wXh +aQX +aQX +gaS +gaS kOC ana gJI @@ -42150,9 +44283,9 @@ gaS gaS vYY rNw -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -42269,9 +44402,9 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ iAX xdf xdf @@ -42279,14 +44412,14 @@ xdf xdf iAX qzS -thH +gHo vPF sVT sVT sVT sVT gbn -lVp +vcy mnL irH irH @@ -42295,12 +44428,12 @@ kBJ imQ rSu irH -vWE -pVf -vWE -pVf -ffr -jiL +fKO +uMi +xCe +jYO +hvd +wAU jiL jiL jiL @@ -42330,12 +44463,12 @@ jfJ tNp jfJ jan -dff +ttJ sVT -fzE -fzE -wXh -wXh +nHd +nHd +gaS +gaS kOC ana gJI @@ -42344,8 +44477,8 @@ gaS gaS vYY rNw -dff -dff +kEZ +kEZ vva vva vva @@ -42463,230 +44596,230 @@ vva vva vva vva -dff -dff -dff -iAX -xdf -xdf -xdf -xdf -ame -qzS -thH -vPF -vPF -vPF -qzS -qzS -qzS -qzS -qzS -irH -qDn -skn -skn -skn -llY -irH -vWE -pVf -pVf -pVf -oQn -wuL -jiL -jiL -qae -wcr -oQn -bZm -xdf -nsI -aZp -ceL -wYE -oEl -lek -hzp -jvv -hSF -gMP -nIe -fKv -mjo -oVg -qpV -hGb -mkf -fKv -arD -rUQ -arD -jan -dff -sVT -jan -wXh -wXh -wXh -wGE -ana -gJI -wGE -dQv -ppm -vYY -rNw -dff -dff -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -dAV -vva -vva -vva -vva -vva -vva -vva -vva -"} -(113,1,1) = {" -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -vva -dff -dff -dff +kEZ +kEZ +kEZ iAX -aZz -aZz xdf xdf +xdf +foV ame qzS -thH +gHo vPF vPF vPF qzS qzS qzS +thH +qzS +irH +qDn +skn +skn +skn +llY +irH +fKO +nbt +nbt +qgX +oQn +wuL +jiL +jiL +qae +wcr +oQn +bZm +xdf +nsI +aZp +ceL +wYE +oEl +lek +hzp +jvv +hSF +gMP +nIe +fKv +mjo +oVg +qpV +hGb +mkf +fKv +arD +rUQ +arD +jan +ttJ +sVT +dZZ +gaS +gaS +gaS +wGE +ana +gJI +wGE +dQv +ppm +vYY +rNw +kEZ +kEZ +vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva +vva +vva +vva +vva +vva +vva +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +dAV +vva +vva +vva +vva +vva +vva +vva +vva +"} +(113,1,1) = {" +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +vva +kEZ +kEZ +kEZ +iAX +aZz +aZz +xdf +xdf +ame +qzS +gHo +vPF +vPF +vPF qzS qzS -nJh +thH +thH +thH +oPl skn skn sPi pTp hcj irH -iks -iks -iks -htm +tEl +tEl +tEl +hjH oQn oQn tWL @@ -42695,8 +44828,8 @@ tWL oQn oQn opU -cMh -oyH +hUC +hyP uMe uMe uMe @@ -42718,12 +44851,12 @@ jfJ tNp jfJ jan -dff -dff -jan -wXh -wXh -wXh +ttJ +ttJ +dZZ +gaS +gaS +gaS wGE nBf jyp @@ -42732,8 +44865,8 @@ mtd qSF vYY rNw -dff -dff +kEZ +kEZ vva dAV dAV @@ -42852,8 +44985,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ iAX ame ame @@ -42861,14 +44994,14 @@ ame bFK ame qzS -thH +gHo +qzS +jvr +qzS qzS qzS +thH qzS -pGl -gGt -rbU -gMT qzS irH hRo @@ -42879,20 +45012,20 @@ bUj irH nkZ nkZ -eHY -qKn +baF +eTA dbk dHu aAa aAa oac qQL -qQL +tMQ gSO aAa iWy spY -iZx +hjZ fdz quW ulN @@ -42912,12 +45045,12 @@ jfJ kkb nmL jan -dff -dff -jan -wXh -wXh -wXh +ttJ +ttJ +dZZ +cYl +cYl +bDr wGE rmB fZf @@ -42926,7 +45059,7 @@ mzk mzk mzk rNw -dff +kEZ vva vva dAV @@ -43046,8 +45179,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS ryJ @@ -43055,13 +45188,13 @@ vmH thH qzS qzS +gHo +thH +jcj +thH +thH +thH thH -qzS -qzS -qzS -qzS -qzS -qzS qzS qzS irH @@ -43074,7 +45207,7 @@ irH nkZ nkZ afh -mvj +ptP cvA jRZ aAa @@ -43102,16 +45235,16 @@ jgu nvU nfG xFx -jfJ +gpO vHe jfJ jan -dff -dff +ttJ +ttJ jan jfJ -xXU -xXU +jfJ +jfJ jfJ rmB smq @@ -43120,7 +45253,7 @@ uAk dGQ mzk rNw -dff +kEZ vva vva dAV @@ -43240,8 +45373,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS qzS @@ -43249,9 +45382,9 @@ qzS thH qzS qzS -thH -qzS +gHo qzS +jvr qzS qzS qzS @@ -43261,14 +45394,14 @@ qzS irH qag irH -tdl -xZe -maF +oOY +lXT +guS dHu cgI cie vYD -mvj +ptP cvA afU aAa @@ -43300,12 +45433,12 @@ dwh vHe jfJ jan -dff -dff +ttJ +ttJ jan jfJ -xXU -xXU +jfJ +jfJ jfJ rmB uOQ @@ -43314,7 +45447,7 @@ ppM dQW mzk rNw -dff +kEZ vva vva dAV @@ -43435,7 +45568,7 @@ vva vva vva vva -dff +kEZ vPF qzS qzS @@ -43447,18 +45580,18 @@ thH vPF vPF vPF -qzS -qzS -qzS -qzS -qzS +jvr +jvr +jvr +jvr +jvr irH sLX irH -asI -asI -asI eSO +eSO +eSO +wLW afh mvj mvj @@ -43467,10 +45600,10 @@ cvA jRZ aAa aAa -uRB -uRB -uRB -uRB +aAa +aAa +aAa +aAa aAa fRL lWk @@ -43478,9 +45611,9 @@ mIV mIV wzz mIV -hMw -xuE -xuE +kZQ +eXV +eXV kui uMe ohL @@ -43494,8 +45627,8 @@ jfJ hqV rhh jan -dff -dff +ttJ +ttJ jan jan jan @@ -43629,15 +45762,15 @@ vva vva vva vva -dff +kEZ vPF -qzS -qzS -qzS -qzS -qzS -qzS -qzS +jvr +jvr +jvr +qhV +jvr +jvr +jvr vPF vPF vPF @@ -43649,22 +45782,22 @@ qzS irH irH irH -asI -iKt -cDU +eSO +hKu +hlg dHu oJb mHS -mHS +lLn mHS urs dHu -iTr aAa -uRB -uRB -uRB -uRB +aAa +aAa +aAa +aAa +aAa aAa aAa oag @@ -43672,7 +45805,7 @@ aAa aAa oOs aAa -bMF +aBc wAb wAb bTe @@ -43688,12 +45821,12 @@ jfJ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jan jan -jfJ +gpO jfJ rmB hdE @@ -43701,7 +45834,7 @@ rTc hdE ydr mzk -dff +kEZ vva vva vva @@ -43823,7 +45956,7 @@ vva vva vva vva -dff +kEZ vPF qzS qzS @@ -43840,16 +45973,16 @@ qzS qzS qzS qzS -qzS -qzS -qzS -qzS -lHT +svP +qvz +svP +svP +ozX dHu dHu dHu drB -drB +eNA dHu dHu dHu @@ -43882,8 +46015,8 @@ jfJ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jan jan @@ -43895,7 +46028,7 @@ hzD kFk dQW mzk -dff +kEZ vva dAV dAV @@ -44034,16 +46167,16 @@ qzS qzS qzS qzS -qzS -qzS -qzS -qzS -wSZ +bRZ +qvz +qvz +qvz +lKv dHu lso toY bzD -bzD +bsC lso toY uRh @@ -44076,8 +46209,8 @@ jfJ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jfJ jfJ @@ -44085,7 +46218,7 @@ jfJ jfJ rmB eCf -ghw +iAI hdE dQW mzk @@ -44226,18 +46359,18 @@ qzS qzS qzS qzS +xTU qzS -qzS -qzS -qzS -qzS -qzS -kkq +svP +qvz +qvz +qvz +uDn dHu mvj mvj bzD -bzD +bsC mvj mvj uRh @@ -44253,9 +46386,9 @@ ghy lbf alV crx -vTB +oce uMe -wAb +jlD wAb mqR cRQ @@ -44270,8 +46403,8 @@ cRQ jfJ jfJ jan -dff -dff +ttJ +ttJ jan jfJ jfJ @@ -44422,20 +46555,20 @@ vPF vPF vPF vPF -vPF -qzS -qzS -lEi -qzS +jly +awi +qvz +qpl +lOF dHu lso toY bzD -bzD +bsC lso toY dHu -hdl +dlk sel bet pIY @@ -44464,13 +46597,13 @@ cRQ jan jan jan -dff -dff -jan +ttJ +ttJ jan jan jan jan +jfJ mzk mzk mzk @@ -44606,26 +46739,26 @@ qzS qzS qzS vPF -dff -dff -dff -vva -dff -dff -dff -dff -dff -dff -vPF -qzS -qzS -qzS -qzS -dHu +kEZ +kEZ +kEZ +vva +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +jly +ehU +jhb +jhb +jhb +rXQ +lUU mvj -mvj -bzD bzD +bsC mvj mvj uRh @@ -44655,22 +46788,22 @@ gzK tsy sPv cRQ -dff -dff -dff -dff -dff -dff -vva -dff -dff -dff -sVT -vWE -vWE -vWE -vWE -sVT +kEZ +kEZ +kEZ +kEZ +kEZ +kEZ +vva +jan +jan +jfJ +jfJ +jfJ +jfJ +jfJ +jfJ +jan vva vva dAV @@ -44800,23 +46933,23 @@ vPF qzS qzS vPF -dff -dff +kEZ +kEZ vva vva vva -dff -dff -dff -dff -dff -vPF -qzS -qzS -qzS -qzS +kEZ +kEZ +kEZ +kEZ +kEZ +jly +qvz +jhb +qvz +qvz dHu -mvj +tCE mvj bzD bzD @@ -44849,22 +46982,22 @@ uoT tsy sSk cRQ -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva -dff -dff -sVT -vWE -vWE -sVT -sVT -sVT +jan +jan +jan +jfJ +jfJ +jan +jan +jan vva vva dAV @@ -44994,22 +47127,22 @@ vPF qzS qzS vPF -dff +kEZ vva vva vva vva vva -dff -dff -dff -dff -vPF -qzS -arV -qzS -qzS -cIP +kEZ +kEZ +kEZ +kEZ +jly +qvz +sDV +qPi +sfS +dHu mvj mvj oJq @@ -45031,9 +47164,9 @@ qeA crx qAV uMe -lqy -lqy -lqy +qQe +ftM +aZn cRQ wBN qvD @@ -45043,20 +47176,20 @@ seB jCp hCc cRQ -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva vva vva -dff -sVT -vWE -vWE -sVT +jan +jan +jfJ +jfJ +jan vva vva vva @@ -45195,19 +47328,19 @@ vva vva vva vva -dff -dff -dff -vPF -qzS -arV -qzS -qzS +kEZ +kEZ +kEZ +jly +qvz +sDV +sNQ +osC dHu mvj mvj -mvj -mvj +pia +vfd mvj mvj uRh @@ -45237,9 +47370,9 @@ sQs lAH dxw cRQ -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -45247,10 +47380,10 @@ vva vva vva vva -sVT -vWE -vWE -sVT +jan +jfJ +jfJ +jan vva vva vva @@ -45389,14 +47522,14 @@ vva vva vva vva -dff -dff -dff -vPF -vPF -arV -qzS -qzS +kEZ +kEZ +kEZ +jly +jly +ieq +svP +svP bHz bHz bHz @@ -45431,9 +47564,9 @@ bBu fve cAY cRQ -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -45441,10 +47574,10 @@ vva vva vva vva -sVT -vWE -vWE -sVT +jan +jfJ +jfJ +jan vva vva vva @@ -45583,23 +47716,23 @@ vva vva vva vva -dff -dff -dff -dff +kEZ +jZd +kEZ +kEZ vPF arV qzS -qzS +hUD +pPJ vPF -dff -dff +qzS bHz bHz bHz bHz dHu -nEv +upP uri nbs rJK @@ -45611,23 +47744,23 @@ rQH qIQ txP jQj -qAV +bRF uMe kMO gRL wAb -aZn -dff -dff +oZN +qUN +qUN cAY bTI hjp jOg cAY -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -45635,10 +47768,10 @@ vva vva vva vva -sVT -vWE -vWE -sVT +jan +jfJ +jfJ +jan vva vva vva @@ -45778,20 +47911,20 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF arV qzS -qzS +hGo +uRc vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe djq djq @@ -45810,17 +47943,17 @@ uMe uMe uMe uMe -aZn -dff -dff +wbq +tFl +xIq cAY wFb llD nlM cAY -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -45829,10 +47962,10 @@ vva vva vva vva -sVT -sVT -sVT -sVT +jan +jan +jan +jan vva vva vva @@ -45961,8 +48094,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -45972,22 +48105,22 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF -tQb -jvr -jvr +arV +qzS +vAZ +vAZ vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe -oQa +iGc vwB djq djq @@ -46004,17 +48137,17 @@ iYh iYh iYh auD -aZn -dff -dff +wbq +xIq +xIq cAY -fSH +oRD aFl rVt uQp -tVd -dff -dff +beO +kEZ +kEZ vva vva vva @@ -46024,8 +48157,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -46155,8 +48288,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -46166,20 +48299,20 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF -arV +eYR qzS -glo +vAZ +pcY vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe kBB bet @@ -46198,17 +48331,17 @@ txP crx txP wXW -aZn -dff -dff +wbq +xIq +xIq cAY iHB pSP sLm cAY -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva @@ -46218,8 +48351,8 @@ vva vva vva vva -dff -dff +kEZ +kEZ vva vva vva @@ -46349,8 +48482,8 @@ vva vva vva vva -dff -qFt +kEZ +mIv vva vva vva @@ -46361,19 +48494,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF pdt dec aMc +vAZ vPF -dff -dff -lej -vWE -vWE -vWE +qzS +qVM +qzS +qzS +qzS uMe juN gKP @@ -46391,17 +48524,17 @@ crx crx txP crx -jMt -aZn -dff -dff +uKh +wbq +xIq +xIq cAY oBk ggL xZs cAY -dff -dff +kEZ +kEZ vva vva vva @@ -46412,8 +48545,8 @@ dAV vva vva vva -qFt -dff +mIv +kEZ vva vva vva @@ -46555,19 +48688,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS qzS vPF vPF -dff -dff -lej -vWE -vWE -vWE +vPF +vPF +qVM +qzS +qzS +qzS mYM vaA rJK @@ -46576,7 +48709,7 @@ ovA djq ffa vaA -nGI +wYJ gaa qkG bTM @@ -46586,16 +48719,16 @@ uSq izc uSq gCl -aZn -dff -dff +wbq +rPG +rPG cAY cAY lVE vgx cAY -dff -dff +kEZ +kEZ vva vva dAV @@ -46749,19 +48882,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF qzS qzS vPF -dff -dff +kEZ +kEZ vva -lej -lej -lej -lej +qVM +qVM +qVM +qVM aZn aZn aZn @@ -46782,14 +48915,14 @@ aZn aZn aZn vva -dff -dff +rPG +qUN cAY jVf vQj cAY -dff -dff +kEZ +kEZ vva vva dAV @@ -46943,19 +49076,19 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF vPF vPF vPF -dff -dff +kEZ +kEZ vva vva -dff -sVT -asI +kEZ +rPG +rsM kAq qUN ueM @@ -46964,26 +49097,26 @@ rPG rpG bDk oLB +kAq +ovP qUN qUN qUN qUN qUN qUN -qUN -vWE -sVT -dff +rPG +kEZ vva vva -dff -dff +rPG +qUN cAY cAY cAY cAY -dff -dff +kEZ +kEZ vva vva dAV @@ -47137,19 +49270,19 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF vPF -dff -dff -dff +kEZ +kEZ +kEZ vva vva -dff -sVT -vWE +kEZ +rPG +qUN rsM rsM ueM @@ -47159,25 +49292,25 @@ qUN qUN oLB qUN +ovP qUN qUN qUN qUN qUN qUN -vWE -sVT -dff +rPG +kEZ vva vva -dff -dff -dff -qRx -qRx -dff -dff -dff +rPG +qUN +qUN +krP +krP +kEZ +kEZ +kEZ vva vva dAV @@ -47331,19 +49464,19 @@ vva vva vva vva -dff -dff -dff +kEZ +kEZ +kEZ vPF vPF -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva -sVT -pNq +rPG +cIZ jtb rsM rPG @@ -47353,25 +49486,25 @@ qUN qUN oLB qUN +ovP +lKN +ovP qUN qUN qUN qUN -qUN -qUN -vWE -sVT +rPG vva vva vva -dff -dff -dff -qRx -qRx -dff -dff -dff +rPG +qUN +qUN +krP +krP +kEZ +kEZ +kEZ vva vva dAV @@ -47526,45 +49659,45 @@ vva vva vva vva -dff -dff +kEZ +kEZ vPF vPF -dff -dff -dff +kEZ +kEZ +kEZ vva vva vva -sVT -hJw +rPG +knF llw qUN -vDi -qUN -qUN -qUN -qUN +bGp +oLB +oLB +oLB +oLB oLB qUN qUN qUN +ovP qUN qUN qUN qUN -vWE -sVT +rPG vva vva vva -dff -dff -dff -qRx -qRx -dff -dff +rPG +rPG +rPG +krP +krP +kEZ +kEZ vva vva vva @@ -47720,18 +49853,18 @@ vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva vva vva -sVT -sVT +rPG +rPG rPG rPG rPG @@ -47743,22 +49876,22 @@ oLB qUN qUN qUN -qUN -qUN -qUN +ovP +ovP +ovP +rPG +rPG rPG -sVT -sVT vva vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -47914,25 +50047,25 @@ vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva vva vva -dff -dff +kEZ +kEZ rPG qUN qUN qUN qUN qUN -qUN +lOo oLB oLB oLB @@ -47941,18 +50074,18 @@ oLB jPD qkX rPG -dff -dff +kEZ +kEZ vva vva vva vva vva -dff -dff -dff -dff -dff +kEZ +kEZ +kEZ +kEZ +kEZ vva vva vva @@ -48109,17 +50242,17 @@ vva vva vva vva -dff -dff -qFt +kEZ +kEZ +mIv vva vva vva vva vva vva -dff -dff +kEZ +kEZ rPG rPG rPG @@ -48135,17 +50268,17 @@ rPG rPG rPG rPG -dff -dff +kEZ +kEZ vva vva vva vva vva vva -qFt -dff -dff +mIv +kEZ +kEZ vva vva vva @@ -48312,25 +50445,25 @@ vva vva vva vva -jap -pAn -pAn -pAn -aNP +uNO +cuN +cuN +cuN +uak rPG qUN qUN qUN oLB qUN -qUN +kAq qUN rPG -wDe -pAn -pAn -pAn -eap +vHY +cuN +cuN +cuN +gOE vva vva vva @@ -48508,9 +50641,9 @@ vva vva vva vva -dff +kEZ iyn -klF +rDh rPG qUN qUN @@ -48520,9 +50653,9 @@ qUN qUN qUN rPG -kZo +teR kEk -dff +kEZ vva vva vva @@ -48702,9 +50835,9 @@ vva vva vva vva -dff -dff -hyH +kEZ +kEZ +nDF rPG tFl tFl @@ -48714,9 +50847,9 @@ tFl tFl tFl rPG -hyH -dff -dff +nDF +kEZ +kEZ vva vva vva @@ -48896,9 +51029,9 @@ vva vva vva vva -dff -dff -hyH +kEZ +kEZ +nDF rPG xIq xIq @@ -48908,9 +51041,9 @@ xIq xIq xIq rPG -hyH -dff -dff +nDF +kEZ +kEZ vva vva vva @@ -49090,9 +51223,9 @@ vva vva vva vva -dff -dff -hyH +kEZ +kEZ +nDF rPG rPG rPG @@ -49102,9 +51235,9 @@ rPG rPG rPG rPG -hyH -dff -dff +nDF +kEZ +kEZ vva vva vva @@ -49286,17 +51419,17 @@ vva vva vva vva -cRe -pAn -pAn -pAn -pAn -pIF -pAn -pAn -pAn -pAn -uGJ +lkb +cuN +cuN +cuN +cuN +naq +cuN +cuN +cuN +cuN +kZG vva vva vva @@ -49480,17 +51613,17 @@ vva vva vva vva -oxC -dff -dff -dff -dff -hyH -dff -dff -dff -dff -oxC +cRm +kEZ +kEZ +kEZ +kEZ +nDF +kEZ +kEZ +kEZ +kEZ +cRm vva vva vva @@ -49676,12 +51809,12 @@ vva vva vva vva -dff +kEZ bQV bQV pNf bQV -dff +kEZ vva vva vva @@ -50648,8 +52781,8 @@ vva vva vva vva -dff -hyH +kEZ +nDF vva vva vva @@ -50842,8 +52975,8 @@ vva vva vva vva -dff -hyH +kEZ +nDF vva vva vva @@ -51036,8 +53169,8 @@ vva vva vva vva -dff -oxC +kEZ +cRm vva vva vva diff --git a/maps/euthenia/levels/deck4.dmm b/maps/euthenia/levels/deck4.dmm index 07d93f4f8a..a975c08749 100644 --- a/maps/euthenia/levels/deck4.dmm +++ b/maps/euthenia/levels/deck4.dmm @@ -1,10 +1,12 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ab" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +"ac" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "ad" = ( /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) @@ -12,31 +14,48 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"ag" = ( -/obj/structure/stairs/spawner/east, +"ah" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) +/area/main_map/maintenance/deck_four/aft/starboard) "ai" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" }, /turf/space, /area/space) -"aj" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) "ak" = ( /turf/simulated/wall, /area/main_map/hallway/deck4/fore) +"al" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "am" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"an" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "ao" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -52,10 +71,21 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"aq" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/space) +"ar" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"at" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "au" = ( /obj/machinery/air_alarm{ dir = 4; @@ -64,32 +94,39 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"aw" = ( -/turf/simulated/floor/reinforced/airless, -/area/main_map/maintenance/deck_four/port) -"ay" = ( -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "smuggler_door1"; - pixel_x = 32 +"ax" = ( +/obj/structure/table/bench/padded, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/space) +/obj/landmark/spawnpoint/job/shaft_miner, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "az" = ( /obj/machinery/camera/network/command{ dir = 1 }, /turf/simulated/floor/greengrid, /area/ai) -"aA" = ( -/obj/effect/floor_decal/spline/plain, -/obj/spawner/window/borosillicate/reinforced/full, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_windows" +"aB" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/gateway) +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) +"aC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "aD" = ( /turf/simulated/floor/carpet/bcarpet, /area/library) @@ -104,15 +141,58 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"aG" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"aM" = ( +/obj/structure/frame{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "aN" = ( /obj/machinery/atmospherics/component/unary/freezer{ dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"aR" = ( -/turf/simulated/wall/r_wall/prepainted/science, +"aQ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mobile_miningbase_door" + }, +/obj/machinery/atmospheric_field_generator, +/obj/machinery/airlock_sensor/airlock_exterior{ + dir = 4; + pixel_x = -24 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"aS" = ( +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) +"aV" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "smugler_airlock1"; + dir = 4; + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "aW" = ( /obj/machinery/mineral/unloading_machine, /obj/machinery/conveyor{ @@ -124,15 +204,80 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"aX" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"aZ" = ( +/obj/structure/largecrate, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/starboard) "ba" = ( /obj/machinery/light/fairy{ dir = 8 }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"bi" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical/vault2) +"bb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"bc" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/gateway) +"bd" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"be" = ( +/obj/structure/catwalk, +/turf/space, +/area/rnd/telescience_lab/chamber) +"bf" = ( +/obj/structure/largecrate, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"bg" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) +"bh" = ( +/obj/structure/girder/reinforced, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/reinforced/overhang, +/area/space) +"bj" = ( +/obj/structure/closet/crate/corporate/nanotrasen{ + name = "Slime Booster Kit" + }, +/obj/item/slimepotion/fertility, +/obj/item/slimepotion/feeding, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "bk" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, @@ -140,16 +285,13 @@ "bl" = ( /turf/simulated/wall/prepainted/civilian, /area/library) -"bo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8 - }, -/obj/map_helper/airlock/atmos/pump_out_external, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/main_map/maintenance/deck_four/aft/port) +"bm" = ( +/obj/machinery/disposal, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"bp" = ( +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "bq" = ( /obj/machinery/shipsensors{ dir = 1 @@ -168,10 +310,36 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/library) +"bt" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab/chamber) "bu" = ( /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall/prepainted/exploration, /area/gateway) +"bv" = ( +/obj/turbolift_map_holder/euthenia_cargo, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"bx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"by" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "bz" = ( /obj/structure/plasticflaps/mining, /obj/machinery/conveyor{ @@ -179,26 +347,70 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"bC" = ( -/obj/machinery/light{ +"bB" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_four/aft) +"bD" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) -"bE" = ( -/obj/structure/cable/heavyduty, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"bF" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"bG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "bH" = ( /turf/simulated/floor/tiled, /area/quartermaster/miningdock) +"bI" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"bJ" = ( +/obj/machinery/computer/guestpass{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "bK" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) +"bL" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) "bM" = ( /obj/structure/railing/grey{ dir = 1 @@ -222,6 +434,16 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"bQ" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"bR" = ( +/obj/structure/girder/reinforced, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "bS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -236,6 +458,22 @@ /obj/structure/target_stake, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"bV" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"bW" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"bX" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "bY" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -254,11 +492,23 @@ /obj/effect/floor_decal/techfloor/corner, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"cf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) +"ce" = ( +/obj/structure/ore_box, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"cg" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "ci" = ( /obj/machinery/camera/network/research{ dir = 4 @@ -294,10 +544,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"cq" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"cr" = ( +/obj/structure/closet, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "cs" = ( /obj/machinery/camera/network/civilian, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"ct" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab/storage) "cu" = ( /obj/structure/closet/crate, /obj/item/target, @@ -323,15 +587,12 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"cx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"cz" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "cA" = ( /obj/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ @@ -358,25 +619,31 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/port) -"cH" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 +"cE" = ( +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"cF" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "W-SE-NE" }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"cK" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"cG" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/techfloor/hole{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"cJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "cL" = ( /obj/effect/catwalk_plated/dark, /turf/simulated/floor/plating, @@ -384,12 +651,70 @@ "cM" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/starboard) +"cN" = ( +/obj/structure/table/standard, +/obj/item/gun/energy/taser/xeno, +/obj/item/melee/baton/slime/loaded, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"cP" = ( +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"cQ" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/disposal, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "cR" = ( /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) +"cS" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "cW" = ( /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"cX" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"cY" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"cZ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) +"da" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"db" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "dc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -397,21 +722,71 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/bluegrid, /area/ai) -"de" = ( -/obj/effect/floor_decal/borderfloor/corner{ +"dd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"dj" = ( +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/structure/disposaloutlet{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"dk" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/sar{ + req_access = list(5); + req_one_access = list(5) + }, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/autoinjectors, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/roller, +/obj/item/storage/backpack/parachute, +/obj/item/binoculars, +/obj/machinery/camera/network/exploration{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/exploration/explorer_prep) +"dl" = ( +/obj/effect/floor_decal/industrial/danger/corner, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "dm" = ( /obj/structure/dispenser/oxygen, /obj/machinery/light/no_nightshift{ @@ -419,56 +794,119 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"dn" = ( -/obj/structure/salvageable/machine, -/turf/simulated/floor/plating, -/area/space) "dp" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"dq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +"dr" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"dw" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) +"dx" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"dy" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4) -"dv" = ( -/obj/machinery/button/remote/blast_door{ - dir = 6; - id = "PubPrepFront"; - name = "Gateway Shutter"; - pixel_x = -24; - pixel_y = -24; - req_access = list(62) +"dz" = ( +/obj/structure/closet/secure_closet/explorer, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"dC" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab/foyer) +"dD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"dB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/industrial/warning{ +/area/rnd/telescience_lab) +"dE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/camera/network/cargo, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/structure/table/reinforced, +/obj/machinery/door/window/southright{ + req_one_access = list(48) + }, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-9" +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"dF" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/structure/closet/hydrant{ - pixel_x = -32 +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"dG" = ( +/obj/machinery/button/remote/blast_door{ + id = "PubPrep"; + name = "Gateway Shutter"; + pixel_x = -25; + pixel_y = 25; + req_access = list(62) }, /turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +/area/rnd/telescience_lab) +"dH" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"dI" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"dJ" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "dK" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -489,24 +927,45 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) -"dN" = ( -/obj/spawner/window/reinforced/full/firelocks, +"dM" = ( +/obj/structure/window/reinforced, +/obj/structure/table/glass, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"dP" = ( +/obj/structure/salvageable/bliss, /turf/simulated/floor/plating, -/area/space) -"dO" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/area/main_map/maintenance/deck_four/aft/starboard) +"dQ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor/corner{ dir = 1 }, -/turf/simulated/floor/bluegrid, -/area/ai_upload) -"dT" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"dR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"dS" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "dU" = ( /turf/simulated/wall/r_wall, /area/rnd/anomaly_lab/containment_one) @@ -514,44 +973,74 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_two) -"ea" = ( +"dW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 9 }, -/obj/machinery/door/airlock/maintenance/rnd, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 9 }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"dX" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"ed" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"dY" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"eb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"ec" = ( +/obj/structure/salvageable/bliss, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"ee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "ef" = ( /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4/fore) -"eg" = ( -/obj/structure/cable{ - icon_state = "16-0" - }, -/obj/structure/cable/heavyduty{ - icon_state = "0-4" +"eh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "ei" = ( /obj/structure/railing{ dir = 8 @@ -567,6 +1056,25 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"el" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"em" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "en" = ( /obj/structure/railing{ dir = 1 @@ -596,9 +1104,25 @@ /obj/structure/railing/grey, /turf/simulated/floor/plating, /area/ai_upload) +"et" = ( +/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 = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "eu" = ( /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) +"ev" = ( +/obj/machinery/light/small/emergency, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "ex" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/plating, @@ -615,31 +1139,25 @@ }, /turf/simulated/floor/wood, /area/library) +"eA" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "eB" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) "eC" = ( /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"eD" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - id = "PubPrepFront"; - name = "Gateway Shutter"; - pixel_x = 24; - pixel_y = 23; - req_access = list(62) - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "eE" = ( /turf/simulated/floor/plating, /area/main_map/hallway/deck4) @@ -647,24 +1165,53 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/maintenance/deck_four/aft/port) -"eI" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/reinforced/airless, -/area/space) +"eG" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"eH" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospheric_field_generator, +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase_shuttle_door"; + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "mobile_miningbase_shuttle_door"; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) "eJ" = ( /obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"eL" = ( -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) "eN" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/port) +"eO" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"eP" = ( +/obj/machinery/requests_console/preset/research{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"eQ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/airlock_sensor/airlock_exterior{ + pixel_y = -24; + dir = 1 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "eR" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -674,10 +1221,62 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"eX" = ( -/obj/map_helper/network_builder/power_cable/green/auto, +"eS" = ( +/obj/machinery/computer/security/mining{ + dir = 4; + name = "xenobiology camera monitor"; + network = list("Xenobiology") + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"eT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/quartermaster/miningdock) +/area/exploration/explorer_prep) +"eU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/wooden_reinforced, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"eV" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"eW" = ( +/obj/structure/salvageable/server, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"fa" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"fb" = ( +/obj/structure/closet/secure_closet/explorer, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "fc" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/records) @@ -688,26 +1287,57 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, /area/main_map/maintenance/deck_four/forward) -"ff" = ( -/obj/effect/floor_decal/techfloor/corner{ +"fe" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(5,19,43,44,67); + dir = 8; + name = "Exploration Equipment Room" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/exploration/explorer_prep) +"fg" = ( +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) +"fh" = ( +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"fi" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"fm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/no_nightshift{ +"fq" = ( +/obj/machinery/door/airlock/maintenance, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) +"fr" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/techfloor{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"fo" = ( -/obj/machinery/telepad, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "fs" = ( /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, @@ -745,13 +1375,22 @@ /obj/item/book/custom_library/religious, /turf/simulated/floor/wood, /area/library) -"fC" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S" +"fz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/turf/space, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"fA" = ( +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/starboard) +"fB" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "fD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -761,15 +1400,15 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"fE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"fF" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/machinery/camera/network/engineering{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "fG" = ( /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, @@ -784,20 +1423,42 @@ /obj/item/book/custom_library/nonfiction, /turf/simulated/floor/wood, /area/library) -"fJ" = ( +"fK" = ( /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/research) +"fL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "fM" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"fN" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"fO" = ( +/obj/machinery/camera/network/command, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "fQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -805,9 +1466,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"fS" = ( -/turf/simulated/wall, -/area/gateway/prep_room) "fT" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -815,16 +1473,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"fV" = ( +"fU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"fW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/techfloor/corner, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/area/rnd/xenobiology) "fX" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -843,21 +1495,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/greengrid, /area/ai_upload) -"gc" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/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 = 8 - }, -/turf/simulated/floor/tiled/techfloor, +"gd" = ( +/obj/item/barrier_tape_segment/engineering, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) +"ge" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "gf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -866,6 +1514,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/greengrid, /area/ai) +"gg" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "gravity_pump" + }, +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ + dir = 8; + id_tag = "gravity_airlock"; + name = "Gravity Generator Airlock"; + pixel_x = 24; + req_access = list(11); + tag_airpump = "gravity_pump"; + tag_chamber_sensor = "gravity_csensor"; + tag_exterior_door = "gravity_outer"; + tag_exterior_sensor = "gravity_esensor"; + tag_interior_door = "gravity_inner"; + tag_interior_sensor = "gravity_isensor" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"gh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "gi" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -892,19 +1569,63 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"gk" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical/vault1) -"gl" = ( -/obj/structure/stairs/spawner/north, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/port) +"gm" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"gn" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"go" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/cap/hidden, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"gp" = ( +/obj/structure/table/reinforced, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/communicator, +/obj/item/communicator, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"gs" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "UpperInnerTeleSciBlastDoor"; + name = "Upper Inner TeleSci Blast Door Button"; + pixel_y = 24 + }, +/obj/machinery/button/remote/blast_door{ + id = "UpperOuterTeleSciBlastDoor"; + name = "Upper Outer TeleSci Blast Door Button"; + pixel_x = -11; + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "gv" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/gateway) -"gw" = ( -/turf/simulated/wall/r_wall, -/area/gateway/prep_room) "gx" = ( /obj/machinery/atmospherics/component/binary/passive_gate/on{ dir = 1; @@ -916,21 +1637,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"gz" = ( -/turf/simulated/floor/tiled, -/area/space) +"gy" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) "gA" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"gC" = ( -/obj/machinery/camera/network/research{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"gB" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "gD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -940,34 +1661,24 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"gE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/camera/network/research{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "gF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4/fore) -"gG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-9" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) "gH" = ( /obj/structure/table, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"gI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "gJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -980,13 +1691,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) -"gN" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +"gL" = ( +/obj/machinery/door/firedoor, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) +"gM" = ( +/obj/machinery/gravity_generator/main/station, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "gO" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 5 @@ -1000,6 +1713,25 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"gP" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"gQ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "gT" = ( /obj/structure/cable{ icon_state = "16-0" @@ -1015,21 +1747,13 @@ }, /turf/simulated/floor/plating, /area/ai_upload) -"gV" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/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 = 8 +"gU" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/structure/railing, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "gW" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, @@ -1046,45 +1770,99 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) +"ha" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "hb" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"hi" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +"hd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"hh" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/main_map/hallway/deck4/fore) +"hj" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "hk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"hl" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "hm" = ( /obj/structure/cable/green{ icon_state = "1-8" }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"hn" = ( +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "ho" = ( /obj/structure/lattice, /turf/space/basic, /area/space) +"hp" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"hr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) "hs" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"ht" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +"hu" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/main_map/hallway/deck4) +"hv" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet, +/obj/machinery/camera/network/research{ + network = list("Xenobiology") + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "hw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1099,6 +1877,14 @@ }, /turf/simulated/floor/plating, /area/ai_upload) +"hy" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"hz" = ( +/obj/structure/statue/marble/female, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "hA" = ( /obj/structure/table/woodentable, /obj/item/duct_tape_piece, @@ -1115,29 +1901,39 @@ }, /turf/simulated/floor/reinforced, /area/gateway) -"hC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 +"hD" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/camera/motion{ - network = list("Research","Command") +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"hF" = ( +/obj/structure/table/standard, +/obj/machinery/computer/atmoscontrol/laptop{ + monitored_alarm_ids = list("xenopenvent"); + req_one_access = list(47,24,11) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"hG" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) -"hE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/aft/port) "hH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1167,9 +1963,17 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/gateway) -"hM" = ( -/turf/simulated/wall, -/area/space) +"hL" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "hN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1195,12 +1999,33 @@ }, /turf/space, /area/space) +"hR" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "hS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) +"hU" = ( +/obj/structure/table/reinforced, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "hV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1214,8 +2039,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -1234,19 +2058,27 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"ic" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor/airlock_exterior{ - pixel_y = -24 +"hZ" = ( +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 }, -/obj/machinery/atmospherics/pipe/vent/high_volume{ - dir = 8 +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"ib" = ( +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "smuggler_door1"; + pixel_x = 32 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/main_map/maintenance/deck_four/aft/port) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"id" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "ie" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -1256,37 +2088,65 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"ig" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +"if" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) -"ih" = ( -/obj/structure/salvageable/bliss, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/disposal, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"ii" = ( +/obj/structure/table/reinforced, +/obj/item/multitool/triumph_buffered, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "ij" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/miningdock) -"is" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +"ik" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio4"; + name = "Containment Blast Doors"; + opacity = 0 }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"im" = ( +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab/chamber) +"ip" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"iq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"it" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) "iv" = ( /obj/structure/curtain/black{ anchored = 1; @@ -1294,21 +2154,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/main_map/maintenance/deck_four/forward) -"iw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) "ix" = ( /obj/machinery/door/airlock/glass/mining{ name = "Cargo Bay"; @@ -1317,39 +2162,37 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/miningdock) -"iA" = ( +"iz" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Cargo Bay"; + req_access = list(31); + req_one_access = list() + }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/steel_ridged, +/area/quartermaster/miningdock) "iB" = ( /obj/structure/filingcabinet{ desc = "A large cabinet with drawers. They seem to be ominously empty."; name = "Classified Science Records" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"iD" = ( -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "PubPrepFront"; - layer = 3.3; - name = "Gateway Prep Shutter" +"iC" = ( +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/space, +/area/rnd/telescience_lab/chamber) "iE" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = 30 }, /obj/machinery/conveyor_switch/oneway{ @@ -1364,6 +2207,27 @@ "iF" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"iG" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"iH" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/wood, +/area/library) +"iI" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "iK" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 @@ -1386,11 +2250,44 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"iM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/landmark/spawnpoint/job/cyborg, +/turf/simulated/floor/bluegrid, +/area/ai_upload) +"iO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"iP" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "iQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) +"iR" = ( +/obj/machinery/button/remote/blast_door{ + id = "tele_sci_vent"; + name = "Emergency Telesci Vent"; + pixel_x = -11; + pixel_y = -24; + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "iS" = ( /obj/structure/sink/kitchen{ name = "sink"; @@ -1398,9 +2295,6 @@ }, /turf/simulated/floor/plating, /area/main_map/hallway/deck4) -"iT" = ( -/turf/simulated/floor/bluegrid, -/area/gateway/prep_room) "iU" = ( /obj/structure/bookcase/legal/combo, /obj/item/book/manual/standard_operating_procedure, @@ -1411,6 +2305,22 @@ }, /turf/simulated/floor/wood, /area/library) +"iV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "iW" = ( /obj/machinery/door/morgue{ dir = 2; @@ -1418,16 +2328,37 @@ }, /turf/simulated/floor/tiled/dark, /area/main_map/maintenance/deck_four/forward) +"iY" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "iZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/gateway) -"jc" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +"ja" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = list(5,19,43,44,67) }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) +"jb" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/structure/closet/secure_closet/explorer, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "jd" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas, @@ -1453,11 +2384,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ai) -"jf" = ( -/turf/simulated/wall/r_wall{ - can_open = 1 - }, -/area/space) "jg" = ( /obj/machinery/message_server, /turf/simulated/floor/tiled/techfloor, @@ -1478,37 +2404,129 @@ /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) +"jj" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "jk" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) -"jl" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, +"jm" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/engineering/aft_hallway) +"jo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "16-0" + icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"jr" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) +"js" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 1; + pressure_resistance = 750; + target_pressure = 750 }, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/area/rnd/telescience_lab) +"ju" = ( +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) "jv" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) -"jx" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"jw" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "jy" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck4) +"jz" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"jA" = ( +/obj/machinery/button/remote/blast_door{ + id = "xenobiovs"; + name = "Divider Blast Doors"; + pixel_x = -38; + req_access = list(55) + }, +/obj/machinery/button/remote/blast_door{ + id = "xenobio2"; + name = "Containment Blast Doors"; + pixel_x = -25; + pixel_y = -8; + req_access = list(55) + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + id = "xenobio1"; + name = "Containment Blast Doors"; + pixel_x = -25; + pixel_y = 8; + req_access = list(55) + }, +/obj/machinery/camera/network/research{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"jB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "jC" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) @@ -1518,10 +2536,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"jE" = ( -/obj/machinery/door/airlock/engineering, -/turf/simulated/floor/tiled, -/area/space) +"jF" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/starboard) "jG" = ( /obj/structure/table/woodentable, /obj/item/pen/invisible, @@ -1538,9 +2556,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"jH" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck4/fore) "jI" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -1562,16 +2577,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"jK" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "jL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1584,6 +2589,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"jM" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"jN" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"jO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"jP" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "jQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -1594,42 +2624,173 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) +"jR" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"jS" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/valve{ + name = "EMERGENCY VENT TO SPACE" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "jV" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"jW" = ( +/obj/machinery/atmospherics/component/unary/freezer{ + dir = 1; + icon_state = "freezer_1"; + power_setting = 20; + set_temperature = 73; + use_power = 1 + }, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"jZ" = ( +/obj/structure/stairs/spawner/north, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"kb" = ( +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/access_button/airlock_exterior{ + dir = 1; + pixel_y = -24; + master_tag = "smugler_airlock1" + }, +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "kc" = ( /obj/machinery/door/airlock/maintenance/common, /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) -"ke" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +"kd" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"kf" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/gravity_gen) +"kg" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/bed/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "ki" = ( /obj/machinery/gateway{ dir = 9 }, /turf/simulated/floor/reinforced, /area/gateway) -"kj" = ( -/obj/effect/floor_decal/industrial/warning{ +"kl" = ( +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"kk" = ( -/obj/structure/statue/marble/venus, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"kn" = ( +/obj/machinery/power/apc/south_mount, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/forward/port) "kq" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/starboard) +"kr" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"ks" = ( +/turf/simulated/floor/tiled/techfloor, +/area/engineering/gravity_gen) +"ku" = ( +/obj/structure/bed/chair/sofa/brown{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) +"kv" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/main_map/maintenance/deck_four/forward) +"kw" = ( +/obj/structure/table/rack/shelf, +/turf/simulated/floor/reinforced, +/area/rnd/secure_storage/lower) +"kx" = ( +/obj/landmark/spawnpoint/job/cyborg, +/turf/simulated/floor/tiled/techfloor, +/area/ai_upload) +"ky" = ( +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) +"kz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"kA" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"kB" = ( +/obj/item/storage/box/nifsofts_mining, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/camera/network/cargo{ + dir = 4 + }, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/duct_tape_roll, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "kD" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1640,6 +2801,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"kE" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/adv, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"kF" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/item/barrier_tape_segment/atmos, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) "kG" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -1650,6 +2824,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"kH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"kJ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "kK" = ( /obj/landmark/spawnpoint/job/chaplain, /obj/item/radio/intercom{ @@ -1675,6 +2864,17 @@ "kN" = ( /turf/simulated/wall/prepainted/civilian, /area/library/study) +"kO" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice, +/turf/space, +/area/rnd/telescience_lab/chamber) +"kR" = ( +/obj/structure/ore_box, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "kS" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -1685,6 +2885,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/gateway) +"kT" = ( +/obj/structure/lattice, +/turf/simulated/wall/r_wall, +/area/space) +"kU" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "kW" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/component/binary/pump{ @@ -1693,6 +2901,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"kY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, +/obj/structure/closet/hydrant{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "kZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -1702,25 +2923,36 @@ "la" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/main_map/maintenance/deck_four/aft/port) -"ld" = ( +"lb" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/miningdock) -"lf" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Gateway Civilian Prep" +/obj/structure/cable/green{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"li" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"lc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"ld" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) +"lg" = ( +/obj/structure/girder/reinforced, +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_four/starboard) +"lh" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "lj" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -1731,19 +2963,71 @@ }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"lk" = ( +/obj/machinery/computer/telescience{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) "ll" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/reinforced, /area/gateway) -"lo" = ( -/obj/structure/flora/tree/jungle, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research) +"lm" = ( +/obj/structure/bed/roller, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "lp" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward/starboard) +"lq" = ( +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/camera/network/cargo, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"ls" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"lt" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab/chamber) "lu" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1763,28 +3047,30 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"ly" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "lz" = ( /turf/simulated/floor/reinforced, /area/gateway) -"lA" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"lE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +"lB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"lD" = ( +/obj/machinery/disposal, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) "lF" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/aft/starboard) +"lG" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "lH" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -1794,6 +3080,10 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) +"lI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "lJ" = ( /obj/machinery/conveyor{ dir = 1 @@ -1804,31 +3094,76 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"lK" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/machinery/door/blast/regular{ - id = "mobile_miningbase" +"lL" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"lM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"lO" = ( +/obj/structure/ladder{ + pixel_y = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, /turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) -"lN" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/area/rnd/telescience_lab/chamber) "lP" = ( /turf/simulated/wall/prepainted, /area/maintenance/trash_pit) -"lS" = ( -/obj/effect/floor_decal/spline/plain, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_access" +"lQ" = ( +/obj/structure/table/steel, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 12 + }, +/obj/item/multitool{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/stack/cable_coil, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"lR" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/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 = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"lT" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379 + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "lU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1848,23 +3183,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"lW" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "lX" = ( /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"lZ" = ( -/obj/structure/table/reinforced, -/obj/item/multitool/triumph_buffered, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"lY" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "ma" = ( /obj/machinery/ai_slipper, /obj/structure/cable{ @@ -1878,54 +3202,113 @@ /obj/structure/stairs/spawner/south, /turf/simulated/floor/plating, /area/rnd/research) -"mg" = ( -/turf/simulated/floor/plating, -/area/engineering/ftl) -"mh" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +"mc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"me" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"mf" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"mn" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"mi" = ( +/obj/item/slime_extract/grey, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"mj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "6-8" + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"mk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/rnd/xenobiology) +"ml" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "mo" = ( /obj/structure/salvageable/computer_os, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"mp" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"mq" = ( +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_monitoring) "mr" = ( /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"mx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"mt" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-10" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"mu" = ( +/turf/simulated/wall, +/area/main_map/maintenance/deck_three) +"mv" = ( +/obj/machinery/door/airlock/lift, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"mz" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4/fore) "mA" = ( /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four) -"mD" = ( -/obj/structure/railing{ - dir = 8 +"mB" = ( +/obj/structure/railing, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"mC" = ( +/obj/structure/table/standard, +/obj/item/slime_scanner, +/obj/item/slime_scanner, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/obj/structure/railing{ +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "mE" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1936,51 +3319,67 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) -"mG" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"mH" = ( -/obj/structure/bed/chair/comfy/black, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) +"mF" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "mI" = ( /obj/machinery/atmospherics/component/unary/heater{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"mJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +"mK" = ( +/obj/machinery/door/airlock/glass/research{ + name = "Xenoarch"; + req_access = list(65) }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/rnd/anomaly_lab) "mL" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 }, /turf/simulated/floor/wood, /area/library) -"mM" = ( -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"mO" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/space) +"mN" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"mQ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) "mR" = ( /turf/simulated/floor/bluegrid, /area/ai) +"mS" = ( +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "mV" = ( /obj/structure/bookcase/legal/combo, /obj/item/book/manual/standard_operating_procedure, @@ -1991,6 +3390,30 @@ }, /turf/simulated/floor/wood, /area/library) +"mW" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"mX" = ( +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Telescience Tower" + }, +/obj/machinery/button/remote/blast_door{ + id = "OuterTeleSciBlastDoor"; + name = "Lower Outer TeleSci Blast Door Button"; + pixel_x = -11; + pixel_y = 24 + }, +/obj/machinery/button/remote/blast_door{ + id = "InnerTeleSciBlastDoor"; + name = "Lower Inner TeleSci Blast Door Button"; + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "mY" = ( /turf/simulated/wall/r_wall, /area/library/study) @@ -2002,6 +3425,33 @@ "na" = ( /turf/simulated/floor/tiled/techmaint, /area/rnd/research) +"nb" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"nc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/research{ + name = "Telescience Storage" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "nd" = ( /turf/simulated/wall/r_wall, /area/library) @@ -2014,71 +3464,124 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"ng" = ( -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"nm" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"nn" = ( +"ni" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) +"nj" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"nk" = ( +/obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/gateway) +"no" = ( +/obj/structure/statue/marble/venus, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "np" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"nu" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +"nq" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/space/basic, +/area/space) +"nr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"nt" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access = list(); + req_one_access = list(7,29) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"nv" = ( +/obj/machinery/door/airlock/maintenance/int{ + req_access = list(27); + name = "Chapel Access" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "nw" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/forward) +"nx" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad" + }, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "nz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 }, /turf/simulated/floor/reinforced, /area/gateway) -"nC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"nD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/purple{ dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) -"nH" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/main_map/maintenance/deck_four/forward) -"nI" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"nE" = ( +/obj/structure/closet/radiation, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_monitoring) +"nG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/mains_pipe/cap/hidden{ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/exploration/explorer_prep) +"nH" = ( +/turf/simulated/wall/r_wall/prepainted/civilian, +/area/main_map/maintenance/deck_four/forward) +"nJ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four) +"nK" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "nL" = ( /obj/machinery/camera/network/research_outpost{ dir = 4; @@ -2086,39 +3589,77 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"nM" = ( -/obj/machinery/door/airlock/glass/engineering, +"nO" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/space) +/area/exploration/explorer_prep) +"nQ" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "nR" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) +"nS" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) "nT" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"nU" = ( -/obj/machinery/airlock_sensor/airlock_interior{ - dir = 1; - pixel_y = -24 +"nW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"nX" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"nY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/map_helper/airlock/sensor/int_sensor, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"nZ" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 4; + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/port) -"nV" = ( -/obj/structure/stairs/spawner/south, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "oa" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward/starboard) +"ob" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"oc" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) "og" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/techfloor{ @@ -2145,13 +3686,22 @@ "ok" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/starboard) -"ol" = ( +"on" = ( +/obj/structure/stairs/spawner/west, /obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"oo" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/railing, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research) +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "op" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas, @@ -2162,6 +3712,12 @@ /obj/item/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"oq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "or" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2180,11 +3736,21 @@ /obj/machinery/blackbox_recorder, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"ou" = ( +"ot" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +/area/main_map/maintenance/deck_four/aft/starboard) +"ov" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) +"ow" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/port) "ox" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -2195,7 +3761,6 @@ "oy" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = 30 }, /obj/effect/floor_decal/industrial/warning{ @@ -2203,10 +3768,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"oB" = ( -/obj/machinery/holopad, +"oz" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"oA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/table/rack/shelf, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/exploration/explorer_prep) "oC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2216,12 +3803,12 @@ }, /turf/simulated/floor/greengrid, /area/ai) -"oD" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"oF" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/forward) +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "oH" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/bed/chair{ @@ -2229,6 +3816,24 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"oI" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"oJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"oK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "oL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/door/blast/regular{ @@ -2237,16 +3842,62 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"oM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) "oN" = ( /obj/machinery/camera/network/command{ dir = 4 }, /turf/simulated/floor/greengrid, /area/ai) +"oO" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"oP" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "oQ" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) +"oR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/science{ + name = "Secure Storage"; + req_one_access = list(20,30) + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/access_button/airlock_interior{ + master_tag = "secure_science_stroage_airlock_control"; + pixel_x = -24; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "oS" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -2255,15 +3906,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"oT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +"oW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "oX" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable/green{ @@ -2272,13 +3919,11 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/library) -"oZ" = ( -/obj/structure/closet/secure_closet/personal, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +"oY" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "pa" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck4) @@ -2299,6 +3944,15 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood, /area/library) +"pd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "pe" = ( /obj/machinery/air_alarm/monitor/isolation{ alarm_id = "isolation_two"; @@ -2307,34 +3961,41 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) -"pf" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) "pg" = ( /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" }, /turf/simulated/floor/wood, /area/library) -"ph" = ( -/obj/machinery/light/small{ - dir = 8 +"pi" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "pj" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/port) -"pl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"pk" = ( +/obj/structure/bed/chair/office/light{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"pm" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"po" = ( +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "pp" = ( /obj/effect/debris/cleanable/blood/splatter, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -2348,6 +4009,13 @@ /obj/item/mop, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4) +"ps" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "cludge_hanger" + }, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/forward/port) "pt" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -2357,9 +4025,19 @@ "pu" = ( /turf/simulated/shuttle/plating/carry, /area/main_map/maintenance/deck_four/aft/port) -"px" = ( -/obj/structure/morgue/crematorium{ - id = "crematorium" +"pv" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"pw" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"px" = ( +/obj/structure/morgue/crematorium{ + id = "crematorium" }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward) @@ -2394,16 +4072,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) +"pE" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) "pF" = ( /turf/simulated/wall, /area/main_map/hallway/deck4) -"pH" = ( -/obj/structure/table/bench/standard, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +"pG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "pJ" = ( /turf/simulated/wall, /area/quartermaster/miningdock) @@ -2420,6 +4104,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) +"pP" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/rnd/secure_storage/critical) "pR" = ( /obj/machinery/door/airlock/glass_external{ name = "Isolation Room 1"; @@ -2446,12 +4136,29 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) +"pT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "pU" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward/starboard) +"pW" = ( +/obj/structure/salvageable/server_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"pX" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "pY" = ( /obj/machinery/porta_turret/stationary, /obj/machinery/light{ @@ -2459,10 +4166,49 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"pZ" = ( -/obj/structure/closet/secure_closet/personal, +"qa" = ( +/obj/structure/table/woodentable, +/obj/machinery/photocopier/faxmachine{ + department = "Pathfinder's Office"; + pixel_x = 2; + pixel_y = 4 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"qb" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"qc" = ( +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase"; + dir = 4 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) +"qe" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_inner"; + req_access = list(11); + name = "Gravity Generator Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/area/engineering/gravity_gen) "qg" = ( /turf/simulated/floor/greengrid, /area/ai) @@ -2476,6 +4222,40 @@ }, /turf/space, /area/space) +"qm" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"qn" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"qo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"qp" = ( +/mob/living/simple_mob/living_statue, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"qq" = ( +/turf/simulated/wall{ + can_open = 1 + }, +/area/main_map/maintenance/deck_four/aft) "qr" = ( /turf/simulated/wall, /area/library) @@ -2483,11 +4263,28 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"qt" = ( -/obj/machinery/door/blast/regular{ +"qu" = ( +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"qv" = ( +/obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) +"qw" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + req_one_access = list(31); + name = "Mining Operations" + }, +/turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/miningdock) "qx" = ( /obj/spawner/window/reinforced/full/firelocks, @@ -2499,41 +4296,88 @@ }, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) -"qC" = ( +"qz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"qA" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"qB" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"qD" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"qF" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/button/remote/blast_door{ + id = "gateway_access"; + name = "Gateway Access"; + pixel_x = 24 + }, /obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) +"qG" = ( +/obj/machinery/camera/network/research{ dir = 4; - id = "smuggler_door1" + network = list("Xenobiology") }, -/turf/simulated/floor/plating, -/area/space) -"qH" = ( -/obj/structure/table/fancyblack, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"qI" = ( -/obj/machinery/door/airlock/science{ - name = "Secure Storage"; - req_one_access = list(20,30) +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" }, -/obj/map_helper/airlock/door/int_door, -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) -"qM" = ( -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") +/area/rnd/xenobiology) +"qJ" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) -"qO" = ( -/obj/structure/closet/secure_closet/personal, -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") +/area/main_map/hallway/deck4/fore) +"qK" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/area/engineering/aft_hallway) +"qP" = ( +/obj/machinery/light/spot/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) +"qQ" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4) "qR" = ( /obj/structure/sink/kitchen{ name = "sink"; @@ -2542,14 +4386,28 @@ /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/starboard) -"qS" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379 +"qT" = ( +/obj/structure/dogbed, +/obj/item/toy/plushie/squid/pink, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"qU" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/library) +"qV" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 }, -/obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, -/area/space) +/area/main_map/hallway/deck4/fore) "qW" = ( /obj/structure/filingcabinet{ desc = "A large cabinet with drawers. They seem to be ominously empty."; @@ -2562,6 +4420,16 @@ /obj/machinery/door/airlock, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4/fore) +"qY" = ( +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) "qZ" = ( /obj/machinery/light_switch{ dir = 8; @@ -2569,15 +4437,22 @@ }, /turf/simulated/floor/wood, /area/library) -"ra" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/space) -"re" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +"rb" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"rd" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, /turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +/area/exploration/explorer_prep) +"rf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "rg" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -2586,10 +4461,48 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"rh" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "ri" = ( /obj/machinery/gateway/centerstation, /turf/simulated/floor/reinforced, /area/gateway) +"rj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"rk" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"rl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "rm" = ( /obj/structure/bookcase{ name = "bookcase (Fiction)" @@ -2598,15 +4511,21 @@ /obj/item/book/manual/the_humanized_mice, /turf/simulated/floor/wood, /area/library) -"rn" = ( +"ro" = ( +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"rp" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "rq" = ( /obj/machinery/door/airlock/science{ name = "Secure Storage"; @@ -2630,13 +4549,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) -"rs" = ( -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - pressure_resistance = 750; - target_pressure = 750 +"rr" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/forward) +"rt" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/glass, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "rv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2650,21 +4582,36 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"rA" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/library) -"rB" = ( +"ry" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio1"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"rz" = ( /obj/structure/cable/green{ - icon_state = "0-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) -"rC" = ( -/obj/machinery/door/airlock/glass_science, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck4/fore) +/area/main_map/maintenance/deck_four/forward) +"rA" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/library) "rD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2680,48 +4627,31 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"rF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +"rE" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/port) "rH" = ( /obj/machinery/gateway{ dir = 5 }, /turf/simulated/floor/reinforced, /area/gateway) -"rI" = ( -/turf/simulated/wall{ - can_open = 1 - }, -/area/space) -"rJ" = ( -/obj/structure/closet/excavation, -/obj/item/multitool, -/obj/item/multitool, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "rK" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"rL" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1379 +"rM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/airlock_sensor{ - pixel_y = -24; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "rN" = ( /turf/simulated/wall/r_wall{ can_open = 1 @@ -2743,21 +4673,52 @@ /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/white, /area/rnd/anomaly_lab) +"rP" = ( +/obj/machinery/door/blast/regular{ + id = "xenobiovs"; + layer = 8; + name = "Divider Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "rQ" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4/fore) -"rS" = ( -/obj/spawner/window/reinforced/full, -/turf/simulated/floor/plating, -/area/outpost/mining_main/outpost/near_gateway) -"rX" = ( -/obj/machinery/door/airlock/maintenance, +"rT" = ( +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"rU" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck4/fore) -"rZ" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/main_map/hallway/deck4) +/area/main_map/maintenance/deck_four/starboard) +"rV" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"rW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "sa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2769,18 +4730,19 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"sd" = ( -/turf/simulated/wall/r_wall/prepainted/exploration, -/area/main_map/maintenance/deck_four/aft/port) -"sg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +"sb" = ( +/obj/structure/table/steel, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"se" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"sf" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "sh" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/bookbinder, @@ -2793,6 +4755,40 @@ /obj/structure/lattice, /turf/space, /area/space) +"sj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"sk" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"sm" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "sn" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward/port) @@ -2805,6 +4801,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) +"sp" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) "sq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2828,16 +4830,35 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"sw" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +"ss" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"st" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/light{ +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"su" = ( +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"sv" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "sx" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/starboard) @@ -2852,18 +4873,11 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) -"sz" = ( -/turf/simulated/floor/tiled/monotile, -/area/gateway/prep_room) -"sA" = ( -/obj/structure/table/bench/standard, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) "sC" = ( /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc/super/south_bump, +/obj/machinery/power/apc/super/south_mount, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) "sD" = ( @@ -2884,24 +4898,6 @@ /obj/item/clothing/head/bio_hood/anomaly, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"sF" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" - }, -/obj/structure/catwalk, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/space) -"sG" = ( -/obj/structure/girder/reinforced, -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) "sH" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -2912,12 +4908,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"sI" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) "sJ" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/forward) @@ -2933,47 +4923,48 @@ /obj/structure/flora/ausbushes/palebush, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"sO" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ +"sP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/port) "sQ" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/library) -"sT" = ( -/obj/machinery/button/remote/blast_door{ - id = "PubPrep"; - name = "Gateway Shutter"; - pixel_x = -25; - pixel_y = 25; - req_access = list(62) +"sR" = ( +/obj/structure/window/reinforced, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_four/aft/port) -"sU" = ( -/turf/simulated/wall/prepainted/civilian, -/area/main_map/maintenance/deck_four) -"sV" = ( -/obj/machinery/light{ +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"sW" = ( +/obj/machinery/light/no_nightshift{ dir = 4 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/area/main_map/hallway/deck4) +"sX" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "sZ" = ( /turf/simulated/floor/plating, /area/space) -"tb" = ( -/obj/structure/transit_tube/station{ - dir = 4 - }, -/obj/structure/transit_tube_pod{ - dir = 1 +"ta" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "tc" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -2985,6 +4976,10 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) +"td" = ( +/obj/machinery/door/airlock/glass/research, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) "tf" = ( /obj/structure/table/steel_reinforced, /obj/item/folder{ @@ -2998,27 +4993,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"ti" = ( -/obj/structure/table/woodentable, -/obj/item/flashlight/lamp{ - pixel_y = 12 +"tg" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) +/obj/structure/lattice, +/turf/space/basic, +/area/space) "tj" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) -"tk" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "4-8" +"tl" = ( +/obj/machinery/smartfridge/secure/extract, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "tm" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/lavendergrass, @@ -3028,23 +5022,14 @@ /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/plating, /area/quartermaster/miningdock) +"to" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "tp" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"tq" = ( -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/machinery/suit_cycler/mining{ - req_access = null - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) -"tr" = ( -/obj/machinery/mech_recharger, -/turf/simulated/floor/bluegrid, -/area/gateway/prep_room) "tt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -3071,10 +5056,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) -"tv" = ( -/obj/structure/statue/marble/male, -/turf/simulated/floor/plating, -/area/space) +"tw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/vending/medical{ + req_access = null; + req_one_access = list(5,44) + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "tx" = ( /obj/structure/bookcase{ name = "bookcase (Fiction)" @@ -3095,24 +5094,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"tC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/machinery/camera/network/research{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) "tD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"tG" = ( -/obj/spawner/window/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +"tE" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"tF" = ( +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"tH" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "tJ" = ( /obj/machinery/door/airlock/maintenance{ name = "Trash Pit" @@ -3127,6 +5135,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) +"tL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "tN" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3152,6 +5169,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) +"tP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "tQ" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -3159,62 +5182,25 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward/starboard) -"tR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"tS" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "tT" = ( /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) -"tV" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ +"tX" = ( +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/structure/railing{ - dir = 4 +/obj/effect/floor_decal/industrial/danger{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four) -"tW" = ( -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/access_button/airlock_exterior{ - dir = 1; - pixel_y = -24; - master_tag = "smugler_airlock1" +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"uc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plating, -/area/space) -"tY" = ( -/obj/machinery/mining/drill, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"ub" = ( -/mob/living/simple_mob/living_statue, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "ud" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 @@ -3231,12 +5217,17 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"uf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +"ug" = ( +/obj/structure/salvageable/computer_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"uh" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"ui" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/tether/exploration/pathfinder_office) "uk" = ( /obj/machinery/light/small{ dir = 4 @@ -3252,30 +5243,95 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"uo" = ( +"ul" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/landmark/spawnpoint/job/field_medic, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"un" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"uq" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S" +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"up" = ( +/obj/structure/frame/computer{ + dir = 1 }, -/turf/space, -/area/space) -"ur" = ( -/obj/machinery/camera/network/research, -/obj/effect/floor_decal/techfloor{ +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"us" = ( +/obj/structure/table/steel, +/obj/item/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/binoculars{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/binoculars{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) +"ut" = ( +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"uu" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/research) "uv" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) @@ -3286,16 +5342,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"ux" = ( -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) -"uy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "uz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -3305,6 +5351,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_one) +"uA" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab/foyer) "uC" = ( /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" @@ -3317,19 +5366,6 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"uG" = ( -/obj/effect/floor_decal/spline/plain, -/obj/machinery/button/remote/blast_door{ - id = "gateway_access"; - name = "Gateway Access"; - pixel_x = 24 - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_access" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) "uH" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -3353,23 +5389,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/ai) -"uL" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/structure/cable/orange{ - icon_state = "1-2" +"uK" = ( +/obj/structure/closet/crate{ + rigged = 1; + desc = "A rectangular steel crate with all identifying marks seemingly grinded off. Looks sketchy at best"; + name = "sketchy crate" }, +/obj/item/radio/electropack, /turf/simulated/floor/plating, -/area/quartermaster/miningdock) -"uQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/airlock{ - name = "General Storage"; - req_access = list(47) +/area/main_map/maintenance/deck_four/aft) +"uM" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four) +"uO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "uR" = ( /obj/structure/transit_tube/station{ dir = 1 @@ -3379,13 +5418,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward/starboard) -"uT" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" - }, -/obj/structure/lattice, -/turf/space, -/area/space) "uU" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, @@ -3397,21 +5429,49 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"uW" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) "uX" = ( /turf/simulated/wall/r_wall, /area/rnd/research/testingrange) +"uY" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) "va" = ( /obj/structure/stairs/spawner/east, /obj/structure/railing, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/port) -"vd" = ( -/obj/structure/table/reinforced, -/obj/item/roller, -/obj/item/roller, -/obj/machinery/camera/network/research_outpost, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"vc" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"ve" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"vf" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "vg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3441,15 +5501,47 @@ "vj" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/anomaly_lab/containment_two) -"vn" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +"vk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"vl" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"vm" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "vo" = ( /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4) +"vp" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "vr" = ( /turf/simulated/wall/r_wall, /area/quartermaster/miningdock) @@ -3457,10 +5549,39 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) +"vt" = ( +/obj/machinery/door/firedoor/glass{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass/exploration{ + name = "Explorer Prep"; + req_access = list(); + req_one_access = list(19,43,67) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "vu" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/starboard) +"vw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "vx" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3498,37 +5619,84 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) +"vB" = ( +/obj/structure/transit_tube/station{ + dir = 8 + }, +/obj/structure/transit_tube_pod, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"vC" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "vD" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/hallway/deck4) -"vG" = ( +"vE" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"vH" = ( -/obj/machinery/door/airlock/maintenance/cargo, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/miningdock) -"vJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-2" }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"vI" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"vK" = ( +/obj/machinery/recharge_station, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/quartermaster/office) +"vM" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/ai_upload) +"vO" = ( +/obj/structure/closet/secure_closet/miner, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "vP" = ( /turf/simulated/wall/prepainted/cargo, /area/quartermaster/miningdock) +"vQ" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio2"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"vR" = ( +/obj/machinery/door/airlock/glass/engineering, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/aft_hallway) "vS" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/vault1) @@ -3538,10 +5706,6 @@ }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"vU" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/tiled, -/area/space) "vV" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -3558,12 +5722,89 @@ }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"vX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"vY" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"vZ" = ( +/obj/machinery/door/airlock/science{ + name = "Pathfinder"; + req_one_access = list(44) + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "wa" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/gateway) +"wb" = ( +/obj/structure/closet/crate/corporate/nanotrasen, +/turf/simulated/floor/reinforced, +/area/rnd/secure_storage/lower) +"wc" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio7"; + name = "Containment Blast Doors"; + pixel_x = 24; + pixel_y = 24; + req_access = list(55) + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"wd" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"we" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 7 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"wf" = ( +/obj/machinery/telepad, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab/chamber) "wg" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3581,21 +5822,15 @@ /obj/machinery/gateway, /turf/simulated/floor/reinforced, /area/gateway) -"wj" = ( -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/external, -/turf/simulated/floor/plating, -/area/space) -"wl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"wm" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"wp" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) +/area/rnd/research) "wq" = ( /obj/structure/railing, /obj/structure/railing{ @@ -3604,11 +5839,16 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) -"wt" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) +"wr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"ws" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/wall, +/area/main_map/maintenance/deck_four/forward/port) "wu" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -3628,59 +5868,62 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"wz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +"wx" = ( /obj/structure/cable/green{ - icon_state = "6-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) -"wA" = ( -/obj/machinery/light_switch{ - name = "light switch "; - pixel_y = 30 +/area/main_map/hallway/deck4/fore) +"wy" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light{ +/obj/machinery/airlock_sensor{ + pixel_y = -24; dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) -"wC" = ( -/obj/machinery/atmospherics/component/unary/engine/bigger, -/turf/simulated/shuttle/plating/carry, -/area/main_map/maintenance/deck_four/aft/port) -"wD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"wB" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/camera/network/research{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/monotile, +/area/rnd/anomaly_lab) +"wC" = ( +/obj/machinery/atmospherics/component/unary/engine/bigger, +/turf/simulated/shuttle/plating/carry, +/area/main_map/maintenance/deck_four/aft/port) +"wE" = ( +/obj/machinery/door/blast/regular/open, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"wG" = ( +/turf/simulated/wall/r_wall, +/area/rnd/xenobiology) "wH" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) -"wI" = ( -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/machinery/door/airlock/glass/engineering, -/turf/simulated/floor/tiled/steel_ridged, -/area/space) +"wJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "wK" = ( /turf/simulated/floor/tiled/techfloor, /area/quartermaster/miningdock) @@ -3704,6 +5947,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"wO" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) +"wP" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "wQ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3730,33 +5982,126 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_one) -"wS" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) -"wV" = ( -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/starboard) -"xb" = ( -/obj/structure/railing, -/obj/structure/railing{ +"wT" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/wood, /area/main_map/maintenance/deck_four/forward) -"xc" = ( +"wU" = ( /obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) +"wV" = ( /turf/simulated/floor/plating, -/area/main_map/hallway/deck4/fore) -"xd" = ( +/area/main_map/maintenance/deck_four/starboard) +"wW" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/starboard) +"wY" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(11) + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"xa" = ( +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"xb" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"xd" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/main_map/maintenance/deck_four/port) -"xf" = ( -/obj/machinery/door/airlock/maintenance/engi, +"xe" = ( +/obj/item/reagent_containers/food/snacks/monkeycube/wrapped, +/obj/structure/table/standard, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"xh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"xi" = ( +/obj/structure/table/standard, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/weldingtool, +/obj/item/weldingtool, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"xj" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab) +"xk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"xl" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) +"xm" = ( +/obj/machinery/atmospherics/component/binary/pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"xn" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_access" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) +"xo" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/glass, -/obj/item/barrier_tape_segment/engineering, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/space) +/area/rnd/anomaly_lab) "xp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -3765,33 +6110,49 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"xs" = ( +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "xt" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 }, /turf/simulated/floor/tiled/techfloor, /area/gateway) -"xu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/table/rack/shelf/steel, -/obj/item/storage/toolbox/emergency, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"xv" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"xx" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 8 + }, +/obj/structure/curtain/open/shower/engineering, +/turf/simulated/floor/tiled/white, +/area/engineering/gravity_gen) +"xw" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "xy" = ( /obj/structure/bookcase{ name = "bookcase (Religious)" @@ -3804,10 +6165,7 @@ /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) "xB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -3817,18 +6175,26 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"xC" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +"xE" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"xG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/trash_pit) "xH" = ( /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/bcarpet, @@ -3844,6 +6210,23 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) +"xK" = ( +/obj/machinery/holopad, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"xO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "xP" = ( /obj/structure/railing/grey{ dir = 4 @@ -3854,20 +6237,57 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"xT" = ( -/turf/simulated/floor/tiled, -/area/main_map/maintenance/deck_four/aft/port) -"xX" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/turf/simulated/floor/plating, -/area/space) +"xV" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/gateway) +"xW" = ( +/obj/mecha/combat/fighter/cludge{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "ya" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"yb" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/camera/network/research{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"yc" = ( +/obj/machinery/pipedispenser, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"yd" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab/foyer) "yg" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -3886,28 +6306,34 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"yl" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ +"yi" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"yk" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"yn" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"yo" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/railing{ +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"yq" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) -"ym" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"yr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/exploration/explorer_prep) "yt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3920,6 +6346,16 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) +"yw" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/obj/machinery/disposal/wall, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "yy" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3929,6 +6365,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"yz" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) +"yB" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "yC" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -3936,12 +6399,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"yE" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"yF" = ( +/obj/structure/table/bench/padded, +/obj/landmark/spawnpoint/job/shaft_miner, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "yG" = ( /obj/structure/bookcase{ name = "bookcase (Reference)" @@ -3949,12 +6411,34 @@ /obj/item/book/manual/chef_recipes, /turf/simulated/floor/wood, /area/library) -"yH" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/railing, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/rnd/research) +"yI" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"yJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"yK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"yL" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "yM" = ( /obj/structure/filingcabinet, /obj/machinery/air_alarm{ @@ -3980,20 +6464,35 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"yV" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +"yP" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 }, -/obj/item/communicator, -/obj/item/communicator, -/obj/item/communicator, -/obj/item/communicator, -/obj/machinery/light{ +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"yQ" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass/research{ + name = "Weapons Testing Range"; + req_access = list(47) + }, +/turf/simulated/floor/tiled, +/area/rnd/research) +"yR" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/foyer) +"yT" = ( +/obj/structure/bed/chair/sofa/brown/corner{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) +"yU" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "yW" = ( /obj/machinery/mineral/unloading_machine, /obj/machinery/conveyor{ @@ -4005,15 +6504,53 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"yZ" = ( -/obj/effect/floor_decal/industrial/warning{ +"yX" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mobile_miningbase" + }, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) +"yY" = ( +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "PubPrep"; + name = "Gateway Access Shutters" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) +"za" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) "zb" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"zc" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) "ze" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -4035,17 +6572,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"zh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/turf/simulated/floor/plating, -/area/space) -"zi" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +"zg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four/forward) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"zk" = ( +/obj/machinery/camera/network/research, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "zl" = ( /obj/structure/anomaly_container, /obj/structure/window/reinforced{ @@ -4057,12 +6599,33 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/anomaly_lab) +"zm" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"zp" = ( +/obj/structure/table/rack/shelf, +/obj/machinery/air_alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/reinforced, +/area/rnd/secure_storage/lower) +"zq" = ( +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "zr" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"zs" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "zt" = ( /obj/structure/railing, /obj/structure/railing{ @@ -4080,6 +6643,25 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"zv" = ( +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"zw" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"zx" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "zy" = ( /obj/machinery/door/airlock/glass_science{ name = "Decontamination"; @@ -4093,6 +6675,25 @@ }, /turf/simulated/floor/tiled, /area/gateway) +"zz" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "tele_sci_vent"; + name = "Emergency Vent" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"zA" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "zB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -4102,22 +6703,39 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) +"zC" = ( +/obj/machinery/atmospherics/component/unary/freezer{ + dir = 1; + icon_state = "freezer_1"; + power_setting = 20; + set_temperature = 73; + use_power = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"zD" = ( +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/effect/paint/purplegray, +/turf/simulated/floor/plating, +/area/rnd/telescience_lab) "zE" = ( /obj/machinery/newscaster{ pixel_y = 30 }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"zI" = ( -/obj/machinery/door/airlock/maintenance/rnd, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, +"zF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/item/barrier_tape_segment/engineering, +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, -/area/rnd/anomaly_lab) +/area/main_map/maintenance/deck_four/forward/port) +"zG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "zL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -4125,26 +6743,30 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/bluegrid, /area/ai) -"zN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +"zM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, +/obj/machinery/camera/network/engineering, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) -"zS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) -"zU" = ( -/obj/machinery/conveyor{ - dir = 4 +/area/engineering/gravity_gen) +"zO" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/map_helper/conveyor/belt{ - id_tag = "mining_interior"; - name = "Ore processing belt" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"zP" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/tiled/techmaint, +/area/exploration/explorer_prep) +"zV" = ( +/obj/machinery/atmospherics/component/binary/pump/on, /turf/simulated/floor/plating, /area/quartermaster/miningdock) "zW" = ( @@ -4161,33 +6783,46 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Ab" = ( -/turf/simulated/wall/r_wall, -/area/main_map/maintenance/deck_four/port) -"Af" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"zZ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/door/airlock{ - name = "General Storage"; - req_access = list(47) +/obj/effect/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/secure_storage/lower) +"Ab" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_four/port) +"Ad" = ( +/obj/machinery/door/airlock/glass/engineering, +/obj/machinery/door/airlock/glass/engineering, +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) +"Ae" = ( +/mob/living/simple_mob/mechanical/corrupt_maint_drone/weak_no_poison, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Ag" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "Ah" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/forward) -"Ai" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/space) "Aj" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Ak" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Al" = ( /obj/effect/floor_decal/techfloor/orange, /obj/machinery/light, @@ -4199,6 +6834,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"Am" = ( +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase" + }, +/turf/simulated/floor/reinforced, +/area/main_map/maintenance/deck_four/aft/port) "An" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4 @@ -4217,18 +6858,39 @@ "Ao" = ( /turf/simulated/floor/tiled, /area/gateway) -"Ar" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"Ap" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/gravity_gen) +"Au" = ( +/turf/simulated/wall/prepainted, +/area/space) +"Av" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Aw" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Ay" = ( +/obj/machinery/camera/network/research{ + dir = 4; + network = list("Xenobiology") + }, +/obj/structure/bed, +/obj/item/bedsheet/blue, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"Az" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ +/obj/machinery/light/no_nightshift{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"As" = ( -/obj/structure/statue/marble/female, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "AA" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/spawner/window/borosillicate/reinforced/full/firelocks, @@ -4243,10 +6905,33 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) -"AH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"AC" = ( +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "mining_interior"; + name = "Ore processing belt" + }, +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"AD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"AF" = ( +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) +"AG" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/quartermaster/office) "AI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -4294,13 +6979,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"AR" = ( -/obj/structure/table/rack/shelf, -/obj/machinery/air_alarm{ - pixel_y = 24 - }, -/turf/simulated/floor/reinforced, +"AO" = ( +/obj/structure/girder, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) +"AP" = ( +/obj/structure/stairs/spawner/east, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) "AS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -4318,6 +7005,17 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"AT" = ( +/obj/item/binoculars, +/obj/item/folder/blue{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) "AU" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck4) @@ -4327,12 +7025,91 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) -"Bd" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"Bg" = ( -/obj/structure/reagent_dispensers/coolanttank, +"AX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/table/rack/shelf, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/exploration/alt, +/obj/item/clothing/head/helmet/space/void/exploration/alt, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"AY" = ( +/obj/structure/transit_tube/station, +/obj/structure/transit_tube_pod{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"AZ" = ( +/obj/machinery/disposal, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/research) +"Ba" = ( +/obj/structure/closet/secure_closet/pathfinder, +/obj/machinery/recharger/wallcharger{ + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"Bb" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"Bc" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio6"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Bd" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Be" = ( +/obj/structure/lattice, +/turf/space, +/area/rnd/telescience_lab/chamber) +"Bf" = ( +/obj/structure/table/standard, +/obj/item/folder/blue{ + pixel_x = 5 + }, +/obj/item/folder/red{ + pixel_y = 3 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/syringe, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"Bg" = ( +/obj/structure/reagent_dispensers/coolanttank, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -4349,12 +7126,45 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"Bi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Bj" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/aft_hallway) "Bk" = ( /obj/machinery/gateway{ dir = 10 }, /turf/simulated/floor/reinforced, /area/gateway) +"Bl" = ( +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoarch"; + req_access = list(65) + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"Bm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"Bn" = ( +/obj/machinery/door/airlock/glass/research, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "Bo" = ( /obj/machinery/camera/motion{ network = list("Research","Command") @@ -4371,9 +7181,34 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4/fore) +"Br" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Bs" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/purple{ + dir = 1 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) "Bt" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) +"Bv" = ( +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) "Bw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -4386,6 +7221,97 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4/fore) +"By" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Bz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"BB" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"BC" = ( +/obj/structure/salvageable/console_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"BD" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"BF" = ( +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"BG" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 9 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"BH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"BI" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"BJ" = ( +/obj/machinery/button/remote/blast_door{ + id = "cludge_hanger"; + pixel_y = 32 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) +"BK" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/mains_pipe/split/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"BM" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "BO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -4401,6 +7327,20 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_two) +"BS" = ( +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio4"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "BT" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai) @@ -4425,12 +7365,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) -"BX" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +"BW" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "BY" = ( /obj/machinery/door/blast/regular{ id = "mobile_miningbase" @@ -4441,6 +7382,10 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"BZ" = ( +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/carpet/bcarpet, +/area/library) "Ca" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -4457,12 +7402,38 @@ "Cb" = ( /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/forward) -"Cc" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +"Cd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/power/apc/north_mount, +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"Ce" = ( +/obj/structure/closet/secure_closet/miner, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"Cf" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "Cg" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -4491,6 +7462,9 @@ /obj/item/book/manual/robotics_cyborgs, /turf/simulated/floor/wood, /area/library) +"Cj" = ( +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) "Ck" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -4504,37 +7478,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Cp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" +"Cm" = ( +/obj/structure/table/reinforced, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"Cn" = ( +/obj/machinery/door/firedoor{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4) -"Cq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"Cs" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "smugler_airlock1"; - dir = 4; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) +"Cr" = ( +/obj/structure/railing, +/turf/simulated/open, +/area/rnd/telescience_lab) +"Ct" = ( +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "Cu" = ( /obj/structure/lattice, /obj/structure/transit_tube/high_velocity{ @@ -4554,9 +7517,6 @@ }, /turf/simulated/floor/plating, /area/space) -"Cw" = ( -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "Cx" = ( /obj/structure/closet, /obj/item/clothing/under/suit_jacket/red, @@ -4566,35 +7526,52 @@ /obj/item/pen/invisible, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"Cy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +"CA" = ( +/obj/structure/girder/reinforced, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/obj/effect/floor_decal/techfloor, -/obj/structure/cable/green{ - icon_state = "4-8" +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"CB" = ( +/obj/machinery/mineral/equipment_vendor, +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/corner/brown/border{ + dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"CC" = ( -/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"CE" = ( +/obj/structure/largecrate, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"CD" = ( -/obj/structure/sign/warning/secure_area, -/turf/simulated/wall/r_wall, -/area/gateway/prep_room) +/area/main_map/maintenance/deck_four/starboard) +"CF" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/south_mount, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four) "CG" = ( /turf/simulated/wall/rshull, /area/main_map/maintenance/deck_four/aft/port) +"CH" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/telescience_lab) +"CI" = ( +/obj/structure/stairs/spawner/west, +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) "CJ" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4611,12 +7588,50 @@ }, /turf/simulated/floor/plating, /area/space) +"CL" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"CO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 6 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"CP" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "CQ" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"CR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 5 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = -4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) "CS" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4629,6 +7644,22 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4) +"CU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/rnd, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/research) +"CV" = ( +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "CW" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -4648,6 +7679,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) +"CY" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + req_access = list(47) + }, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) "CZ" = ( /obj/structure/table/rack, /obj/item/storage/belt/archaeology, @@ -4663,19 +7700,27 @@ /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Da" = ( -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - dir = 1; - id_tag = "secure_science_stroage_airlock_control"; - name = "Secure Storage Access Controller"; - pixel_y = -25 +"Db" = ( +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 }, -/obj/effect/floor_decal/borderfloor, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/obj/item/stack/material/phoron{ + amount = 25 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "Dc" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Dd" = ( +/obj/machinery/camera/network/research{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "De" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4694,13 +7739,31 @@ }, /turf/simulated/floor/reinforced, /area/gateway) -"Dh" = ( -/obj/structure/table/bench/standard, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +"Di" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio4"; + name = "Containment Blast Doors"; + pixel_x = -24; + pixel_y = 8; + req_access = list(55) + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio4"; + name = "Containment Blast Doors"; + pixel_x = -24; + pixel_y = -8; + req_access = list(55) + }, +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) "Dj" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, @@ -4714,30 +7777,53 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Dp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/space) -"Du" = ( -/obj/machinery/camera/network/command{ - dir = 4 +"Dq" = ( +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "DRAMATIC"; + name = "Dramatic Blast Door" }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Dw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/window/brigdoor/southleft{ + req_access = list(55); + name = "Containment Pen" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/door/window/brigdoor/northright{ + name = "Containment Pen"; + req_access = list(55) }, -/obj/structure/cable/green{ - icon_state = "5-8" +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Ds" = ( +/obj/structure/table/reinforced, +/obj/item/binoculars, +/obj/item/folder/blue{ + pixel_x = -4; + pixel_y = 5 }, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"Dt" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/area/main_map/maintenance/deck_four/forward) +"Dv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"Dx" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "expshuttle_dock"; + req_one_access = list(19,43,67); + pixel_y = 32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/miningdock) "Dy" = ( /obj/machinery/door/morgue{ dir = 2; @@ -4776,26 +7862,79 @@ }, /turf/simulated/shuttle/floor/voidcraft, /area/main_map/maintenance/deck_four/aft/port) -"DH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +"DE" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/space) -"DJ" = ( -/obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/table/standard, +/obj/item/defib_kit/loaded, +/obj/item/storage/firstaid/surgery, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"DF" = ( +/obj/machinery/atmospherics/component/binary/pump/on{ dir = 8 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, -/area/gateway) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"DK" = ( +/obj/machinery/conveyor{ + dir = 1 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) +"DL" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/hallway/deck4) "DM" = ( /turf/simulated/floor/bluegrid, /area/ai_upload) +"DN" = ( +/obj/machinery/camera/network/research{ + dir = 4; + network = list("Xenobiology") + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 8; + frequency = 1445; + id = "burn_in"; + volume_rate = 700 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"DO" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/suit_cycler/medical, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "DP" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward) @@ -4804,6 +7943,14 @@ /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/maintenance/deck_four/aft/port) +"DR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"DT" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "DU" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -4814,12 +7961,33 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, /area/main_map/hallway/deck4) +"DW" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) "DX" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"DY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "DZ" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -4844,22 +8012,48 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"Ec" = ( -/turf/simulated/wall, -/area/engineering/ftl) +"Ef" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/machinery/camera/network/exploration{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Eg" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Eh" = ( /obj/machinery/light/no_nightshift{ dir = 8 }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"Em" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 +"Eo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Ep" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) "Eq" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -4870,16 +8064,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"Et" = ( -/obj/machinery/door/airlock/maintenance/rnd, +"Es" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"Eu" = ( +/obj/structure/stairs/spawner/east, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, -/area/rnd/research) +/area/main_map/maintenance/deck_four/aft/port) +"Ev" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) "Ew" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Ex" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) "Ey" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four) @@ -4889,6 +8100,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"EB" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"EC" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"EE" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "EF" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) @@ -4910,25 +8147,26 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"EI" = ( -/obj/machinery/door/airlock/maintenance/rnd, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, +"EH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" + dir = 9 }, /turf/simulated/floor/plating, -/area/gateway/prep_room) -"EJ" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +/area/quartermaster/miningdock) +"EK" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio1"; + name = "Containment Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/reinforced/airless, -/area/main_map/hallway/deck4/fore) +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "EL" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ dir = 8; @@ -4939,12 +8177,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) -"EM" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" +"EN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "EP" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4966,13 +8207,31 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) "ER" = ( /obj/machinery/artifact_analyser, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_one) +"ES" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/hand_labeler, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"EU" = ( +/obj/machinery/button/remote/blast_door{ + id = "xenobio6"; + name = "Containment Blast Doors"; + pixel_y = -28; + req_access = list(55) + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "EV" = ( /obj/machinery/air_alarm{ dir = 8; @@ -4980,27 +8239,29 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"EX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +"EW" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/area/main_map/hallway/deck4) "EY" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/anomaly_lab) -"Fd" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/plating, -/area/space) -"Fh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +"Fa" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"Fe" = ( +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"Ff" = ( +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "Fj" = ( /obj/machinery/gateway{ dir = 4 @@ -5017,10 +8278,50 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/research) +"Fn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_outer"; + req_access = list(11) + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "Fo" = ( /obj/structure/railing/grey, /turf/simulated/floor/plating, /area/ai_upload) +"Fp" = ( +/obj/machinery/computer/guestpass{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"Fq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "Fr" = ( /obj/structure/railing, /turf/simulated/floor/carpet/bcarpet, @@ -5048,27 +8349,9 @@ "Fv" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/lower) -"Fz" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"FA" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/hallway/deck4) +"Fx" = ( +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "FC" = ( /turf/simulated/floor/tiled/techfloor, /area/ai) @@ -5083,14 +8366,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/anomaly_lab/containment_one) -"FH" = ( -/obj/effect/floor_decal/spline/plain, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_access" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) "FI" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing{ @@ -5116,6 +8391,16 @@ }, /turf/simulated/floor/bluegrid, /area/ai) +"FL" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "FM" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -5132,6 +8417,15 @@ }, /turf/simulated/floor/bluegrid, /area/ai) +"FO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/vent/high_volume{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/aft/port) "FP" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/railing{ @@ -5139,29 +8433,84 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"FQ" = ( -/obj/structure/largecrate, -/turf/simulated/floor/plating, -/area/space) +"FR" = ( +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"FS" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_inner"; + req_access = list(11); + name = "Gravity Generator Access" + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"FV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 4 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) "FW" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"Gb" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mobile_miningbase_door" +"FX" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"FY" = ( +/obj/machinery/door/window/brigdoor/southright{ + name = "Containment Pen"; + req_access = list(55) }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "mobile_miningbase_door"; - pixel_x = 32 +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"FZ" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospheric_field_generator, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/maintenance/deck_four/aft/port) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"Ga" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/ladder/up, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"Gc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/engineering/aft_hallway) +"Gd" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/space) "Ge" = ( /turf/simulated/floor/carpet/bcarpet, /area/main_map/maintenance/deck_four/forward) @@ -5169,58 +8518,77 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/port) +"Gg" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "Gh" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Gj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) -"Gm" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "expshuttle_dock"; - req_one_access = list(19,43,67); - pixel_y = 32 +"Gk" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/miningdock) +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Gl" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Go" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"Gp" = ( +/obj/structure/largecrate, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/starboard) "Gs" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research) -"Gy" = ( -/obj/machinery/door/airlock/science{ - name = "Secure Storage"; - req_one_access = list(20,30) - }, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/access_button/airlock_interior{ - master_tag = "secure_science_stroage_airlock_control"; - pixel_y = 24 +"Gt" = ( +/obj/structure/ladder/up, +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"Gv" = ( +/obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Gx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"GA" = ( /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + icon_state = "2-4" }, -/turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) -"Gz" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "E-W-Pass" +/obj/effect/floor_decal/techfloor{ + dir = 9 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "GB" = ( /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -5234,32 +8602,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) -"GD" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/access_button/airlock_interior{ - master_tag = "smugler_airlock1"; - dir = 4; - pixel_x = -24 - }, -/obj/machinery/door/airlock/external, +"GC" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/space) -"GE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/area/main_map/maintenance/deck_four/forward) +"GG" = ( +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/space) -"GI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Science Outpost Maintenance"; - req_one_access = list(10,47) +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) "GJ" = ( /obj/effect/catwalk_plated/dark, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -5267,18 +8622,20 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"GK" = ( +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "GL" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"GN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +"GM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/door/airlock/maintenance/cargo, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "GO" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/photocopier/faxmachine{ @@ -5286,27 +8643,61 @@ }, /turf/simulated/floor/wood, /area/library) -"GP" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "GQ" = ( /obj/machinery/light/small, /turf/simulated/floor/wood, /area/library) -"GS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +"GR" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/simulated/floor/plating, -/area/space) +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) +"GU" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 5 + }, +/obj/item/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"GV" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "GW" = ( /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"GX" = ( -/turf/simulated/wall, -/area/rnd/outpost/maintenance) +"GZ" = ( +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Ha" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -5318,9 +8709,6 @@ /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"Hd" = ( -/turf/simulated/wall, -/area/gateway) "He" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/monotile, @@ -5349,12 +8737,32 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Hi" = ( -/turf/simulated/wall, -/area/outpost/mining_main/outpost/near_gateway) +"Hh" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoarch"; + req_access = list(65) + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"Hj" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "Hn" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/port) +"Ho" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) "Hp" = ( /obj/machinery/artifact_harvester, /obj/structure/window/reinforced{ @@ -5362,6 +8770,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/anomaly_lab) +"Hq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "Hr" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -5369,28 +8783,45 @@ /obj/structure/lattice, /turf/space, /area/space) +"Hs" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/reinforced/overhang, +/area/space) "Ht" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Hu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +"Hv" = ( +/obj/machinery/camera/network/command, +/turf/simulated/floor/greengrid, +/area/ai) +"Hw" = ( +/obj/structure/table/rack/shelf, +/obj/item/suit_cooling_unit, +/obj/item/clothing/mask/gas/half, +/obj/item/tank/oxygen, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/exploration/pathfinder, +/obj/item/clothing/head/helmet/space/void/exploration/pathfinder, +/obj/item/binoculars, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"Hy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/aft/starboard) -"Hv" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/greengrid, -/area/ai) "Hz" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, @@ -5400,6 +8831,13 @@ /obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"HB" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "HC" = ( /obj/machinery/camera/network/research{ dir = 8 @@ -5416,27 +8854,72 @@ "HE" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward/starboard) +"HF" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/starboard) +"HG" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"HH" = ( +/obj/item/frame, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"HJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "HK" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four) +"HL" = ( +/obj/effect/decal/mecha_wreckage/cludge{ + dir = 1 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "HM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward/starboard) +"HN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/mining{ + boots_stored_TYPE = /obj/item/clothing/shoes/magboots + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"HO" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) "HP" = ( /obj/machinery/door/airlock/glass, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"HQ" = ( -/obj/machinery/door/firedoor{ - dir = 1 +"HR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/machinery/door/airlock/science{ + name = "Secure Storage"; + req_one_access = list(20,30) }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "HS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -5444,59 +8927,103 @@ /obj/machinery/atmospherics/pipe/vent/high_volume, /turf/simulated/floor/tiled/techfloor/grid, /area/main_map/maintenance/deck_four/aft/port) -"HT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +"HV" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/starboard) +"HX" = ( +/obj/machinery/power/apc/north_mount, +/obj/map_helper/network_builder/power_cable/green/auto, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Science Outpost Maintenance"; - req_one_access = list(10,47) + icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"HU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/area/main_map/maintenance/deck_four/port) +"HY" = ( +/obj/structure/largecrate/animal/spiders, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/starboard) "HZ" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Ib" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/main_map/hallway/deck4/fore) +"Ia" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Ic" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/forward/starboard) -"Id" = ( -/obj/structure/closet/firecloset/full/double, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"Ig" = ( -/obj/machinery/door/firedoor/glass{ - dir = 4 +"If" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/storage) +"Ih" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/split/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"Ii" = ( +/obj/machinery/camera/network/research{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"Ij" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "Ik" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/critical/west_bump, +/obj/machinery/power/apc/critical/west_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/ai) +"In" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/apc/high/east_mount, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Io" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) "Ip" = ( /turf/simulated/wall/prepainted/civilian, /area/main_map/maintenance/deck_four/forward) +"Iq" = ( +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"Ir" = ( +/turf/simulated/wall/r_wall, +/area/main_map/maintenance/deck_four/aft) "Is" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -5507,6 +9034,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) +"It" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/airlock_sensor{ + pixel_y = 28; + pixel_x = -28 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"Iu" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) "Iv" = ( /obj/structure/closet/excavation, /obj/effect/floor_decal/industrial/warning/full, @@ -5515,15 +9058,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Iy" = ( -/turf/simulated/floor/tiled, -/area/engineering/ftl) -"Iz" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"Iw" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research) "IB" = ( /obj/item/storage/secure/safe{ pixel_x = 36 @@ -5533,31 +9072,112 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"IE" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +"IC" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"ID" = ( +/obj/structure/cable/green{ + icon_state = "0-8" }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/engineering/aft_hallway) "IF" = ( /turf/simulated/wall/r_wall, /area/main_map/maintenance/deck_four/forward/starboard) -"IJ" = ( -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"IK" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 1 +"IG" = ( +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 1; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + icon_state = "map_vent_in"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0; + use_power = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/button/remote/blast_door{ - id = "gateway_windows"; - name = "Gateway Window Control"; - pixel_x = 8; - pixel_y = 32 +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 4 + }, +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/obj{ + name = "---Merge conflict marker---" + }, +/obj/machinery/conveyor{ + dir = 4; + id = "xenobiocoldroom" + }, +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 1; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + icon_state = "map_vent_in"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0; + on = 1 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology"); + dir = 1 + }, +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" + }, +/area/rnd/xenobiology) +"IJ" = ( +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"IK" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/button/remote/blast_door{ + id = "gateway_windows"; + name = "Gateway Window Control"; + pixel_x = 8; + pixel_y = 32 }, /turf/simulated/floor/tiled/monotile, /area/gateway) +"IM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"IO" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"IP" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(5,19,43,44,67); + dir = 8; + name = "Exploration Equipment Room" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/exploration/explorer_prep) "IQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -5572,6 +9192,29 @@ /obj/structure/salvageable/console_broken_os, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"IS" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"IT" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"IU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "IV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -5581,6 +9224,35 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"IW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"IX" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "xenobio7"; + name = "Containment Blast Doors"; + pixel_x = 24; + pixel_y = 24; + req_access = list(55) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) +"IY" = ( +/obj/machinery/computer/telescience, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "IZ" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/techfloor, @@ -5614,9 +9286,19 @@ "Jf" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/forward/port) -"Ji" = ( -/turf/simulated/floor/reinforced/airless, -/area/space) +"Jg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Jj" = ( +/obj/structure/salvageable/data_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "Jl" = ( /obj/machinery/artifact_scanpad, /obj/machinery/light/no_nightshift{ @@ -5624,6 +9306,16 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/anomaly_lab/containment_two) +"Jm" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/structure/table/reinforced, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Jn" = ( /obj/machinery/power/terminal{ dir = 8 @@ -5634,6 +9326,9 @@ /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/techfloor, /area/ai) +"Jo" = ( +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Jq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -5641,22 +9336,40 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"Jt" = ( -/obj/effect/floor_decal/techfloor/orange, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"Jr" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) +"Js" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Ju" = ( +/obj/item/frame/noticeboard{ + dir = 1; + pixel_y = -32 + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/starboard) +"Jw" = ( +/obj/effect/floor_decal/techfloor/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/monotile, -/area/gateway) -"Jv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/rnd/research) +"Jx" = ( +/obj/machinery/light/spot/no_nightshift, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "Jy" = ( /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/aft/port) @@ -5668,6 +9381,47 @@ }, /turf/simulated/floor/wood, /area/library) +"JA" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) +"JB" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"JD" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"JE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"JF" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_outer"; + req_access = list(11) + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "JH" = ( /obj/structure/table/reinforced, /obj/machinery/recharger/wallcharger{ @@ -5682,28 +9436,36 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"JK" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/miningdock) -"JM" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"JI" = ( +/obj/item/slime_extract/grey, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"JJ" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "mobile_miningbase_door" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospheric_field_generator, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"JL" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"JN" = ( +/obj/structure/ore_box, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"JO" = ( +/obj/structure/bed/chair/sofa/brown/right{ + dir = 1 }, -/obj/machinery/power/apc/direction_bump/south, /turf/simulated/floor/tiled/monotile, -/area/gateway) +/area/main_map/hallway/deck4/fore) "JQ" = ( /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/borderfloor{ @@ -5719,26 +9481,51 @@ /obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) +"JS" = ( +/obj/structure/statue/marble/male, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"JT" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"JU" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"JV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) +"JW" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"JY" = ( +/obj/machinery/door/window/brigdoor/northright{ + name = "Containment Pen"; + req_access = list(55) + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio7"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "JZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) -"Kb" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "Kc" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing/grey{ @@ -5746,18 +9533,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"Ke" = ( -/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 = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) "Kf" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled, @@ -5772,17 +9547,49 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/starboard) -"Ki" = ( -/obj/machinery/door/airlock/maintenance/rnd, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) +"Kj" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/exploration/explorer_prep) "Kk" = ( /obj/spawner/window/full/firelocks, /turf/simulated/floor/plating, /area/gateway) -"Kl" = ( -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/port) +"Km" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ko" = ( +/obj/structure/table/steel, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 12 + }, +/obj/item/multitool{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/stack/cable_coil, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"Kp" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/conveyor{ + dir = 1 + }, +/turf/simulated/wall/r_wall, +/area/rnd/xenobiology) +"Kq" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-8" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "Kr" = ( /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" @@ -5796,6 +9603,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) +"Kt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Ku" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -5811,28 +9630,86 @@ }, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) +"Kw" = ( +/obj/structure/window/reinforced, +/obj/structure/table/glass, +/obj/item/glass_jar, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Kx" = ( +/turf/simulated/wall/prepainted/exploration, +/area/exploration/explorer_prep) +"Ky" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/exploration/explorer_prep) +"Kz" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "KA" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research/testingrange) +"KB" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/starboard) +"KC" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"KD" = ( +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 1; + pressure_resistance = 4559.63; + target_pressure = 4559.63 + }, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "KE" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "E-W-Pass" }, /turf/space, /area/space) -"KL" = ( -/obj/effect/floor_decal/industrial/warning{ +"KG" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/structure/window/reinforced/tinted/frosted{ dir = 4 }, -/obj/machinery/camera/network/research_outpost{ +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 8 + }, +/obj/structure/curtain/open/shower/engineering, +/obj/machinery/airlock_sensor{ dir = 1; - network = list("Research Outpost","Command") + id_tag = "gravity_csensor"; + master_tag = "gravity_airlock"; + pixel_y = -28; + req_access = list(11) }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) -"KP" = ( +/turf/simulated/floor/tiled/white, +/area/engineering/gravity_gen) +"KH" = ( +/obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/engineering/shunt) +/area/tether/exploration/pathfinder_office) +"KN" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab/storage) "KQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5842,34 +9719,35 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"KS" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"KT" = ( -/obj/spawner/window/borosillicate/reinforced/full, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "gateway_windows" - }, -/turf/simulated/floor, -/area/gateway) +"KR" = ( +/turf/simulated/floor/wood, +/area/rnd/xenobiology) "KU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"KX" = ( +"KV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled, -/area/engineering/shunt) +/area/main_map/hallway/deck4) +"KW" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -22 + }, +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = -4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) "KY" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 @@ -5897,39 +9775,70 @@ }, /turf/simulated/floor/tiled/monotile, /area/gateway) -"Lf" = ( +"Ld" = ( +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/starboard) +"Le" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"Lg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Lh" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/cyborg, +/turf/simulated/floor/bluegrid, +/area/ai_upload) +"Li" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "Lj" = ( /obj/landmark/spawnpoint/job/librarian, /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/carpet/bcarpet, /area/library/study) -"Lk" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "mobile_miningbase_door" +"Ln" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "deck_4_maint1"; + pixel_x = 24 }, -/obj/machinery/atmospheric_field_generator, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/maintenance/deck_four/aft/port) -"Ll" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/sign/deck4{ + pixel_y = 28 }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"Lo" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research) +"Lp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Lq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -5942,15 +9851,9 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) -"Lr" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) +"Lt" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/rnd/research) "Lu" = ( /obj/structure/filingcabinet{ desc = "A large cabinet with drawers. They seem to be ominously empty."; @@ -5962,21 +9865,55 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"Lv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) +"Lw" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"Lx" = ( +/obj/structure/lattice, +/obj/structure/transit_tube/high_velocity{ + icon_state = "N-S-Pass" + }, +/turf/simulated/wall/r_wall, +/area/space) +"Ly" = ( +/turf/simulated/wall/r_lead, +/area/engineering/gravity_gen) +"Lz" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) "LA" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/meter, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"LE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/floor_decal/techfloor{ +"LB" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/main_map/maintenance/deck_four/forward/port) +"LD" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "LF" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 5 @@ -6001,6 +9938,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward) +"LI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four/forward/starboard) "LJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6012,6 +9955,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) +"LK" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4/fore) +"LL" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/hallway/deck4) "LM" = ( /obj/structure/table/rack, /obj/item/storage/belt/archaeology, @@ -6031,6 +9983,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"LN" = ( +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "LO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -6051,6 +10006,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"LQ" = ( +/obj/structure/table/fancyblack, +/turf/simulated/floor/wood, +/area/library) +"LR" = ( +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "LS" = ( /obj/structure/ladder/up, /turf/simulated/floor/plating, @@ -6059,24 +10022,49 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"LU" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) +"LV" = ( +/obj/machinery/door/firedoor/glass{ + dir = 1 + }, +/obj/machinery/door/airlock/glass/exploration{ + name = "Medic Prep"; + req_one_access = list(44,19,5) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "LW" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) -"LX" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 +"Ma" = ( +/obj/machinery/light/small{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four) +"Mb" = ( +/obj/machinery/button/remote/blast_door{ + id = "xenobio3"; + name = "Containment Blast Doors"; + pixel_y = -28; + req_access = list(55) }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/xenobiology) "Mc" = ( /obj/machinery/artifact_scanpad, /obj/structure/window/reinforced{ @@ -6084,6 +10072,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/anomaly_lab) +"Md" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward/starboard) "Me" = ( /obj/structure/railing{ dir = 1 @@ -6091,19 +10083,35 @@ /obj/structure/railing, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/starboard) -"Mf" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/atmospheric_field_generator, -/obj/machinery/door/blast/regular{ - id = "mobile_miningbase_shuttle_door" +"Mg" = ( +/obj/machinery/processor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ml" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - id = "mobile_miningbase_shuttle_door"; - pixel_y = 32 +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"Mm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/secure_storage/lower) +"Mn" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/landmark/spawnpoint/job/explorer, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Mp" = ( /turf/simulated/floor/carpet/bcarpet, /area/library/study) @@ -6111,14 +10119,30 @@ /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, /area/main_map/hallway/deck4/fore) -"Mu" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +"Mr" = ( +/mob/living/simple_mob/animal/sif/fluffy/silky, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"Mt" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"Mu" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) "Mv" = ( /turf/simulated/wall/r_wall/prepainted/engineering, @@ -6162,38 +10186,32 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"MF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/space) +"MD" = ( +/turf/simulated/floor/reinforced/outdoors, +/area/engineering/aft_hallway) +"ME" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/aft/port) +"MG" = ( +/obj/structure/table/reinforced, +/obj/item/roller, +/obj/item/roller, +/obj/machinery/camera/network/research_outpost, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "MJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"MK" = ( -/obj/structure/table/rack/shelf, -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/starboard) -"MM" = ( -/obj/machinery/door/airlock/maintenance/int{ - req_access = list(27); - name = "Chapel Access" - }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) -"MN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"ML" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "MO" = ( /obj/machinery/air_alarm{ dir = 8; @@ -6201,6 +10219,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) +"MP" = ( +/obj/machinery/suit_cycler/exploration, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "MR" = ( /obj/machinery/light/fairy{ dir = 4 @@ -6208,47 +10241,51 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) -"MS" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"MT" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) "MU" = ( /obj/machinery/porta_turret/ai_defense, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"MV" = ( -/turf/simulated/floor/carpet/bcarpet, -/area/main_map/maintenance/deck_four) -"MX" = ( -/obj/structure/girder, -/obj/item/barrier_tape_segment/engineering, +"MW" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"MZ" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"Nb" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, /turf/simulated/floor/plating, /area/space) +"Nc" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) +"Nd" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "Ne" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) -"Nf" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/plating, -/area/space) "Ng" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -6256,6 +10293,21 @@ }, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) +"Nh" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Nj" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"Nk" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "Nl" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -6263,6 +10315,22 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Nm" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Nn" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "No" = ( /obj/structure/table/standard, /obj/item/anobattery{ @@ -6289,25 +10357,33 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Np" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +"Nq" = ( +/obj/machinery/conveyor{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"Nr" = ( -/obj/structure/table/reinforced, -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") +/obj/map_helper/conveyor/belt{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "Ns" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Nt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Nv" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -6315,6 +10391,20 @@ "Nw" = ( /turf/simulated/wall/r_wall, /area/gateway) +"Nx" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/blast/regular{ + id = "UpperInnerTeleSciBlastDoor"; + name = "Upper Exterior Telesci Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab) +"Ny" = ( +/obj/structure/ladder_assembly, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "Nz" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 @@ -6327,12 +10417,6 @@ /obj/structure/railing, /turf/simulated/floor/carpet/bcarpet, /area/library) -"NB" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/forward) "NC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6348,6 +10432,33 @@ }, /turf/simulated/floor/plating, /area/ai_upload) +"NE" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + dir = 1; + name = "Research - Exploration Wing" + }, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"NH" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/maintenance/deck_four/forward/starboard) +"NI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "NJ" = ( /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/shutters{ @@ -6361,15 +10472,10 @@ /obj/item/book/codex/lore/news, /turf/simulated/floor/wood, /area/library) -"NN" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +"NM" = ( +/obj/machinery/door/airlock/glass/engineering, +/turf/simulated/floor/tiled/steel_ridged, +/area/engineering/aft_hallway) "NP" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -6395,6 +10501,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"NS" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint/violet, +/turf/simulated/floor/plating, +/area/exploration/explorer_prep) +"NT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) +"NU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "NV" = ( /obj/structure/railing, /obj/structure/railing{ @@ -6403,10 +10524,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/maintenance/trash_pit) -"NW" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/forward) "NX" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "E-W-Pass" @@ -6420,14 +10537,46 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"NY" = ( -/obj/effect/floor_decal/borderfloor/corner, +"NZ" = ( +/turf/space, +/area/rnd/telescience_lab/chamber) +"Oa" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Ob" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, /turf/simulated/floor/tiled, -/area/rnd/secure_storage/critical) +/area/main_map/hallway/deck4) "Oc" = ( /obj/machinery/atmospherics/pipe/vent, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Od" = ( +/obj/machinery/light/small, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) +"Oe" = ( +/obj/structure/medical_stand/anesthetic, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/exploration/explorer_prep) "Of" = ( /obj/machinery/mineral/processing_unit, /obj/machinery/conveyor{ @@ -6443,43 +10592,61 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) -"Ok" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, +"Oj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "2-9" + dir = 4 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/quartermaster/office) "Ol" = ( /obj/machinery/door/airlock/maintenance/cargo, /obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/port) +"Om" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/obj/effect/floor_decal/techfloor/corner, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"On" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"Op" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/westright{ + req_access = list(11) + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Oq" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "Or" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four/forward/starboard) -"Ou" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-6" - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) "Ow" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -6507,36 +10674,49 @@ /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"OA" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) -"OC" = ( -/turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck4) -"OD" = ( +"Oz" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 4 }, -/obj/effect/floor_decal/techfloor, -/obj/structure/cable/green{ - icon_state = "4-8" +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"OC" = ( +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"OE" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) "OF" = ( /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"OG" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"OH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"OI" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "OJ" = ( /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 @@ -6566,6 +10746,11 @@ /obj/item/book/manual/fission_engine, /turf/simulated/floor/wood, /area/library) +"OM" = ( +/obj/structure/girder, +/obj/item/barrier_tape_segment/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "ON" = ( /obj/machinery/door/morgue{ dir = 2; @@ -6574,6 +10759,15 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"OO" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "OP" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, @@ -6581,12 +10775,31 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"OS" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-8" +"OQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"OR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"OT" = ( +/obj/machinery/mech_recharger, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) "OU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -6612,19 +10825,55 @@ }, /turf/simulated/floor/wood, /area/library) +"OY" = ( +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) "Pa" = ( /turf/simulated/wall/prepainted/engineering, /area/maintenance/trash_pit) -"Pb" = ( -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +"Pc" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "xenobio3"; + name = "Containment Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/tiled/techfloor, -/area/space) +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Pd" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"Pe" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Pf" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rnd/research) +"Pg" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) "Ph" = ( /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) +"Pi" = ( +/obj/structure/ore_box, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/port) "Pj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6635,16 +10884,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Po" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/obj/structure/cable/green{ - icon_state = "2-4" +"Pk" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) +"Pl" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) +"Pm" = ( +/obj/machinery/mining/drill{ + drill_id = 2 }, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) +/area/main_map/maintenance/deck_four/aft/port) "Pq" = ( /obj/machinery/camera/network/command{ dir = 9 @@ -6652,15 +10907,15 @@ /obj/structure/lattice, /turf/space, /area/space) -"Ps" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"Pt" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, +"Pr" = ( +/turf/simulated/floor/tiled/steel_ridged, +/area/quartermaster/miningdock) +"Pu" = ( +/obj/structure/bed/chair{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/aft/starboard) "Pv" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -6674,14 +10929,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/monotile, /area/gateway) -"Pw" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/port) -"Py" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck4) "Pz" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -6695,18 +10942,16 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"PD" = ( -/obj/effect/floor_decal/techfloor{ +"PB" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"PC" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"PE" = ( -/obj/machinery/suit_cycler/mining{ - req_access = null - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) "PF" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/pointybush, @@ -6716,18 +10961,21 @@ /obj/machinery/ai_slipper, /turf/simulated/floor/tiled/techfloor, /area/ai) -"PI" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 1 +"PK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/space) -"PJ" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "E-W-Pass" +/obj/machinery/light/no_nightshift{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/main_map/hallway/deck4) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "PL" = ( /obj/structure/railing/grey{ dir = 8 @@ -6740,6 +10988,13 @@ }, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) +"PM" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) "PN" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6751,10 +11006,56 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/wood, /area/main_map/maintenance/deck_four/forward) +"PP" = ( +/obj/structure/largecrate, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"PQ" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"PR" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "PS" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"PU" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"PV" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four) +"PW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"PX" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "PY" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -6773,10 +11074,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Qb" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "Qc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6822,59 +11119,201 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"Qg" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "Qi" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/shuttle/wall/voidcraft, /area/main_map/maintenance/deck_four/aft/port) -"Qo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) -"Qr" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/main_map/maintenance/deck_four/aft/port) -"QB" = ( -/obj/structure/flora/ausbushes/pointybush, -/turf/simulated/floor/outdoors/grass/heavy/interior, -/area/main_map/maintenance/deck_four/starboard) -"QF" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber{ +"Qk" = ( +/obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/rnd/anomaly_lab/containment_one) -"QH" = ( -/obj/machinery/libraryscanner, -/turf/simulated/floor/wood, -/area/library) -"QI" = ( -/obj/machinery/porta_turret/ai_defense, -/turf/simulated/floor/tiled/techfloor, -/area/ai) -"QJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + dir = 4; + id_tag = "secure_science_stroage_airlock_control"; + name = "Secure Storage Access Controller"; + pixel_x = -25 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/port) -"QL" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) -"QM" = ( -/obj/structure/cable/green{ +/area/rnd/secure_storage/critical) +"Ql" = ( +/obj/item/frame/apc, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Qm" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Qn" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/obj/effect/floor_decal/techfloor/corner, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Qp" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Qr" = ( +/turf/simulated/shuttle/wall/voidcraft, +/area/main_map/maintenance/deck_four/aft/port) +"Qs" = ( +/obj/machinery/suit_cycler{ + req_access = null + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) +"Qt" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab) +"Qu" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"Qx" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase_door" + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "mobile_miningbase_door"; + pixel_x = 32 + }, +/obj/machinery/atmospheric_field_generator, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"Qz" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/landmark/spawnpoint/job/pathfinder, +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"QA" = ( +/obj/structure/lattice, +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/main_map/hallway/deck4) +"QB" = ( +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/main_map/maintenance/deck_four/starboard) +"QC" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/lattice, +/turf/space, +/area/rnd/telescience_lab/chamber) +"QD" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"QE" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"QF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab/containment_one) +"QG" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"QH" = ( +/obj/machinery/libraryscanner, +/turf/simulated/floor/wood, +/area/library) +"QI" = ( +/obj/machinery/porta_turret/ai_defense, +/turf/simulated/floor/tiled/techfloor, +/area/ai) +"QJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) +"QL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"QM" = ( +/obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, @@ -6885,6 +11324,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) +"QO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"QP" = ( +/obj/structure/salvageable/machine_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "QQ" = ( /obj/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -6892,6 +11344,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) +"QS" = ( +/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/exploration/explorer_prep) "QU" = ( /obj/spawner/window/reinforced/tinted/full, /turf/simulated/floor/plating, @@ -6920,6 +11377,28 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library) +"QY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"Ra" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/quartermaster/miningdock) +"Rb" = ( +/obj/machinery/suit_cycler/mining, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Rc" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four) @@ -6930,43 +11409,56 @@ /obj/machinery/atmospherics/pipe/vent, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Rf" = ( +/obj/mecha/combat/fighter/cludge{ + dir = 4; + name = "\improper Titan Class Fighter" + }, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "Rh" = ( /turf/simulated/floor/tiled/monotile, /area/quartermaster/miningdock) -"Ri" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/multi_tile/metal{ - name = "Gateway Prep Room" +"Rk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "PubPrepFront"; - layer = 3.3; - name = "Gateway Prep Shutter" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) -"Rj" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) +/area/rnd/secure_storage/critical) "Rm" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" }, /turf/simulated/floor/plating, /area/main_map/hallway/deck4/fore) -"Rs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +"Ro" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/camera/network/engineering{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Rp" = ( +/obj/structure/stasis_cage, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Rq" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Rr" = ( +/turf/simulated/wall/prepainted/exploration, +/area/space) "Rt" = ( /obj/machinery/button/crematorium{ id = "crematorium"; @@ -6977,6 +11469,28 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/maintenance/deck_four/forward) +"Ru" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"Rv" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"Rx" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "E-W-Pass" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) +"Ry" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/starboard) "RA" = ( /obj/machinery/air_alarm{ dir = 4; @@ -6984,10 +11498,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) -"RB" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, -/area/main_map/maintenance/deck_four/aft/port) +"RC" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"RD" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four/forward/starboard) +"RF" = ( +/obj/structure/cable{ + icon_state = "16-0" + }, +/obj/structure/cable/heavyduty{ + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "RH" = ( /obj/item/storage/secure/safe{ pixel_x = 36 @@ -6997,20 +11526,23 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"RI" = ( -/obj/structure/closet/crate{ - rigged = 1; - desc = "A rectangular steel crate with all identifying marks seemingly grinded off. Looks sketchy at best"; - name = "sketchy crate" - }, -/obj/item/radio/electropack, -/turf/simulated/floor/plating, -/area/space) "RJ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/main_map/hallway/deck4/fore) +"RK" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"RL" = ( +/obj/structure/frame{ + anchored = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "RM" = ( /obj/structure/grille, /obj/machinery/door/firedoor/border_only, @@ -7019,6 +11551,12 @@ }, /turf/simulated/floor/plating, /area/library/study) +"RN" = ( +/obj/machinery/camera/network/command{ + dir = 4 + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) "RO" = ( /obj/machinery/porta_turret/stationary, /turf/simulated/floor/tiled/techfloor/grid, @@ -7028,6 +11566,22 @@ can_open = 1 }, /area/main_map/maintenance/deck_four/forward) +"RQ" = ( +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"RR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "gravity_pump" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "RS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7042,27 +11596,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"RT" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" - }, -/turf/space, -/area/space) -"RV" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/maintenance/deck_four/aft/port) -"RZ" = ( -/obj/structure/transit_tube/station{ - dir = 4 - }, -/obj/structure/transit_tube_pod{ - dir = 1 +"RX" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"RY" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"Sa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, -/area/main_map/hallway/deck4) +/area/rnd/xenobiology) "Sb" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -7079,47 +11630,44 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Sd" = ( -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"Sf" = ( -/obj/structure/girder, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/engineering/ftl) -"Si" = ( -/obj/machinery/door/airlock/maintenance/int{ - req_access = list(27); - name = "Chapel Access" +"Se" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"Sg" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/forward) -"Sj" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/forward) +"Sh" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospheric_field_generator, +/obj/machinery/door/blast/regular{ + id = "mobile_miningbase_shuttle_door"; + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/trash_pit) -"Sk" = ( -/turf/simulated/wall, -/area/rnd/outpost/underground) +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/port) +"Sl" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/quartermaster/miningdock) +"Sn" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/reinforced/outdoors, +/area/quartermaster/miningdock) "So" = ( /obj/item/barrier_tape_segment/engineering, /turf/simulated/floor/tiled, @@ -7130,6 +11678,15 @@ "Sq" = ( /turf/simulated/wall, /area/main_map/maintenance/deck_four/aft/port) +"Sr" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_windows" + }, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/gateway) "Ss" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7147,24 +11704,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) -"Sv" = ( -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "PubPrep"; - layer = 3.3; - name = "Gateway Access Shutters" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +"Su" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/gateway) +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) "Sx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -7188,10 +11733,45 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/anomaly_lab) +"SA" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/obj/structure/closet/bombcloset, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"SB" = ( +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/forward) "SC" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/quartermaster/miningdock) +"SD" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"SE" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) +"SF" = ( +/obj/effect/decal/mecha_wreckage/shuttlecraft, +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/starboard) +"SG" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) "SH" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, @@ -7220,38 +11800,29 @@ /obj/item/storage/bag/trash, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"SL" = ( -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ +"SO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/starboard) -"SM" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"SN" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-2" - }, -/obj/machinery/power/pointdefense{ - id_tag = "forward_pd" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"SP" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) "SQ" = ( /obj/spawner/window/reinforced/tinted/full, /turf/simulated/floor/tiled/dark, /area/main_map/maintenance/deck_four/forward) +"SR" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/port) "SS" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -7277,6 +11848,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"SV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) "SW" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -7288,12 +11865,30 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"Ta" = ( -/obj/machinery/light/no_nightshift{ +"SY" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + dir = 1; + name = "Research - Deck 4 Wing" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/rnd/research) +"SZ" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, /turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/xenobiology) +"Tb" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "Tc" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -7308,6 +11903,24 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/library/study) +"Tf" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Tg" = ( +/obj/structure/table/standard, +/obj/item/gun/energy/taser/xeno, +/obj/item/multitool, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/melee/baton/slime/loaded, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "Th" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/portables_connector{ @@ -7315,6 +11928,31 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) +"Tk" = ( +/obj/structure/table/standard, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/pen/red{ + pixel_x = -1; + pixel_y = 3 + }, +/obj/item/pen/blue{ + pixel_x = -5; + pixel_y = -1 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"Tl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "Tm" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -7322,15 +11960,47 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Tq" = ( +"Tn" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"To" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"Tp" = ( +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/chamber) +"Tr" = ( +/turf/simulated/wall/r_wall{ + can_open = 1 + }, +/area/main_map/maintenance/deck_four/aft) +"Tu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/landmark{ + name = "lightsout" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/wood, -/area/main_map/maintenance/deck_four) -"Ts" = ( -/turf/simulated/floor/reinforced/airless, -/area/main_map/hallway/deck4/fore) -"Tt" = ( -/turf/simulated/wall, -/area/engineering/shunt) +/area/tether/exploration/pathfinder_office) +"Tv" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "Tw" = ( /obj/machinery/mineral/processing_unit, /obj/machinery/conveyor{ @@ -7353,34 +12023,77 @@ }, /turf/simulated/floor/plating, /area/quartermaster/miningdock) -"Ty" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"Tz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) -"TF" = ( -/obj/machinery/camera/network/research{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) -"TG" = ( -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) -"TJ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"TA" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/bluegrid, -/area/ai_upload) -"TL" = ( +/turf/simulated/floor/tiled/white, +/area/rnd/xenobiology) +"TB" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/manifold4w/hidden, +/turf/simulated/floor/tiled/monotile, +/area/exploration/explorer_prep) +"TD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/explorer, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"TE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/anomaly_lab) -"TM" = ( +/area/rnd/xenobiology) +"TH" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) +"TI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) +"TJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/bluegrid, +/area/ai_upload) +"TK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/main_map/maintenance/deck_four/aft/starboard) +"TL" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/anomaly_lab) +"TM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -7428,6 +12141,12 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +"TR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "TS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -7437,13 +12156,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"TT" = ( -/obj/structure/bed/chair/comfy/brown, -/turf/simulated/floor/carpet/bcarpet, -/area/main_map/maintenance/deck_four) -"TU" = ( -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/space) "TV" = ( /obj/structure/lattice, /obj/structure/transit_tube/high_velocity{ @@ -7460,19 +12172,72 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) +"TX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"TY" = ( +/turf/simulated/floor/reinforced/overhang, +/area/space) +"Ua" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Ub" = ( +/obj/machinery/conveyor_switch, +/obj/map_helper/conveyor/lever{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"Uc" = ( +/obj/structure/salvageable/console_broken_os, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) +"Ud" = ( +/obj/machinery/door/blast/regular{ + id = "OuterTeleSciBlastDoor"; + name = "Lower Exterior TeleSci Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/rnd/telescience_lab/foyer) +"Ue" = ( +/obj/effect/floor_decal/spline/plain, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "gateway_access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/gateway) "Uf" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) -"Ug" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/space) "Uh" = ( /obj/structure/lattice, /obj/structure/transit_tube/high_velocity{ @@ -7480,6 +12245,33 @@ }, /turf/space, /area/space) +"Uj" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"Uk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"Um" = ( +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/rnd/telescience_lab) "Un" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -7494,25 +12286,45 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai) -"Us" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/atmospheric_field_generator, -/obj/machinery/door/blast/regular{ - id = "mobile_miningbase_shuttle_door" +"Ut" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"Uw" = ( +/turf/simulated/floor/bluegrid{ + initial_gas_mix = "n2=500;TEMP=73"; + name = "Cold Room Base" }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/xenobiology) +"Ux" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"Uy" = ( +/obj/machinery/light/spot/no_nightshift, +/obj/structure/ore_box, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"Uz" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/library) +"UA" = ( +/obj/structure/bed/chair/sofa/brown/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) +"UB" = ( +/turf/simulated/floor/reinforced/overhang, +/area/main_map/maintenance/deck_four/forward/port) "UD" = ( /turf/simulated/wall/r_wall, /area/main_map/hallway/deck4/fore) -"UE" = ( -/obj/machinery/camera/network/research_outpost{ - dir = 4; - network = list("Research Outpost","Command") - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/outpost/underground) "UF" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4 @@ -7520,14 +12332,16 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"UG" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/outpost/near_gateway) -"UH" = ( -/obj/machinery/floodlight, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +"UI" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) "UJ" = ( /obj/machinery/door/airlock/maintenance/command, /obj/item/barrier_tape_segment/engineering, @@ -7536,25 +12350,28 @@ "UK" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload) -"UN" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "E-W-Pass" - }, -/obj/structure/railing{ - dir = 4 +"UL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/railing{ +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/main_map/hallway/deck4) -"UQ" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "N-S-Pass" +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + req_one_access = list(47); + name = "Science" }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"UP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) "US" = ( /obj/machinery/conveyor{ dir = 4 @@ -7565,13 +12382,14 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"UV" = ( -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering, -/turf/simulated/floor/tiled/steel_ridged, -/area/main_map/hallway/deck4/fore) +"UT" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) +"UU" = ( +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/secure_storage/lower) "UW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -7590,14 +12408,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"Vb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"Vc" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical/records) "Vd" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "E-W-Pass" @@ -7605,17 +12415,32 @@ /obj/structure/lattice, /turf/space, /area/space) +"Ve" = ( +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/library) "Vf" = ( /obj/machinery/camera/network/civilian{ dir = 1 }, /turf/simulated/floor/carpet/bcarpet, /area/library) -"Vg" = ( -/obj/structure/girder, -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/engineering/shunt) +"Vh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/motion{ + network = list("Research","Command") + }, +/turf/simulated/floor/tiled, +/area/rnd/secure_storage/critical) "Vj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -7625,21 +12450,29 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"Vl" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +"Vk" = ( +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/techfloor, -/area/rnd/research) +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "Vm" = ( /turf/simulated/floor/tiled/techmaint, /area/maintenance/trash_pit) -"Vp" = ( -/turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) +"Vn" = ( +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/port) +"Vo" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/foyer) +"Vq" = ( +/turf/simulated/wall, +/area/rnd/xenobiology) "Vr" = ( /obj/structure/bookcase{ name = "bookcase (Reference)" @@ -7648,6 +12481,13 @@ /obj/item/book/custom_library/reference, /turf/simulated/floor/wood, /area/library) +"Vs" = ( +/obj/structure/table/woodentable, +/obj/item/flashlight/lamp{ + pixel_y = 12 + }, +/turf/simulated/floor/wood, +/area/library) "Vt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/no_nightshift{ @@ -7658,6 +12498,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) +"Vu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Vv" = ( +/obj/machinery/door/firedoor{ + dir = 4 + }, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/hallway/deck4/fore) "Vy" = ( /obj/structure/disposaloutlet{ dir = 1 @@ -7672,6 +12528,55 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/trash_pit) +"Vz" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 1; + frequency = 1445; + id = "burn_in"; + volume_rate = 700 + }, +/obj/machinery/camera/network/research{ + network = list("Xenobiology") + }, +/turf/simulated/floor/wood, +/area/rnd/xenobiology) +"VA" = ( +/obj/machinery/hyperpad/centre{ + map_pad_id = "lavaland_station"; + map_pad_link_id = "lavaland_away"; + newcolor = "#fcba03" + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/miningdock) +"VB" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"VC" = ( +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/telescience_lab) +"VE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"VF" = ( +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/plating, +/area/rnd/research/testingrange) +"VG" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/pump_out_external, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint/airless, +/area/main_map/maintenance/deck_four/aft/port) "VH" = ( /obj/structure/cable/green{ icon_state = "16-0" @@ -7681,6 +12586,21 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"VK" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"VL" = ( +/obj/machinery/conveyor_switch/oneway, +/obj/map_helper/conveyor/lever{ + id_tag = "xenobio_cooler"; + name = "Cooler Belt" + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) "VM" = ( /obj/machinery/door/airlock/glass/mining{ name = "Mining Operations"; @@ -7693,21 +12613,40 @@ /obj/structure/filingcabinet, /turf/simulated/floor/reinforced, /area/rnd/secure_storage/lower) -"VT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"VO" = ( +/obj/machinery/camera/network/research{ + dir = 4; + network = list("Xenobiology") }, -/turf/simulated/floor/bluegrid, -/area/ai_upload) -"VU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"VP" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"VX" = ( -/turf/simulated/wall/r_wall, -/area/rnd/secure_storage/critical) +/obj/machinery/door/blast/regular{ + id = "UpperOuterTeleSciBlastDoor"; + name = "Upper Interior Telesci Blast Door" + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) +"VR" = ( +/obj/structure/transit_tube/high_velocity{ + icon_state = "auto" + }, +/obj/spawner/window/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"VS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/job/field_medic, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) "VY" = ( /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -7743,23 +12682,17 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"Wc" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +"Wd" = ( +/obj/map_helper/network_builder/power_cable/green/auto, /turf/simulated/floor/plating, -/area/main_map/maintenance/deck_four/aft/port) -"We" = ( -/obj/effect/floor_decal/spline/plain, -/turf/simulated/wall/r_wall, -/area/gateway) -"Wf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/area/quartermaster/miningdock) +"Wg" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "smuggler_door1" }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "Wh" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -7769,22 +12702,27 @@ "Wi" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/anomaly_lab/containment_one) -"Wj" = ( -/obj/structure/stairs/spawner/south, -/obj/structure/railing{ +"Wl" = ( +/obj/machinery/door/airlock/multi_tile/glass/exploration{ + dir = 8; + name = "Research - Exploration Wing" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/obj/structure/railing{ - dir = 8 +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4) +"Wn" = ( +/obj/machinery/pipedispenser/disposal, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/rnd/xenobiology) +"Wo" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/starboard) -"Wk" = ( -/obj/structure/table/reinforced, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/reinforced/outdoors, +/area/space) "Wp" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -7796,22 +12734,16 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"Wq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +"Wr" = ( +/obj/structure/bed/chair/sofa/brown/left, +/turf/simulated/floor/tiled/monotile, +/area/main_map/hallway/deck4/fore) "Ws" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"Wt" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume, -/turf/simulated/floor/plating, -/area/space) "Wu" = ( /obj/structure/stairs/spawner/south, /obj/structure/railing{ @@ -7819,42 +12751,98 @@ }, /turf/simulated/floor/tiled, /area/main_map/maintenance/deck_four/forward/starboard) -"Wv" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" +"Wx" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Ww" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/button/remote/blast_door{ - id = "PubPrep"; - name = "Gateway Shutter"; - pixel_x = -25; - pixel_y = 25; - req_access = list(62) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/closet/secure_closet/sar{ + req_access = list(5); + req_one_access = list(5) + }, +/obj/item/storage/box/pillbottles, +/obj/item/storage/box/autoinjectors, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/roller, +/obj/item/storage/backpack/parachute, +/obj/item/binoculars, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/exploration/explorer_prep) +"Wz" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "WA" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/secure/briefcase, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) +"WC" = ( +/obj/structure/stairs/spawner/west, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/forward) +"WF" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/airlock_sensor/airlock_interior{ + dir = 8; + pixel_x = 24; + pixel_y = 4 + }, +/obj/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled/steel_ridged, +/area/main_map/maintenance/deck_four/aft/port) +"WG" = ( +/obj/machinery/mining/drill{ + drill_id = 1 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft/port) +"WH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"WI" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/port) "WJ" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/research) -"WL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +"WK" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/plating, -/area/space) +/turf/simulated/floor/wood, +/area/main_map/maintenance/deck_four/forward) "WM" = ( /obj/item/radio/intercom{ broadcasting = 1; @@ -7873,12 +12861,10 @@ /obj/structure/salvageable/machine_os, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) -"WO" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +"WQ" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "WT" = ( /obj/structure/railing{ dir = 8 @@ -7891,15 +12877,6 @@ "WU" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/main_map/hallway/deck4/fore) -"WV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "WW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7913,19 +12890,25 @@ }, /turf/simulated/floor/reinforced, /area/main_map/maintenance/deck_four/aft/port) -"WX" = ( -/turf/simulated/floor/tiled/monotile, -/area/space) "WZ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Xa" = ( -/obj/structure/closet/crate/corporate/nanotrasen, -/turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/starboard) +"Xb" = ( +/obj/structure/flora/tree/jungle, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/turf/simulated/floor/outdoors/grass/heavy/interior, +/area/rnd/research) +"Xc" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + req_access = list(47) + }, +/turf/simulated/floor/tiled/techmaint, +/area/rnd/xenobiology) "Xd" = ( /obj/landmark/spawnpoint/job/scientist, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7936,6 +12919,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) +"Xf" = ( +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_three) "Xg" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -7957,6 +12943,10 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/forward) +"Xn" = ( +/obj/structure/frame, +/turf/simulated/floor/airless, +/area/main_map/maintenance/deck_four/starboard) "Xo" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -7978,14 +12968,29 @@ }, /turf/simulated/floor/tiled/techmaint, /area/main_map/maintenance/deck_four) -"Xu" = ( -/obj/spawner/window/borosillicate/reinforced/full/firelocks, +"Xs" = ( +/obj/machinery/door/window/brigdoor/westright{ + name = "Containment Pen"; + req_access = list(55) + }, /obj/machinery/door/blast/regular{ - dir = 4; - id = "mobile_miningbase" + density = 0; + icon_state = "pdoor0"; + id = "xenobio5"; + name = "Containment Blast Doors"; + opacity = 0 }, /turf/simulated/floor/reinforced, -/area/main_map/maintenance/deck_four/aft/port) +/area/rnd/xenobiology) +"Xt" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) "Xv" = ( /obj/machinery/door/airlock/science{ name = "Secure Storage"; @@ -7997,10 +13002,18 @@ }, /turf/simulated/floor/plating, /area/rnd/secure_storage/critical) -"Xx" = ( -/obj/item/barrier_tape_segment/engineering, -/turf/simulated/floor/plating, -/area/engineering/shunt) +"Xw" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/monotile, +/area/gateway) "Xy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -8012,11 +13025,6 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/reinforced, /area/main_map/maintenance/deck_four/aft/port) -"Xz" = ( -/obj/machinery/door/firedoor/multi_tile, -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor/tiled/techmaint, -/area/main_map/maintenance/deck_four/aft/port) "XA" = ( /obj/machinery/air_alarm{ dir = 4; @@ -8037,6 +13045,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"XB" = ( +/obj/structure/largecrate, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "XC" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -8048,17 +13060,23 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"XF" = ( -/obj/structure/girder/reinforced, -/turf/simulated/floor/reinforced/airless, -/area/space) -"XG" = ( -/obj/machinery/light, -/obj/machinery/suit_cycler/mining{ - req_access = null +"XE" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"XH" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "XI" = ( /obj/machinery/door/airlock/maintenance/rnd, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8068,6 +13086,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/research/testingrange) +"XJ" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "XK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8079,38 +13103,124 @@ "XL" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical) -"XS" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) -"XU" = ( -/obj/machinery/floodlight, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +"XM" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"XN" = ( +/obj/structure/table/woodentable, +/obj/item/paper_bin, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) +"XO" = ( +/obj/effect/floor_decal/techfloor/corner{ dir = 1 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/turf/simulated/floor/tiled/techfloor, +/area/rnd/research) +"XP" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/telescience_lab/foyer) +"XR" = ( +/obj/structure/cable/heavyduty, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"XT" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft/starboard) +"XW" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monowhite, +/area/rnd/xenobiology) +"XX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/vending/medical{ + req_access = null; + req_one_access = list(5,44); + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) +"XY" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + name = "Containment Pen"; + req_access = list(55) + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Yb" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab) "Yc" = ( /obj/structure/table/standard, /obj/item/multitool, /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) -"Yi" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Gateway Prep" +"Yd" = ( +/obj/structure/table/standard, +/obj/item/slime_scanner, +/obj/item/slime_scanner, +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/item/storage/box/monkeycubes{ + starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped=10) }, -/turf/simulated/floor/tiled/monotile, -/area/gateway/prep_room) +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ye" = ( +/turf/space, +/area/rift/surfacebase/outside/outside3) +"Yg" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access = list(); + req_one_access = list(7,29) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/xenobiology) "Yj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8143,10 +13253,58 @@ }, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/port) -"Yq" = ( -/obj/machinery/door/airlock/maintenance, +"Ym" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab) +"Yn" = ( +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west_mount, +/turf/simulated/floor/tiled/monotile, +/area/rnd/telescience_lab/foyer) +"Yp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/purple{ + dir = 5 + }, +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology) +"Yr" = ( +/obj/structure/salvageable/machine, /turf/simulated/floor/plating, -/area/space) +/area/main_map/maintenance/deck_four/aft/starboard) +"Ys" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_monitoring) +"Yt" = ( +/obj/structure/table/woodentable, +/obj/item/folder/yellow{ + pixel_y = 5 + }, +/obj/item/pen, +/obj/item/paper{ + desc = ""; + info = "Central Command greets you, Pathfinder. If you're reading this memo, this is to remind you of your mission. Exploration is not for leisure: Nanotrasen's main interest in the Virgo system is to acquire new specimens of wildlife. Not only this, but the compiling of all Virgo flora is as important as the acquisition of fauna. Most importantly, your mission requires you to leave no crew behind. No discoveres are worth an explorer's life. We wish you a good expedition, Pathfinder."; + name = "Central Command memo"; + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/paper{ + desc = ""; + info = "I greet you, Pathfinder. I hope this message finds you well. I am Kaexae Ke'teq'xum, the first pathfinder to set foot in the very system your Tether is build, Virgo. I am too old to continue my research here, and so, between pathfinders, I only wish to grant you my luck in exploring these planets to depths I could not reach. Yours is a truly advanced shuttle and station, but its jewel is in its crew. Use it well, and discoveries will flow anew. May the stars shine bright to guide you."; + name = "Personal fax from Kaexae Ke'teq'xum"; + pixel_y = 3 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/tether/exploration/pathfinder_office) "Yu" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -8161,7 +13319,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "Yw" = ( @@ -8179,37 +13337,29 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"YB" = ( -/obj/machinery/status_display{ - pixel_y = 30 +"YA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 }, -/obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/airlock_sensor/airlock_interior{ + dir = 1; + pixel_y = -24 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) +/obj/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/aft) "YC" = ( /obj/machinery/camera/network/command{ dir = 9 }, /turf/simulated/floor/greengrid, /area/ai) -"YF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/plating, -/area/space) "YG" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, /area/main_map/hallway/deck4) -"YH" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/adv, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "YJ" = ( /obj/machinery/light/small, /obj/machinery/light_switch{ @@ -8231,13 +13381,17 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"YN" = ( -/obj/structure/transit_tube/high_velocity{ - icon_state = "auto" - }, -/obj/spawner/window/borosillicate/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/space) +"YO" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4) +"YP" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance, +/obj/map_helper/network_builder/power_cable/green/auto, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward) "YQ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8250,6 +13404,19 @@ "YR" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/main_map/maintenance/deck_four/starboard) +"YS" = ( +/obj/machinery/light/no_nightshift, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"YT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/mains_pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/exploration/explorer_prep) "YV" = ( /obj/item/tvcamera, /obj/item/tvcamera, @@ -8263,36 +13430,83 @@ }, /turf/simulated/floor/tiled/monotile, /area/main_map/hallway/deck4/fore) -"YY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +"YX" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/tiled/techmaint, +/area/main_map/maintenance/deck_four/forward/port) +"YZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/main_map/maintenance/deck_four/aft/starboard) +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) "Za" = ( -/turf/space, -/area/space) -"Zh" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/machinery/light/spot/no_nightshift{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/outpost/near_gateway) -"Zi" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/area/quartermaster/miningdock) +"Zb" = ( +/obj/structure/disposaloutlet{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/rnd/xenobiology) +"Zc" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/mains_pipe/cap/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/exploration/explorer_prep) +"Zd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) +"Ze" = ( +/turf/simulated/floor/tiled, +/area/main_map/maintenance/deck_four/forward/port) +"Zf" = ( +/obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/access_button/airlock_interior{ + master_tag = "smugler_airlock1"; + dir = 4; + pixel_x = -24 + }, +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/main_map/maintenance/deck_four/aft) +"Zg" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/main_map/maintenance/deck_four/aft/starboard) -"Zm" = ( -/turf/simulated/wall/r_wall/prepainted/civilian, -/area/main_map/maintenance/deck_four) +"Zj" = ( +/turf/simulated/floor/reinforced/overhang, +/area/main_map/hallway/deck4) +"Zk" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-2" + }, +/obj/machinery/power/pointdefense{ + id_tag = "forward_pd" + }, +/turf/simulated/floor/reinforced/outdoors, +/area/space) +"Zl" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/rnd/xenobiology) "Zo" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -8301,6 +13515,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/gateway) +"Zp" = ( +/turf/simulated/wall/prepainted/cargo, +/area/quartermaster/office) "Zq" = ( /obj/structure/transit_tube/high_velocity{ icon_state = "auto" @@ -8317,15 +13534,6 @@ }, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rnd/research) -"Zs" = ( -/obj/structure/closet/excavation, -/obj/item/multitool, -/obj/item/multitool, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/gateway/prep_room) "Zu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -8350,19 +13558,17 @@ }, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"Zz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"ZC" = ( +/obj/machinery/photocopier/faxmachine{ + department = "Telescience Tower" }, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/wood, +/area/rnd/telescience_lab/storage) +"ZD" = ( +/obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/rnd/outpost/maintenance) -"ZA" = ( -/obj/structure/salvageable/server, -/turf/simulated/floor/plating, -/area/engineering/shunt) +/area/main_map/maintenance/deck_four/aft) "ZE" = ( /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/shutters{ @@ -8380,15 +13586,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) -"ZG" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/main_map/maintenance/deck_four/aft/port) "ZH" = ( /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/starboard) @@ -8400,6 +13597,16 @@ /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/miningdock) +"ZM" = ( +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/miningdock) +"ZN" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/gravity_gen) "ZP" = ( /obj/structure/salvageable/console_os, /turf/simulated/floor/plating, @@ -8411,152 +13618,85 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/main_map/maintenance/deck_four/aft/port) -"ZR" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 - }, -/turf/simulated/floor/plating, -/area/space) "ZU" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"ZV" = ( +/obj/structure/closet/secure_closet/scientist, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/telescience_lab/storage) +"ZW" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA" + }, +/turf/simulated/wall/r_lead, +/area/engineering/gravity_gen) +"ZX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"ZY" = ( +/obj/map_helper/network_builder/power_cable/green/auto, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/main_map/hallway/deck4/fore) "ZZ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) (1,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -8578,6 +13718,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -8599,158 +13810,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(2,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -8767,6 +13826,71 @@ Dz Dz Dz Dz +CO +lB +lB +nD +lB +lB +lB +nD +lB +lB +lB +nD +lB +lB +lB +nD +lB +lB +lB +Yp +Ex +Ex +Yw +Yw +Yw +"} +(2,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -8788,163 +13912,82 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Yw -Za -"} -(3,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -8977,172 +14020,71 @@ Dz Dz Dz Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(4,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz +FV +bW +cP +DN +Zb +Ex +bW +DN +Zb +Ex +SZ +DN +cP +rP +bW +DN +Zb +Ex +bW +DN +Zb +Ex +Yw +Yw +Yw +"} +(3,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9164,11 +14106,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +nE +nE +mq +ZW +Ly +qe +Ly +Ly +Ys +Xf +Xf Dz Dz Dz @@ -9181,7 +14205,6 @@ Dz Dz Dz Dz -Za Dz Dz Dz @@ -9191,6 +14214,71 @@ Dz Dz Dz Dz +FV +cP +cP +cP +uO +Ex +cP +cP +uO +Ex +uO +cP +cP +rP +cP +JI +uO +Ex +cP +JI +uO +Ex +Yw +Yw +Yw +"} +(4,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9201,138 +14289,6 @@ Dz Dz Dz Dz -"} -(5,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -9344,11 +14300,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +Ly +Ly +Ly +RR +iV +KG +Ly +mu +gB +vf Dz Dz Dz @@ -9370,12 +14408,73 @@ Dz Dz Dz Dz +FV +cP +cP +cP +uO +Ex +cP +cP +uO +Ex +uO +cP +cP +rP +cP +cP +uO +Ex +cP +cP +uO +Ex Dz Dz Dz +"} +(5,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -Za Dz Dz Dz @@ -9395,142 +14494,93 @@ Dz Dz Dz Dz -"} -(6,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz Dz Dz Dz Dz +Ly +ZN +Ap +Ly +gg +vX +xv +Ly +mu +mu +mu Dz Dz Dz @@ -9552,9 +14602,72 @@ Dz Dz Dz Dz +FV +Nm +Nm +Xs +ry +Ex +Nm +BS +ry +Ex +ry +EK +Nm +Ex +Nm +vQ +ry +Ex +Nm +Pc +ry +Ex Dz Dz Dz +"} +(6,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz Dz Dz Dz @@ -9569,13 +14682,99 @@ Dz Dz Dz Dz -Za Dz Dz Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Ly +ks +ks +Ly +Ly +JF +Ly +ZW +Ly +Ly +Ly Dz Dz Dz @@ -9589,138 +14788,6 @@ Dz Dz Dz Dz -"} -(7,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -9729,9 +14796,71 @@ Dz Dz Dz Dz +FV +yL +dM +XY +ob +Ex +dM +XY +ob +Ex +sR +XY +Gv +Ex +Kw +XY +ob +Ex +dM +XY +ob +Ex Dz Dz Dz +"} +(7,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9753,17 +14882,98 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +zM +xk +iq +HJ +qz +mf +jN +nb +Ro +Ly Dz Dz Dz Dz Dz -Za Dz Dz Dz @@ -9780,142 +14990,71 @@ Dz Dz Dz Dz +FV +tX +tX +tX +tX +Di +tX +tX +tX +tX +tX +tX +tX +jA +tX +tX +tX +KW +tX +tX +Mb +Ex Dz Dz Dz "} (8,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9937,11 +15076,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Kx +Kx +Kx +Kx +Kx +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Qn +Se +Op +Se +wY +Se +gn +xE +Ly Dz Dz Dz @@ -9957,16 +15178,77 @@ Dz Dz Dz Dz -Za Dz Dz Dz Dz Dz Dz +FV +RQ +RQ +RQ +RQ +RQ +RQ +lG +gh +RQ +RQ +RQ +RQ +RQ +RQ +RQ +mc +TE +RQ +RQ +YS +Ex Dz Dz Dz +"} +(9,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -9977,138 +15259,6 @@ Dz Dz Dz Dz -"} -(9,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10120,11 +15270,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +Kx +oA +Kt +Ef +jb +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Oa +SD +oO +oO +oO +yP +VB +xE +Ly Dz Dz Dz @@ -10146,12 +15378,73 @@ Dz Dz Dz Dz +FV +RQ +RQ +RQ +RQ +RQ +RQ +RQ +JE +RQ +RQ +RQ +RQ +RQ +RQ +RQ +mk +RQ +RQ +RQ +RQ +Ex Dz Dz Dz +"} +(10,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -Za Dz Dz Dz @@ -10171,147 +15464,93 @@ Dz Dz Dz Dz -"} -(10,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +NS +oA +fh +al +fb +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Oa +Pd +pm +pm +pm +XM +VB +xE +Ly Dz Dz Dz @@ -10327,25 +15566,81 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +FV +yc +Wn +cN +xi +Yd +RQ +RQ +eb +gm +zq +zq +zq +zq +zq +gm +TI +RQ +RQ +VL +if +Ex Dz Dz Dz +"} +(11,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10363,143 +15658,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +NS +oA +fh +al +dz +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -"} -(11,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz +Ly +cS +Oa +Pd +pm +pm +gM +XM +VB +yU +Ly Dz Dz Dz @@ -10515,9 +15760,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +FV +wG +wG +wG +wG +wG +rk +RQ +eb +QE +ES +Tg +xe +eS +tl +QE +TI +RQ +EU +Ex +ry +Ex Dz Dz Dz +"} +(12,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -10528,22 +15841,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz Dz Dz Dz @@ -10555,143 +15852,93 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +Kx +oA +Ua +al +dz +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz -"} -(12,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz +Ly +yJ +Oa +Pd +pm +pm +pm +XM +VB +xE +Ly Dz Dz Dz @@ -10707,9 +15954,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +FV +Ay +KR +cr +Nm +rt +el +RQ +eb +Vq +SA +zq +zq +QG +eP +Vq +TI +RQ +Mg +Nm +GR +Ex Dz Dz Dz +"} +(13,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -10722,18 +16037,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10743,148 +16046,98 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +vt +dX +Tv +al +yz +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz +Ly +yJ +Oa +Tb +cG +cG +cG +GV +VB +xE +Ly Dz Dz Dz Dz Dz -"} -(13,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -10895,9 +16148,77 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Bs +Vz +KR +KR +JY +FY +el +cJ +ip +Gx +Gx +Gx +Gx +Gx +zg +Sa +ve +Pe +wJ +Bc +IG +Ex Dz Dz Dz +"} +(14,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -10916,25 +16237,96 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +Kx +us +sj +kY +MP +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz Dz Dz Dz Dz +Ly +yJ +Br +hp +hp +hp +hp +hp +iI +xE +Ly Dz Dz Dz @@ -10947,138 +16339,84 @@ Dz Dz Dz Dz +Dz +Dz +Dz +eO +Yw +Yw +Yw +Yw +Yw +FV +ut +eU +kg +ik +zO +IX +RQ +zq +Zl +Ml +Ml +Ml +Ml +iO +zq +zq +zG +Zd +Kp +mQ +Ex +Dz +Dz +Dz "} -(14,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(15,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz Dz Dz Dz @@ -11096,6 +16434,179 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +Kx +Kx +Kx +Kx +Kx +Kx +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ly +AD +tP +bG +tP +fF +tP +bG +tP +Aw +Ly +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +FV +Ex +Ex +Ex +Ex +Ex +Ex +Xc +Ex +Ex +FX +zq +zq +zq +Tz +zq +zq +xm +DF +Ex +Ex +Ex +Dz +Dz +Dz +"} +(16,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11110,18 +16621,6 @@ Dz Dz Dz Dz -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -11129,6 +16628,114 @@ Dz Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +NS +dY +DE +dk +Wx +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11138,184 +16745,62 @@ Dz Dz Dz Dz +Ex +FX +pk +zq +zq +Tz +zq +zq +oq +Km +SE +zC +Ex Dz Dz Dz "} -(15,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(17,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11335,181 +16820,181 @@ Dz Dz Dz Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +LV +IC +dd +Js +pT +Oe +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Ex +Tk +Bf +hF +Db +ee +fU +Az +lc +RQ +mt +jW +Ex +Dz +Dz +Dz "} -(16,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(18,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11529,186 +17014,116 @@ Dz Dz Dz Dz -"} -(17,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz Dz Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +NS +rj +kH +kH +Bi +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +py +kT +py +py +py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -11718,186 +17133,64 @@ Dz Dz Dz Dz +Ex +Ex +Ex +Ex +Ex +Yg +QE +Ex +RQ +RQ +mt +by +Ex Dz Dz Dz +"} +(19,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz -"} -(18,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za Dz Dz Dz @@ -11917,509 +17210,448 @@ Dz Dz Dz Dz -"} -(19,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +NS +DO +tw +AX +AX +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji +TY +TY +TY +TY +TY +TY +TY kL kL kL -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TV +Lx +Cu +py +py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Ex +RQ +RQ +Tl +jS +VE +Yw +Yw +Yw "} (20,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Rr +Kx +Kx +Kx +Kx +Kx +Kx +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +TY +TY +TY +TY +TY +TY +TY +TY +TY kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +py +kT +py +Uh +Cu +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Ex +zv +zv +sf +sf +Ex +Yw +Yw +Yw "} (21,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +ZI +ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Rr +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO kL kL kL -Ji +eO kL kL kL -Ji -Ji +TY +TY py py py @@ -12427,498 +17659,118 @@ py py py py -Ji -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(22,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -kL -kL -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +TY +TY kL kL kL +eO kL kL kL +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL +py +Cu +py kL -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Yw +Yw +Yw "} -(23,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -Ji -kL -kL -kL -kL -FQ -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(24,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(22,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -12927,11 +17779,6 @@ Dz Dz Dz Dz -Hd -Hd -Hd -Hd -Hd Dz Dz Dz @@ -12940,179 +17787,176 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -FQ -FQ -FQ -kL -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +Dc +ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +Ir +Ir +Ir +Ir +Ir +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +kL +Ir +Ir +Ir +Ir +Ir +Ir +Ir +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(25,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(23,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -13121,11 +17965,6 @@ Dz Dz Dz Dz -Hd -vz -hK -IQ -Hd Dz Dz Dz @@ -13134,180 +17973,6 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -gv -gv -gv -gv -gv -ZI -ZI -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -sZ -kL -kL -kL -FQ -kL -kL -kL -rI -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -sZ -sZ -kL -sZ -sZ -kL -kL -kL -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -lF -lF -lF -lF -lF -lF -lF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(26,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz Dz Dz Dz @@ -13315,192 +17980,177 @@ Dz Dz Dz Dz -Hd -vz -Ao -hw -Hd -Dz Dz Dz Dz Dz Dz Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -gv -vz -hK -IQ -gv +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +ZI Dc ZI ZI -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -kL -rI -hM -hM -hM -rI -hM -kL -sZ -sZ -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL +ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +Ir +Ir +Ir +eO +Ir +Ir +Ir +Ir +XB +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY kL -Ji +Ir +Ir +dJ +dJ +dJ +Ir +Ir +eO kL kL kL -Ji -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -lF -lF -ZH -ZH -ZH -qh -ZH -lF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(27,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(24,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -13509,11 +18159,6 @@ Dz Dz Dz Dz -Hd -Kf -iZ -bS -Hd Dz Dz Dz @@ -13522,192 +18167,184 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -gv -vz -Ao -hw -gv +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ZI +ZI +Dc +Dc Dc Dc ZI ZI -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -hM -sZ -sZ -kk -ub -ub -rI -sZ -tv -tv -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +XB +XB +XB +Ir +TY +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +TY +Ir +dJ +dJ +dJ +dJ +Ir +Ir kL kL kL kL +eO kL kL kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -lF -lF -ZH -ZH -ZH -ZH -ZH -ZH -lF -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(28,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Kk -zy -Nw +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(25,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -13716,611 +18353,628 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +gv +gv +gv gv -Kf -iZ -bS gv -Dc Dc Dc ZI ZI -Ji -Ji -Ji -Ji -Ji -Ji -Ji -ZI -ZI -ZI -ZI -ZI -kL -py -py -py -kL -kL -kL -hM -sZ -sZ -sZ -ub -ub -hM -kL -As -sZ -hM -rI -kL -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -Ji -Ji -lF -lF -ZH -ZH -xA -xA -xA -Lr -Wj -lF -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +Ir +Ir +Ir +dJ +Ir +Ir +Ir +XB +Ir +Ir +Ir +qq +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +kL +Ir +Ir +dJ +dJ +dJ +bB +dJ +dJ +Ir +Ir +Ir +Ir +Ir +Ir +kL +eO +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(29,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -pY -iF -nL -sI -iF -iF -RO -aA -jV -LG -Nw -Sk -Sk -Sk -Sk -Sk -Sk -Sk +(26,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -gv -gv -gv -gv -gv -gv -gv -gv +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO gv -Kk -zy +vz +hK +IQ gv -Sq -Sq -Sq -ZI -ZI -ZI -ZI -ZI -ZI +hG +Uj +pj ZI -hW -hW ZI -Dc -Dc -Dc ZI -Ji -Za -Za -Za -Ji -kL -FQ -rI -sZ -RI -kL -kL -kL -kL -kL -As -sZ -hM -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +kL +kL +kL +TY +TY +TY +Ir +Ir +Ir +Ir +qq +bB +bB +bB +qq +bB +Ir +dJ +dJ +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY kL +Ir +Ir +dJ +dJ +dJ +bB +dJ +dJ +dJ +dJ +dJ +dJ +Ir +Ir kL kL -sZ -sZ -sZ kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ kL +eO kL kL -Ji -Ji -Ji kL -lF -lF -lF -lF -lF -lF -ZH -ZH -xA -ZH -gk -gk -gk -gk -gk -bi -bi -bi -bi -bi -bi -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ex +Ex +Ex +Fx +Fx +Nq +zw +DK +DK +DK +Ex +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(30,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -hP -hP -hP -hP -hP -wa -iF -aA -FE -Al -Nw -dF -UE -ux -Cw -Cw -nV -Sk +(27,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO gv -pY -iF -nL -nT -iF -iF -RO -aA -jV -LG +vz +Ao +hw gv Dc Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI pj -pj -Dc -Dc Dc ZI ZI ZI -Za -Za -Za -kL -kL -kL -hM -sZ -RI -kL -kL -kL -kL -kL -kL -rI -kL -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -kL -kL -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -py -py -py -kL -lF -lF -ZH -ZH -ZH -ZH -ZH -ZH -xA -ZH -vS -vS -vS -vS -vS -fH -fH -fH -fH -bi -bi -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +hW +hW +hW +ZI +ZI +ZI +ZI +ZI +ZI +ZI +ZI +TY +TY +TY +Ir +Ir +Ir +bB +dJ +dJ +no +qp +qp +qq +dJ +JS +JS +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +kL +Ir +Ir +bB +wO +bB +bB +dJ +dJ +dJ +dJ +dJ +dJ +dJ +bB +dJ +dJ +Ir +Ir +Ir +Ir +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +dS +ro +ro +ro +Fx +zx +Uw +Uw +qG +Ex +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(31,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -ll -ll -ll -ll -Bw -vV -wp -Nw -Pv -La -KT -Cw -Cw -Cw -Cw -Cw -nV -Sk +(28,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO +eO +eO +eO gv -hP -hP -hP -hP -hP -wa -iF -aA -FE -Al +Kf +iZ +bS gv Dc +Dc +pj +pj +pj pj pj pj @@ -14329,567 +18983,1145 @@ pj pj pj pj -Xz pj pj Dc Dc -Dc -ZI ZI -ZI -Za -Za -Za -kL -kL -kL -kL -rI -kL -kL -kL -kL -kL -kL -FQ -FQ -FQ -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -Ji -Za -Za -Za -Ji -lF -ZH -ZH -xA -xA -xA -xA -xA -xA -ZH -vS -Bt -OK -Bt -vS -ty -RA -ty -fH -bi -bi -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +py +py +py +Ir +Ir +Ir +bB +dJ +dJ +dJ +qp +qp +bB +Ir +hz +dJ +bB +qq +Ir +TY +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +TY +Ir +dJ +dJ +xs +xs +UT +xs +xs +xs +xs +xs +xs +xs +wO +dJ +dJ +dJ +dJ +dJ +dJ +Ex +cP +bW +cP +Ex +qD +Fx +Ex +Ex +Ex +Ex +Ex +dS +ro +ro +ro +Ub +zx +Uw +Uw +Uw +Ex +eO +eO +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(32,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -lz -ki -hB -Bk -gW -kG -iF -FH -FE -mE -KT -uy -gN -GX -GX -GX -GX -GX -GX -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +(29,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO gv -ll -ll -ll -ll -Bw -vV -mr -Nw -Pv -La gv -Dc -pj -pj -pj -pj -pj -pj -pj -pj -pj +gv +gv +gv +gv +gv +gv +gv +Kk +zy +gv +Kj +ja +Kj +Kj +Kj +Kj +pF +pF +pF +pF +pF +pF +pF pj pj Dc Dc -Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -kL -FQ -FQ -kL -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -kL -kL -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -ZH -ZH -ZH -ZH -ZH -ZH -vS -BV -zB -Is -vS -Bo -cm -DB -fH -bi -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +eO +Ir +XB +qq +dJ +uK +Ir +Ir +Ir +Ir +Ir +hz +dJ +bB +Ir +Ir +kL +TY +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +TY +kL +Ir +Ir +dJ +xs +dJ +bB +dJ +dJ +bB +bB +bB +xs +dJ +bB +dJ +dJ +dJ +dJ +dJ +dJ +Ex +hv +Li +Li +Dq +da +Fx +FV +Ex +Ex +Ex +Ex +Ex +XW +ro +ro +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +Ex +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(33,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -lz -AK -ri -wi -gW -aF -hN -lS -Zo -kS -Nw -rF -Gj -GI -Vb -Vb -Vb -Zz -GX -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji +(30,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO gv -lz -ki -hB -Bk -gW -kG +pY iF -FH -FE -mE +nL +nT +iF +iF +RO +Sr +jV +LG gv -Dc -pj -pj -pj -pj -pj +oA +Mn +Eo +Nt +jb +Kj +OC +OC +OC +Iq +OC +OC +pF pj pj Dc -ZI -RV -RV -ZI -Dc -Dc Dc ZI -Ji -Za -Za -Za -Ji -kL -sZ -rI -sZ -sZ -Ug -YF -YF -GD -Cs -rL -kL -kL -kL -kL -kL -Ji -Ji -py -py -py -py -py -py -py -Ji -Ji -kL -kL -kL -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -ZH -ZH -ZH -ZH -ZH -ZH -vS -Ne -Ox -Bt -vS -Uf -jL -ty -fH -bi -bi -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +uK +Ir +Ir +Ir +Ir +Ir +Ir +qq +Ir +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +kL +Ir +Ir +dJ +xs +bB +bB +bB +bB +bB +dJ +bB +UT +bB +bB +bB +bB +bB +dJ +dJ +dJ +Ex +cP +cP +cP +Ex +yw +Fx +FV +Ay +KR +cr +Nm +rt +mN +ro +ro +Ex +cP +bW +cP +Ex +qD +dl +Ex +cP +cP +cP +Ex +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(34,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(31,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +gv +hP +hP +hP +hP +hP +wa +iF +Sr +FE +Al +gv +oA +TD +IC +Zc +fb +Kj +OC +OC +OC +OC +OC +OC +hy +pj +pj +Dc +Dc +ZI +Yw +Yw +Yw +Ir +Ir +Ir +Ir +qq +Ir +Ir +Ir +Ir +Ir +Ir +XB +XB +XB +Ir +Ir +kL +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +kL +Ir +Ir +dJ +xs +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +Ex +Ex +Ex +Ex +Ex +Fx +Fx +Bs +Vz +KR +KR +JY +FY +mN +ro +ro +Ex +hv +Li +Li +Dq +da +dx +Dq +Li +mi +dj +Ex +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(32,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ct +ct +ct +gv +ll +ll +ll +ll +Bw +vV +mr Nw +Pv +La +gv +oA +TD +DR +BK +dz +Kj +OC +dy +PB +pF +OC +OC +pF +pj +pj +Dc +Dc +ZI +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +dJ +dJ +dJ +Ir +Ir +Ir +Ir +XB +XB +Ir +TY +TY +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +TY +TY +Ir +dJ +dJ +xs +wO +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +Ex +cP +bW +cP +Ex +qD +Fx +FV +ut +eU +kg +ik +zO +wc +ro +ro +Ex +cP +cP +cP +Ex +yw +bV +Ex +cP +Qm +cP +Ex +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(33,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +ct +ct +ct +rT +rT +gv lz -rH -Fj -AL +ki +hB +Bk gW -lj +kG iF -uG +xn FE mE -KT -re -wS -GX -Vp -Vp -Vp -oT -GX -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji +gv +oA +TD +IC +Tf +dz +Kj +OC +dy +AU +pF +qQ +qQ +pF +pj +pj +Dc +Dc +ZI +Yw +Yw +Yw +eO +Ir +dJ +qq +dJ +dJ +WH +nW +nW +Zf +aV +wy +Ir +Ir +Ir +Ir +Ir +eQ +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +dJ +dJ +xs +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +bB +bB +bB +Ex +hv +Li +Li +Dq +da +Fx +FV +Ex +Ex +Ex +Ex +Ex +PU +Ho +TA +Ex +Ex +Ex +Ex +Ex +BF +Fx +Ex +Ex +Ex +Ex +Ex +kL +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(34,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +ct +ct +rT +rT +rT +rT gv lz AK @@ -14898,192 +20130,192 @@ wi gW aF hN -lS +Ue Zo kS gv -Dc -pj -pj -pj -pj -pj -pj -pj -Dc -Hb +yz +Vu +IC +Tf +us +Kj +OC +dy +AU +Cg +vo +vo +pF pj pj -Hb Dc Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -WL -kL -kL -kL -MF -qS -kL -kL -kL -kL -kL -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -kL -kL -kL -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -Fv -Fv -Fv -Fv -Fv -Fv -vS -vS -Ch -vS -vS -fH -AS -fH -fH -fH -bi -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +oJ +Ir +Ir +Ir +OH +lT +Ir +Ir +Ir +Ir +It +NT +Ir +dJ +dJ +dJ +xs +xs +xs +xs +xs +xs +xs +UT +xs +xs +xs +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +Ex +cP +cP +cP +Ex +yw +Fx +Ex +cP +cP +cP +Ex +qD +Fx +tL +ro +Ex +cP +cP +cP +Ex +qD +dl +Ex +cP +bW +cP +Ex +kL +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (35,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -Dg -Dg -Dg -Dg -nz -uH -wp -We -IK -Jt -KT -uf -vn -GX -Vp -jl -Ou -EX -GX -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +If +qY +rT +rT +rT +rT gv lz rH @@ -15092,192 +20324,192 @@ AL gW lj iF -uG +qF FE -mE +nk gv -Dc -pj -pj -pj -pj -pj +MP +nY +IC +ac +dk +Kj +OC +dy +AU +Cg +ml +ml +pF pj pj Dc -Hb -ag -ag -Hb -Dc Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -WL -kL -kL -kL -wj -tW -kL -kL -kL -kL -kL -Ji -Ji -py -py -py -py -py -py -py -Ji -Ji -kL -kL -kL -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -kL -kL -kL -Za -Za -Za -kL -lF -lF -ZH -xA -Fv -VN -ci -TP -VN -Fv -hC -LJ -tO -vJ -RS -yO -SS -yr -JQ -XL -VX -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +oJ +Ir +Ir +Ir +qu +kb +Ir +Ir +Ir +Ir +Ln +zs +Ir +dJ +dJ +dJ +xs +dJ +dJ +dJ +dJ +dJ +dJ +bB +bB +bB +bB +bB +dJ +dJ +dJ +dJ +dJ +bB +xs +xs +xs +xs +xs +UT +xs +xs +dJ +Ex +Ex +Ex +Ex +Ex +BF +Fx +Ex +hv +Li +Li +Dq +da +Fx +tL +ro +Ex +hv +Li +Li +Dq +da +dx +Dq +Li +mi +dj +Ex +kL +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (36,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -jI -jI -jI -jI -jI -xt -iF -aA -FE -DJ -Nw -Cw -Cw -GX -Vp -Vp -Vp -gG -GX -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +If +ZC +rT +rT +rT +BD gv Dg Dg @@ -15288,10 +20520,211 @@ uH mr Nw IK -Jt +bc gv -Dc +DO +nY +IC +ac +Wx +Kj +OC +Wl +pF +pF +pF +pF +pF pj +nZ +ZI +ZI +ZI +Yw +Yw +Yw +Ir +Ir +Ir +bB +dJ +dJ +oJ +Ir +Ir +Tr +dJ +dJ +Wg +dJ +Ir +Ir +Ir +YA +Ir +dJ +dJ +dJ +xs +dJ +bB +bB +ZD +bB +bB +bB +dJ +dJ +dJ +bB +dJ +dJ +dJ +dJ +dJ +bB +dJ +dJ +dJ +xs +dJ +bB +dJ +xs +dJ +Ex +cP +cP +cP +Ex +qD +Fx +Ex +cP +Qm +cP +Ex +yw +Fx +tL +ro +Ex +cP +Qm +cP +Ex +yw +bV +Ex +cP +cP +cP +Ex +kL +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(37,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +If +AT +rT +rT +rT +Es +gv +jI +jI +jI +jI +jI +xt +iF +Sr +FE +Xw +gv +dY +VS +Nh +oK +DE +Kj +OC +OC +ss pj pj pj @@ -15299,373 +20732,172 @@ pj pj pj Dc -ZI -ZI -ZI -ZI -Dc Dc ZI -ZI -ZI -Za -Za -Za -kL -kL -kL -hM -sZ -sZ -WL -kL -kL -jf -sZ -sZ -qC -sZ -sZ -jf -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -kL -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -sZ -sZ -sZ -sZ -sZ -sZ -sZ -kL -Ji -Za -Za -Za -Ji -lF -ZH -ZH -xA -Fv -yM -cv -Ks -VN -Fv -nI -NY -jD -wg -jD -EP -tz -jD -pD -XL -VX -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(37,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -zu -iF -AW -bC -MO -iF -RO -aA -gO -JM -Nw -Cw -Cw -GX -nm -xx -Id -lE -GX -Za -Za -Za -Za -Ji -Ji -Ji -kL -kL -kL -gv -jI -jI -jI -jI -jI -xt -iF -aA -FE -DJ -gv -Dc -pj -pj -pj -pj -pj -pj -pj -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -Ji Dz Dz Dz -kL -kL -kL -hM -kL -kL -Nf -kL -kL -ay -kL -kL -kL -sZ -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -sZ -kL -kL -kL -sZ -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -sZ -kL -kL -kL -sZ -kL -kL -kL -py -py -py -kL -lF -lF -ZH -xA -Fv -VN -hS -Ku -VN -Fv -Gy -qI -fc -fc -fc -wQ -fc -fc -fc -fc -Vc -kL -kL -kL -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Ir +Ir +Ir +bB +Ir +Ir +VK +Ir +Ir +ib +Ir +Ir +Ir +dJ +Ir +Ir +yi +zs +xs +xs +xs +xs +xs +dJ +bB +dJ +dJ +dJ +dJ +qq +dJ +dJ +dJ +bB +dJ +dJ +Ir +Ir +pa +pF +pF +pF +pF +LL +pF +pF +dJ +xs +dJ +Ex +hv +Li +Li +Dq +da +Fx +Ex +Ex +Ex +Ex +Ex +BF +Fx +tL +ro +Ex +Ex +Ex +Ex +Ex +Fx +Fx +Ex +Ex +Ex +Ex +Ex +kL +kL +kL +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (38,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -Nw -xr -Sv -CD -sz -Yi -gw -gw -gw -GX -HT -GX -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +ct +ct +ju +ju +rT +Es gv zu iF @@ -15674,421 +20906,421 @@ dp MO iF RO -aA +Sr gO -JM +xV gv +AX +VS +IC +ac +lm +Kj +Su +dy +Sq +Dc +Dc Dc pj pj pj pj pj -pj -pj -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -ZI ZI py py py +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Tr +Ir +Ir +to +RK +dJ +dJ +dJ +dJ +xs +dJ +bB +dJ +dJ +dJ +dJ +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +Ir +pa +pa +AY +OC +OC +OC +OC +pF +dJ +xs +dJ +Ex +cP +Qm +cP +Ex +yw +Fx +Fx +Fx +ro +ro +ro +ro +ro +tL +ro +ro +ro +ro +Fx +uc +Fx +dl +Ex +cP +VO +cP +Ex +kL +eO +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(39,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +ct +ct +ct +ct +Es +gv +gv +gv +gv +gv +gv +gv +gv +gv +xr +yY +bu +AX +ul +kH +yK +XX +Kj +Fp +dy +ui +ui +ui +ui +ui +ui +pj +Dc +pj +ZI +TY +TY +TY +Ir +Ir +Ir +TY kL kL +TY kL kL +TY kL kL kL +TY kL +Ir +Ir +Ir +Ir +Ir +Ir +Ir +BM +Ir +bB +Ir +Ir +Ir +Ir +Ir +Ir +TY kL kL kL -kL -kL -kL -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -Ji -Ji -Ji -kL -aR -aR -aR -Ki -Fv -Fv -dL -jQ -Fv -Fv -nI -eL -fc -qW -rK -vh -rK -qW -fc -Vc -Vc -Ji -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(39,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Hi -Hi -Hi -Hi -Hi -Hi -gw -YB -lW -Ww -mJ -qM -ng -ng -LX -rJ -gw -CC -lE -GX -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji -gv -gv -gv -gv -gv -gv -gv -gv -gv -xr -Sv -bu -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -ZI -ZI -Ji -Ji -Ji -kL -kL -kL -Ji -kL -kL -Ji -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -Ji -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -py -py -py -kL -aR -jk -xC -iA -cK -Ll -Cq -YY -fJ -rq -de -Da -fc -WA -bk -SU -jJ -bN -fc -Vc -Vc -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +TY +Ir +Ir +pa +pF +DU +OC +OC +OC +OC +pF +dJ +xs +dJ +Ex +Ex +Ex +Ex +Ex +Fx +Fx +Fx +SG +vI +bI +jO +jO +jO +EN +jO +jO +jO +jO +Le +pd +Fx +dx +Dq +Li +mi +dj +Ex +kL +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (40,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Nr -SM -SM -oZ -qO -pZ -gw -XS -Wq -IE -mJ -ng -ng -GN -tk -Zs -gw -Vp -lE -GX -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -sd -xT -xT -xT -xT -xT -xT -xT -xT -sT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -VU -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ct +ct +XP +AF +DW +Yn +AF +AF +uA +xa +cz +xa +dG +Ym +Um +Kj +Kj +Ky +fe +Kj +Kj +OC +uW +vZ +WQ +wr +bJ +bm +ui +pj Dc -ZI -ZI +sX ZI py py py -Ji -Ji +TY +TY ho ho ho @@ -16102,187 +21334,187 @@ Dz Dz Dz Dz -Dz -Dz -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -py -Za -Za -Za -Za -Za -Za -Za -Za -py -py -py -py -py -Za -Za -Za -Za -Za -Za +TY +TY +TY +Yw +Yw +uh +YZ +YZ +YZ +uh +Yw +Yw +TY +TY +TY py -Ji +Yw +Yw py -Za -Za -Za -Ji -Po -Ty -gc -jk -Cc -mh -wl -Wf -jk -Xv -jD -tC -fc -tf -rK -NR -rK -WA -fc -Vc -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Dz +ho +jy +OC +cF +OC +OC +OC +OC +pF +dJ +xs +dJ +dJ +CY +Fx +Fx +Fx +Fx +Fx +Fx +Fx +ro +et +Fx +qB +bj +nX +nX +mC +ro +ro +Fx +Nj +Fx +bV +Ex +cP +Qm +cP +Ex +kL +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (41,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sA -sA -pH -Sd -Sd -mM -gw -wA -ab -ng -mJ -ng -ng -MN -Fz -XU -gw -ym -lE -GX -Za -Za -Za -Za -Za -Za -Za -Za -Ji -sd -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -cf -nC -zS -zS -zN -zS -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +yR +XP +lY +lY +QD +rh +lY +td +Ev +Lz +Ev +Ev +Qt +xa +Bn +OY +OY +MZ +OY +Bn +OC +uW +KH +rb +rb +Mr +cE +ui +WI +Dc +Eu ZI -Ji -Za -Za -Za -Ji -Ji +Yw +Yw +Yw +TY +TY py Hr TV @@ -16296,380 +21528,380 @@ ai ai ai Cu -Wv -UQ -UQ -Hr +Hs +EE +EE Hr Hr -uT -uT -uT +EB +hD +hD +hD +EB Hr Hr -Hr -UQ -UQ -UQ +EE +EE +EE Cu ai ai +Hr ai ai -ai -ai -ai -RT -TV -TV -Cu -py -py -Za -Za -Za -Za -Za -Za -py -Ji -py -Za -Za -Za -Ji -rB -yE -Ke -fG -aR -tG -Af -uQ -tG -XL -Kv -PL -fc -iB -RH -IB -UZ -Lu -fc -Vc -Vc +nq +tg +Zq +VR +eG +VR +pF +OC +OC +pF +dJ +xs +dJ +dJ +Ex +pv +pv +Fx +Fx +Fx +Fx +Fx +ro +et +Fv +Fv +Fv +Fv +Fv +Fv +ro +ro +vS +vS +vS +vS +fH +fH +fH +fH +fH kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (42,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -fV -fV -Rs -UG -Sd -dv -Ri -kj -IE -ng -wz -oB -ng -cx -mn -UH -CD -Vp -Dw -GX -Za -Za -Za -Za -Za -Za -Za -Za -Ji -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -SP -Dc -Dc -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +bt +bt +bt +KN +KN +KN +KN +KN +Gd +Yw +Yw +Yw +Yw +Yw +Yw +yR +Io +lh +nr +yB +Ih +lh +Xt +me +cY +me +me +zm +jj +vY +hL +OR +TB +rd +RX +lL +hr +KH +XN +Yt +Tu +BI +ui +Pk Dc ZI ZI -ZI -Za -Za +Yw +Yw ai -Wv -Wv +Hs +Hs Mz py py py -Za -Za -Za -Za -Za -Za -Za -Za -py -Ji -Ji -Ji -py -py -py -py -py -py -py -py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw py -Ji -Ji -Ji +TY +TY +TY py -Za -Za -Za -Za -Za -Za -Za -Za py +uh +Ij +Ij +Ij +uh py py -Uh -fC -uq -ai -Za -Za -Za -Za +TY +TY +TY py -Ji +Yw +Yw py -Za -Za -Za +Yw +Yw +Dz +ho +bB +dJ +dJ +MW +eG +OC +OC +pF +dJ +xs +dJ +dJ +Ex +Ex +Ex +zx +zx +Ex +Ex +Ex +zx +nt +Fv +VN +ci +TP +VN +Fv +bX +bX +vS +Bt +OK +Bt +fH +ty +RA +ty +fH kL -aR -yE -Ke -fG -aR -Xa -wl -Wf -Xa -XL -cR -XL -fc -fc -fc -fc -fc -fc -fc -Vc -Vc kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (43,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sA -sA -Dh -Sd -Sd -mM -iD -eD -hi -AH -jK -dB -Kb -tR -is -Ok -EI -mx -Fh -GX -Za -Za -Za -Za -Za -Za -Za -Za -Ji -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +FL +bt +hU +Ct +bQ +UI +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +uA +uA +lY +lY +lY +lY +lY +lt +Tp +Tp +Tp +lt +Ev +xa +Bn +tF +OY +MZ +OY +Bn +OC +hr +ui +Qz +DT +TR +qT +ui +Pk Dc Dc ZI -ZI -ZI -Ji -Wv -ZI -ZI +TY +Hs +pa +pa ZI py Cu @@ -16677,516 +21909,323 @@ py kL kL kL -Ji -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL -kL -kL -zh -sZ -zh -kL -kL -kL -kL -Ji -kL -kL -kL -Ji -kL -kL +TY kL -Ji kL kL -kL -py -Cu -py +TY kL kL kL -YN -Un -Un -Un +TY kL kL kL -Ji -Ji -Ji +Ir +dJ +dJ +dJ +Ir +pa +pa +pa +TY +pa +pa +pa +TY +pa +pa +pa +pa +pa +Ir +dJ +dJ +MW +eG +OC +OC +pF +dJ +xs +dJ +dJ +Gs +Rp +Pf +IJ +IJ +Lt +Rp +Gs +Rq +dQ +Fv +yM +cv +Ks +VN +Fv +Ex +Ex +vS +BV +zB +Is +fH +Bo +cm +DB +fH kL -aR -yE -Ke -fG -aR -AR -mh -Cc -MK -XL -XL -XL -lF -lF -lF -lF -lF -lF -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (44,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -SM -SM -SM -sV -mM -Zh -gw -Wk -WV -ng -gI -Qb -fS -iT -vG -KL -CD -Vp -Vp -GX -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -xT -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI -ZI -ZI -Wc -hW -ZI -ZI +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +SV +bt +mX +Ct +st +Bz +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +Yw +uA +AF +lY +lY +AF +AF +lt +Tp +Tp +Tp +lt +xa +Um +Kj +Kj +Ky +IP +Kj +Kj +OC +hr +ui +vC +Ba +Hw +qa +ui +Pk +Dc +Rv ZI -Ji -Wv -Ji -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -Wt -Dp -PI -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -kL -Ji -Wv -Ji -pa -pa +DL +Zj pa -OC -DU -DU -RZ pa pa +TY +Hs +TY pa pa pa pa pa -rZ -yE -Ke -fG -aR -MK -gC -WO -MK -aR -ZH -lF -lF -lF -ZH -lF -lF -lF -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(45,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -rS -rS -rS -Hi -Sd -lf -gw -vd -WV -ng -gI -tS -fS -tr -sO -tq -gw -GX -GX -GX -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -sd -sd -sd -sd -sd -sd -hW -hW -hW -sd -sd -Dc -Dc -Dc -Dc -Dc -Dc -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -eE -aj -eE pa pa pa -jy -Zq -jy pa pa pa -eE pa pa pa -eE pa +Ir +dJ +dJ +dJ +Ir pa pa -sZ -kL -kL -kL -sZ -Wt -xX -PI -sZ -kL -kL -kL -sZ -kL pa pa -AU pa pa pa -AU pa pa pa -jy -dT -jy pa pa pa +Ir +dJ +dJ +MW +eG OC OC -OC -OC -pa -pa -pa -vo -vo -vo -vo -rZ -yE -Ke -fG -aR -aR -aR -aR -aR -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +pF +bB +UT +bB +bB +Gs +Rp +Lt +IJ +IJ +Lt +Rp +Gs +Pz +fK +Fv +VN +hS +Ku +VN +Fv +cR +cR +vS +Ne +Ox +Bt +fH +Uf +jL +ty +fH +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(46,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(45,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17194,193 +22233,580 @@ Dz Dz Dz Dz -gw -OG -pl -ng -gI -GP -fS -iT -sO -PE -gw Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -sd -TG -TG -TG -TG -TG -sd -Dc -Dc -Dc -Dc -Dc -Dc -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -PJ -AU -AU -DV -AU -CT -UN -BP -AU -DV -AU -AU -AU -AU -AU -AU -AU -AU +Dz +Dz +Gd +Tp +gE +bt +Ds +Ct +Cf +ls +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +Yw +Um +Um +Ev +Ev +Um +lt +lt +Tp +Tp +Tp +lt +lt +Um +Qs +Kz +eT +YT +QS +Kj +Su +hr +ui +ui +ui +ui +ui +ui +oY +Sq +Sq +ZI +Zq +jy pa -sZ -sZ -Pb -hM -hM -Pt -GS -Pt -hM -hM -sZ -sZ -sZ -kL -AU -AU -AU -AU -AU -AU -AU -AU -DV -AU -CT -UN -BP -AU -DV +pa +pa +jy +Zq +jy +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +iP +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +pa +yk +QA +pF +OC +OC +OC +OC +OC +OC +OC +Gs +Rp +Lt +IJ +IJ +Lt +Rp +Gs +Pz +fK +Fv +Fv +dL +jQ +Fv +Fv +XL +XL +vS +vS +Ch +vS +fH +fH +AS +fH +fH +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(46,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +SV +bt +ZV +Dd +pX +vw +KN +Gd +Yw +Yw +Yw +Dz +Yw +Yw +Yw +Um +xa +Ev +Ev +iR +lt +Tp +Tp +Tp +Tp +Tp +lt +Cm +eT +JL +Go +nO +QS +Kj +OC +hr +hr +NE +KV +KV +KV +KV +KV +KV +KV +YO +uY +kz +KV +gL +KV +YO +uY +kz +KV +gL +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +KV +jr +KV +YO +uY +kz +KV +KV +KV +UP +IT AU AU +Gs +IJ +Lt +IJ +IJ +Lt +IJ +Gs +Pz +Qp +XH +gP +zA +IS +CL +rq +LJ +Qk +NI +oR +tO +Vh +RS +yO +SS +JQ +XL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(47,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Gd +Tp +SV +bt +KN +KN +LR +nc +KN +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +xa +Ev +Ev +aM +RC +Tp +Tp +Tp +Tp +Tp +lt +MG +IU +hn +hn +yq +Oq +Kj +OC +OC +OC +OC AU AU AU AU AU AU +oc +Ob +BB +lM +oc +oW +oc +Ob +BB +lM +oc +oW +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +oc +eA +oc +Ob +BB +lM AU AU AU AU -DV -ff -Ke -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Uk +sq +sq +jo +rW +vk +vk +vk +vk +vk +UL +mj +xw +zZ +sk +pG +Mm +JW +Xv +jD +Rk +Nc +HR +jD +wg +jD +EP +tz +pD +XL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(47,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(48,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17388,70 +22814,83 @@ Dz Dz Dz Dz -gw -YH -sg -ht -fE -GP -fS -tr -sO -XG -gw Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -TG -TG -TG -TG -TG -TG -hW -Dc -Dc -Dc -Dc -Dc -Dc +Dz +Dz +Dz +Gd +oo +jz +bt +on +Nk +bp +DY +yd +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +at +Ev +Ev +lk +RC +Tp +Tp +wf +Tp +fN +lt +JU +IU +hn +wd +oP +vm +Kj +Sq +Sq +Sq +Sq +Sq AU AU AU AU AU AU +CT +AM +BP AU +DV +sW +CT +AM +BP +sW +DV +AU +AU +sW AU AU AU AU AU AU -PJ AU AU -DV AU -CT -AM -BP AU -DV AU AU AU @@ -17460,21 +22899,6 @@ AU AU AU AU -pa -sZ -sZ -WL -ZR -hM -sZ -GS -sZ -hM -ZR -sZ -sZ -sZ -kL AU AU AU @@ -17483,292 +22907,100 @@ AU AU AU AU -DV AU +AU +ge +sW CT AM BP AU -DV AU AU -Cp -sq -sq -sq -sq -sq -sq -sq -sq -sq -dq -Jv -KS -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(48,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Dz -Dz -Dz -Dz -Dz -Dz -Dz -Dz -gw -yV -lZ -nu -lN -fS -iT -sw -PE -gw -Dz -Dz -Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -TG -TG -TG -fo -TG -TG -hW -Dc -Dc -Dc -Dc -Dc -Dc -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -PJ -AU -AU -DV -AU -CT -AM -BP -AU -DV -AU -AU -AU -AU -AU -AU -AU -Py -wt -HU -rs -Ai -YF -hE -YF -DH -sZ -Yq -sZ -sZ -sZ -sZ -kL -AU -AU -AU -AU -AU -AU -AU -AU -DV -AU -CT -AM -BP -AU -DV -AU AU Hf +sW AU -AU -AU -AU -AU -AU -AU -AU -AU -DV -Iz -nn -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +uu +yn +WJ +WJ +WJ +tH +WJ +WJ +jP +rp +Fv +UU +dL +jQ +UU +XL +pP +Kv +PL +fc +fc +fc +fc +wQ +fc +fc +fc +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (49,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17777,62 +23009,62 @@ Dz Dz Dz Dz -gw -gw -gw -gw -gw -gw -gw -gw -gw -gw Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -TG -TG -TG -TG -TG -TG -hW -Dc -Dc -Dc -Dc -Dc +Dz +Dz +Gd +Ud +dC +dC +Vo +mB +Pg +OQ +yd +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +xa +Ev +Ev +aM +RC +Tp +Tp +Tp +Tp +Tp +lt +kE +PW +gQ +gQ +nG +CV +zP +pj +pj Dc +np Sq -pF -pF -pF -pF -pF AU AU -pF AU AU AU AU -DA -Cg Cg +DA +pF +pF pa pa jy @@ -17844,35 +23076,35 @@ pa pF pF Xh -pa -AU -AU -AU -pa -kL -kL -kL -kL -kL -sZ -sZ -sZ -kL -kL -kL -kL -kL -kL -AU +pF +pF +pF +pF +pF +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +vD AU AU -vD -vD -vD -vD -vD -vD -pa +qh +qh +qh +vc +qh +qh +qh +lF +lF jy Zq jy @@ -17880,89 +23112,89 @@ pa pa pa pa -FA +FZ pa EY EY EY EY +mK +kM EY EY EY -EY -EY -yE -Ke -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Pz +fK +Fv +wb +hS +Ku +wb +Fv +XL +XL +XL +fc +fc +qW +rK +vh +rK +qW +fc +kL +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (50,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -17970,107 +23202,107 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -TG -TG -TG -TG -sd -TG -TG -Ta -TG -TG -sd -Dc -Dc -Dc -Dc -Dc -Dc -Ps -Dc -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +xa +yI +yI +Ko +lt +Tp +Tp +Tp +Tp +Tp +lt +gp +ii +ta +oz +nj +nj +Kj Dc +pj Dc -pF +Aj +Sq +Ru AU AU pF -xT -xT -xT -Jy -Jy -ig -tb -ZI -ZI -Za +vB +hu +VR +eE +eE +eE +pa +pa +Yw ai -Za +Yw kL kL kL iS eE eE -pa -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU +pF +eE +eE +eE +eE +kf +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +vD AU AU -AU -AU -AU -AU -AU -AU -Mv -sZ -sZ -sZ -sZ -Mv -Ji -Za +qh +ZH +ZH +ZH +ZH +OM +dP +lF +eO +Yw ai -Za -Ji +Yw +eO lF ZH ZH @@ -18080,190 +23312,190 @@ EY Hp Sp Yc -TF +Sp pS Bg pS EY -Em -Zi -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH -ZH +Gl +BH +Fv +zp +ha +Pl +kw +Fv ZH ZH ZH ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +fc +WA +bk +SU +jJ +bN +fc +kL +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (51,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -sd -sd -sd -sd -sd -sd -sd -sd -sd -sd -sd -sd -hW -hW -ZI -ZI -ZI -ZI -ZI -Dc +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Um +Um +Um +Um +Um +lt +lt +zz +zz +zz +lt +lt +Kj +Kj +Kj +Kj +Kj +Kj +Kj Dc +pj Dc Dc -pF +Sq +AU AU AU pF -xT -xT -Jy -Jy -Jy -Jy -Jy -ZI -Ji -Za +Cg +Cg +pF +eE +eE +eE +pa +pa +Yw ai -Za -Ji +Yw +eO kL kL eE eE YG -pa -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU +pF +eE +eE +eE +eE +kf +Ly +zM +xk +iq +HJ +HJ +HJ +PK +nb +Ro +Ly +vD AU AU -Mv -sZ -sZ -sZ -sZ -Mv +qh +ZH +ZH +ZH +ZH +OM +Yr +lF kL -Za +Yw ai -Za +Yw kL lF lF @@ -18277,146 +23509,146 @@ Sc Sp GB GB -GB +wB EY -yE -Ke -fG -aR -ZH -ZH -ZH -ZH -ZH -ZH -pf -ZH -ZH -ZH -ZH +Pz +fK +Fv +kw +Ii +bD +kw +Fv ZH ZH -lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +wP +xA +fc +tf +rK +NR +rK +WA +fc +kL +Yw +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (52,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI -Ji -Ji +eO +eO py py py py -Ji -Ji -Ji +eO +eO +eO py py py py -Ji -Ji +eO +eO hW Dc -Dc -Dc -Dc -pF +pj +pj +pj +JD AU AU -pF -xT -Jy -Jy -Jy -Jy -Jy -Jy -ZI -ZI +AU +iP +vo +vo +vo +vo +eE +eE +pa +pa py Cu py @@ -18426,42 +23658,42 @@ kL eE eE eE -pa -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU -AU +pF +eE +eE +eE +eE +kf +Ly +yJ +Om +HG +HG +HG +HG +vp +sv +xE +Ly +vD AU AU -AU -AU -AU -AU -Mv -sZ -sZ -sZ -sZ -Mv +qh +ZH +ZH +ZH +ZH +AO +eW +lF kL -Za +Yw ai -Za +Yw kL lF lF -ZH +Hj Lq ZH EY @@ -18473,147 +23705,147 @@ Sp Sp NP EY -yE -Ke -Bh -Gs -Gs -Gs -Gs -Gs -Gs -Gs -Gs -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Pz +fK +Fv +Fv +Fv +Fv +Fv +Fv +Fv +XL +XL +xA +fc +iB +RH +IB +UZ +Lu +fc +kL +eO +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (53,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +im +im +bt +im +im +bt +VC +VC +xj +xj +xj +xj +VC +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO ZI -Ji -Ji +eO +eO CG CG -lK -lK +qc +qc CG -lK -lK +qc +qc CG CG -Mf -Us +eH +Sh CG CG -Ji +eO hW Dc Dc Dc -Dc -pF +pj +Sq +AU AU AU pF -Jy -Jy -Jy -Jy -Jy -ZG -yl -ZI -ZI -XF -sG -XF +eE +eE +EW +vo +hl +qv +pa +pa +bR +CA +bR kL kL kL @@ -18621,44 +23853,44 @@ eE eq pq pa -kL -kL -kL -kL -kL -kL -kL -kL -Mv -jE -jE -jE -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv -Mv sZ sZ sZ sZ -Mv +kf +Ly +yJ +XE +SD +oO +oO +oO +PX +kJ +xE +Ly +vD +AU +AU +qh +ZH +ZH +ZH +ZH +Ff +jk +lF kL -Za +Yw ai -Za +Yw kL lF lF cC zf Qc -zI +xo XK XK Pj @@ -18667,111 +23899,111 @@ Ck hk rO EY -yE -Ke +Pz +fK Ws Qa Qa -Qa -HQ +wm +bF Qa MA mb Gs -ZH -ZH -ZH -ZH -ZH -ZH -ZH -lF -lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +xA +fc +fc +fc +fc +fc +fc +fc +kL +eO +Yw +Yw +Yw +Yw +Dz +Dz +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (54,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +Be +Be +Be +Be +Be +Be +VC +lQ +GZ +GZ +GZ +GZ +hZ +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO py CG Wp @@ -18779,32 +24011,32 @@ aW XC fM WZ -oS zb +oS HA Gh QJ -Xu -RB +yX +ME py ZI Dc Dc Dc -np -pF +gU +Sq AU AU pa -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI +pa +pa +pa +pa +pa +pa +pa +pa +pa Cu py py @@ -18819,34 +24051,34 @@ sZ sZ sZ sZ -sZ -sZ -sZ -kL -Mv -gz -gz -gz -Mv -sZ -sZ -sZ -Fd -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv -Ji -Za +kf +Ly +yJ +XE +Pd +pm +pm +pm +vl +kJ +xE +Ly +vD +AU +AU +qh +ZH +ZH +ZH +ZH +ZH +ZH +lF +eO +Yw ai -Za -Ji +Yw +eO lF ZH hH @@ -18861,113 +24093,113 @@ Sp kZ Bp EY -ur -Ke +zk +fK IJ IJ cc WJ -NN +OI WJ MA mb Gs -ZH -ZH -ZH -ZH +xA +xA +xA +xA ZH ZH ZH lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(55,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(55,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +kO +NZ +NZ +NZ +NZ +Be +zD +RL +GZ +GZ +GZ +GZ +GZ +xj +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO py -Xu +ky US Hb Hb @@ -18978,21 +24210,21 @@ zb HA Gh cA -Xu -RB +Am +ME py ZI Dc Dc Dc -Aj -pF +dI +Sq AU AU pa py Cu -Wv +mp Cu Cu Cu @@ -19005,7 +24237,7 @@ py py py py -Ji +eO py py kL @@ -19013,29 +24245,29 @@ sZ sZ sZ or -sZ -sZ -sZ -kL -Mv -gz -gz -gz -Mv -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv +kf +Ly +cS +XE +Pd +pm +pm +gM +vl +kJ +yU +Ly +vD +AU +AU +qh +ZH +ZH +ZH +ZH +ZH +ZH +lF kL py Vd @@ -19054,13 +24286,13 @@ Iv Sp Sp Sp -Sp -yE -Ke +mK +Pz +fK IJ IJ Bh -Gs +na Gs qx Gs @@ -19068,100 +24300,100 @@ Gs Gs Gs Gs -Gs -Et -Gs -ZH ZH +xA +qh +qh +qh lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (56,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +be +iC +NZ +NZ +NZ +Be +zD +IY +GZ +Yb +XJ +GZ +GZ +xj +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO py -Xu +ky hY Hb zb @@ -19174,15 +24406,15 @@ hW Nl CG CG -Ji +eO ij tT vP vP vP vP -VM -VM +Pr +qw ij Cu BT @@ -19207,29 +24439,29 @@ sZ sZ sZ Cv -sZ -sZ -sZ -kL -Mv -gz -gz -gz -Mv -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -sZ -Mv +kf +Ly +yJ +XE +Pd +pm +pm +pm +vl +kJ +xE +Ly +vD +AU +AU +qh +qh +qh +vc +qh +qh +qh +lF kL py Vd @@ -19237,7 +24469,7 @@ py kL lF lF -hH +jB ZH ZH EY @@ -19247,113 +24479,113 @@ op Iv Sp fw -Sp -kM -yE -Ke +lD +EY +ar +fK IJ IJ Bh -na +AZ Yy EF EF -lo +Xb EF -yH -na -Pz -Bh +Iw Gs ZH +xA +qh +ZH +ZH +ZH ZH lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (57,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +zz +be +iC +NZ +NZ +NZ +Be +zD +RL +GZ +Dv +xO +Ak +cQ +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO ZI -Ji +eO py CG Tw @@ -19369,16 +24601,16 @@ wv tD Ow py +Bm +NU +zV +NU +eh +vP +nS +nS ij -Rh -Rh -Rh -Rh -Rh -Rh -Rh -ij -Wv +mp BT mR mR @@ -19395,35 +24627,35 @@ mR mR mR BT -Ji +eO kL LS sZ sZ sZ -sZ -sZ -sZ -kL -Mv -nM -nM -nM -Mv -Mv -Mv -sZ -sZ -sZ -aq -aq -sZ -sZ -sZ -sZ -sZ -sZ -Mv +kf +Ly +yJ +XE +Tb +cG +cG +cG +Nn +kJ +xE +Ly +vD +AU +AU +qh +GA +Qu +Wh +Wh +Wh +Zg +lF kL py Vd @@ -19443,8 +24675,8 @@ Sp Sp sE kM -yE -ed +Pz +SO IJ IJ Bh @@ -19454,101 +24686,101 @@ cw gY cw FP -ol -na -Pz -Bh +cw Gs ZH +xA +gd +ZH +ZH ZH ZH lF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (58,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +zz +be +iC +NZ +NZ +NZ +Be +VC +gs +GZ +GZ +yb +VC +VC +VC +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI -Ji +eO CG yg bZ @@ -19563,14 +24795,14 @@ tt vg WW CK -uL -JK -ji -ji -ji -ji -Rh -Rh +EC +dH +dH +Wd +fL +GM +cZ +nS ij Cu BT @@ -19595,34 +24827,34 @@ kL kL kL kL -kL -sZ -sZ -kL -Mv -gz -gz -gz -gz -MX -ih -sZ -sZ -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv -Ji -Za +kf +Ly +yJ +Gk +oF +oF +oF +oF +kl +Wz +xE +Ly +vD +Cn +Cn +qh +TK +aS +jk +jk +jk +fG +lF +eO +Yw ai -Za -Ji +Yw +eO lF ZH hH @@ -19637,8 +24869,8 @@ Sp EA LM kM -yE -ed +Pz +SO IJ IJ fu @@ -19647,102 +24879,102 @@ Qa Qa Qa Qa -Qa -Qa -Qa -Vl -Bh +xh +IJ Gs ZH +xA +qh +ZH +ZH +ZH ZH lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (59,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +zz +be +QC +kO +kO +kO +Be +VC +CH +Cr +GZ +Oz +xj +Ye +Ye +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI -Ji +eO CG Hb Sq @@ -19754,17 +24986,17 @@ CG Th Zy gx -xu +CR Xy py -ij -Rh -Rh -Rh -Rh -ji -Rh -Rh +Lv +NU +KD +NU +EH +vP +cZ +nS ij Cu BT @@ -19786,39 +25018,39 @@ BT py py py -Ji +eO py py -kL -kL -sZ -kL -Mv -gz -gz -gz -gz -MX -dn -sZ -sZ -sZ -sZ -sZ -sZ -hM -sZ -sZ -sZ -sZ -Mv -kL -Za -ai -Za -kL +kf +Ly +AD +tP +bG +In +fF +rM +dW +tP +Aw +Ly +WU +GW +GW +qh +TK +jk +jk +jk +jk +fG +lF lF +JT +CP +JT lF +lF +ZH hH ZH ZH @@ -19831,8 +25063,8 @@ ae EY EY EY -yE -ed +Pz +aC WJ WJ Cl @@ -19841,108 +25073,108 @@ Hg og og HC -Qo -fW -fm -LE -cH +Jw +IJ Gs ZH +xA +qh +ZH +ZH +ZH ZH lF -lF -lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (60,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -ZI -ZI -ZI -Ji -CG -Dc -Dc -Dc -Dc -zb +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +Bb +IM +IM +IM +lb +VC +VC +CH +Cr +oI +cg +xj +Ye +Ye +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ZI +ZI +ZI +eO +CG +Rv +Dc +Dc +Dc +zb IZ CG ZQ @@ -19955,10 +25187,10 @@ ij ij ij ij -Rh -ji -Rh -Rh +vP +vP +cZ +nS ij Cu BT @@ -19984,35 +25216,35 @@ UK UK py py -kL -kL -kL -Mv -gz -gz -KX -KX -Vg -ZA -mg -mg -mg -mg -mg -sZ -Mv -Mv -mO -Mv -Mv -Mv -kL -Za -ai -Za -kL -lF -lF +Ly +Ly +Ly +Ly +Ly +Ly +Fn +Ly +Ly +Ly +Ly +WU +GW +GW +eV +TK +jk +jk +jk +jk +fG +sm +ZH +ZH +Rx +ZH +ZH +eV +ZH jh ZH Wi @@ -20025,8 +25257,8 @@ TL MJ qs EY -yE -Cy +Pz +Fq Gs Gs Gs @@ -20034,106 +25266,106 @@ Gs Fk Gs Gs -KA -PZ -PZ -KA -Gs Gs +yQ +yQ Gs ZH -ZH +xA +qh +qh +qh lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (61,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +Tp +Tp +Tp +Tp +qA +VC +VC +VC +VC +kr +Oz +xj +Ye +Ye +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ZI ZI py CG -Dc -Dc +JN +JN Dc Dc zb @@ -20143,16 +25375,16 @@ KY Nz Nz fT -Lk +aQ Dl wK wK wK SH -Rh -ji -Rh -Rh +nS +nS +cZ +nS ij Cu BT @@ -20172,41 +25404,41 @@ FC qg UK MU -lX -lX +vM +vM MU UK UK py -kL -Mv -Mv Mv -Mv -gz -KX -KX -Xx -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -sZ -sZ -kL -kL -Za -ai -Za -kL -lF -lF +Bj +Bj +Bj +Ly +RR +iV +KG +Ly +WU +WU +WU +Vk +wx +PQ +GG +jk +jk +jk +jk +fG +jk +iY +ZH +Rx +ZH +ZH +ZH +ZH Yj ZH Wi @@ -20219,21 +25451,21 @@ De Sx Ha kM -yE -Cy -aR +Pz +Fq +Gs ZH ZH qh pM -ph -ZH -KA -eC -eC -KA -ZH -ZH +XT +xA +Bv +fi +fi +On +xA +xA ZH ZH ZH @@ -20241,91 +25473,91 @@ ZH lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (62,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +im +lO +Tp +IO +Tp +cq +Nx +vE +bL +VP +QO +un +VC +Ye +Ye +Yw +Yw +Yw +Yw +Yw ZI ZI Dc Dc ZI py -Xu +ky vi vi Dc @@ -20337,18 +25569,18 @@ WZ zb zb Tm -Lk +JJ Dl wK wK wK SH -Rh -ji -Rh -Rh +nS +cZ +cZ +nS ij -Wv +mp BT qg FC @@ -20365,41 +25597,41 @@ oC FC qg UK -VT -dO -lX -lX +iM +Lh +kx +kx jg UK -Ji -Ji -Mv -vU -vU -dN -gz -KX -KX -Xx -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -LS -sZ -kL -Ji -Za -ai -Za -Ji -lF +eO +eO +Bj +CI +CI +Ly +gg +vX +xv +Ly +WU +GW +GW +Qg +GW +qh +Tc +wH +wH +wH +Gt +KC +qh +qh +qh +ML +ZH +ZH +qh uk Fs ZH @@ -20413,21 +25645,21 @@ Sy Xd UF EY -jx -uo -aR +an +IW +Gs ZH ZH qh pM -ZH -ZH -KA -eC -OA -KA -ZH -ZH +xA +xA +Bv +fi +fi +On +xA +su ZH ZH ZH @@ -20436,82 +25668,82 @@ lF lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (63,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +bt +im +im +bt +im +im +VC +jR +go +js +dD +Ia +VC +Ye +Ye +Yw +Yw +Yw +Yw ZI ZI Dc @@ -20519,30 +25751,30 @@ Dc Dc ZI py -Xu -tY -tY +ky +WG +Pm Dc Dc zb Dm -DQ +WF sr QQ QQ kW -Gb +Qx Dl wK wK wK SH -Rh -ji -Rh -Rh +nS +cZ +nS +nS ij -Wv +mp BT qg FC @@ -20565,36 +25797,36 @@ lX lX ZF UK -eI -Mv -Mv -gz -gz -dN -gz -KX -KX -Xx -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -sZ -sZ -kL -kL -Za -ai -Za -kL -lF -lF +fO +Bj +Bj +Cj +Cj +Ly +Ly +FS +Ly +ZW +WU +GW +GW +Qg +GW +qh +vc +qh +qh +qh +qh +qh +qh +PP +qh +ML +ZH +ZH +qh +qh qh qh Wi @@ -20606,15 +25838,15 @@ An aN fx QL -ae -MS -Cy -aR -ZH +Hh +To +Fq +Gs +Hj ZH qh pM -ZH +xA KA KA PZ @@ -20623,7 +25855,7 @@ KA KA KA KA -KA +VF KA KA KA @@ -20631,86 +25863,86 @@ KA KA uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (64,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Gd +Gd +Gd +Gd +Gd +Gd +Gd +Yw +Yw +Yw +Yw +Yw +ZI +ZI +ZI +ZI ZI ZI -Dc -Dc -Dc -Dc ZI py CG @@ -20719,7 +25951,7 @@ vi Dc Dc zb -nU +sp CG dK AA @@ -20727,16 +25959,16 @@ oL BY CG ij -SC -SC -SC +SH +SH +SH ij -Rh -ji -Rh -Rh +nS +cZ +kR +Uy ij -Wv +mp BT qg FC @@ -20759,36 +25991,36 @@ lX lX os UK -Ji -Mv -Mv -gz -gz -nM -gz -KX -KX -Tt -KP -mg -mg -mg -mg -mg -sZ -Mv -sZ -sZ -sZ -kL -kL -kL -Za -ai -Za -kL -lF -lF +eO +Bj +Bj +Cj +Cj +Ad +Cj +Gc +Cj +Cj +WU +GW +GW +Qg +qh +qh +ZH +ZH +ZH +ZH +ZH +PP +PP +PP +qh +nQ +ZH +ZH +ZH +qh Bd Bd Wi @@ -20801,14 +26033,14 @@ LT bY LA kM -yE -Cy -aR -qh -yu +Pz +Fq +Gs +ZH +ZH qh pM -ZH +xA KA Qf eC @@ -20826,79 +26058,79 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (65,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI Dc Dc @@ -20906,29 +26138,29 @@ Dc Dc Dc ZI -Ji +eO CG CG -lK -lK +qc +qc CG -lK -lK +qc +qc CG -bo -bo -bo -ic +VG +VG +VG +FO CG ij -Rh -Rh -Rh -Rh -Rh -ji -Rh -Rh +nS +nS +nS +nS +nS +cZ +ce +kR ij Cu BT @@ -20953,36 +26185,36 @@ lX lX UK UK -Ji -Mv -Mv -gz -gz -nM -gz -KX -KX -Tt -Vg -Sf -Sf -Ec -Ec -mg -sZ -xf -sZ -sZ -sZ -kL -kL -kL -Za -ai -Za -kL -lF -lF +eO +Bj +Bj +Cj +Cj +Ad +Cj +qK +aB +aB +vR +wx +wx +Gg +qh +ZH +ZH +PP +ZH +ZH +ZH +ZH +ZH +PP +qh +ML +ZH +ZH +qb +qh xA xA vj @@ -20994,15 +26226,15 @@ Jb mI Sp QL -ae -MS -OD -aR -ZH +Hh +To +Lg +Gs ZH ZH +qh pM -ZH +xA KA SK eC @@ -21020,79 +26252,79 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (66,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI Dc Dc @@ -21100,29 +26332,29 @@ Dc Dc Dc ZI -Ji -Ji +eO +eO py py py py -Ji -Ji -Ji +eO +eO +eO py py py -Ji +eO ij ij -Gm -Rh -Rh -Rh -ji -ji -Rh -Rh +Dx +nS +nS +nS +nS +cZ +ce +kR ij Cu BT @@ -21147,35 +26379,35 @@ bM Fo UK py -Ji -Ji -Mv -gz -gz -Mv -gz -KX -KX -KX -KX -Iy -Iy -Iy -Ec -mg -sZ -Mv -sZ -sZ -sZ -sZ -kL -Ji -py -ql -py -Ji -lF +eO +eO +Bj +Cj +Cj +Bj +Cj +Gc +Cj +Cj +NM +GW +GW +GW +qh +ZH +PP +bf +bf +bf +ZH +ZH +ZH +PP +qh +ML +ZH +ZH +ZH ZH xA xA @@ -21189,14 +26421,14 @@ Sy Sp UF EY -yE -OD -aR -ZH +Pz +Lg +Gs ZH ZH +yu pM -ZH +xA KA JH eC @@ -21214,79 +26446,79 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (67,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ZI ZI ij @@ -21309,12 +26541,12 @@ ij ij ij Rh -Rh -Rh -Rh -Rh -ji -He +nS +nS +nS +nS +nS +xl pJ pJ ij @@ -21340,37 +26572,37 @@ UK hx es UK -Ji -Ji -Mv -Mv -Mv -gz -Mv -gz -gz -gz -gz -gz -gz -gz -gz -hM -sZ -sZ -Mv -Mv -Mv -sZ -kL -kL -kL -Ji -Gz -Ji +eO +eO +Bj +Bj +Bj +Cj +Bj +Cj +Gc +Cj +Cj +Bj +GW +GW +GW +qh +ZH +ZH +bf +bf +bf +ZH +Ny +PP +PP kL +Nb +Un lF -lF +ZH +ZH xA xA vj @@ -21383,14 +26615,14 @@ OJ zr Xo kM -yE -OD -aR -ZH +Pz +Lg +Gs ZH ZH +qh pM -ZH +xA KA YK eC @@ -21408,82 +26640,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (68,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh Rh @@ -21500,15 +26732,15 @@ Rh Rh Rh Rh +qP +nS +nS +nS +nS +nS Rh Rh -ji -ji -ji -ji -ji -ji -Fu +Ut OF Tx ij @@ -21534,38 +26766,38 @@ UK UK UK UK -Ji -Ji -Mv -Mv -Mv -Mv -Mv -gz -gz -gz -gz -gz -gz -gz -gz -hM -sZ -sZ -Mv -Mv -Mv -kL -kL -kL -kL -Ji -Wv -Ji +eO +eO +Bj +Bj +Bj +Bj +Bj +Cj +ID +Cj +Cj +Bj +GW +GW +GW +qh +ZH +ZH +ZH +ZH +ZH +ZH +PP +PP +PP kL +ai +Yw lF -lF -mG +Ry +ZH +xA xA vj vj @@ -21574,17 +26806,17 @@ vj vj EY EY -Ig +Bl EY EY -yE -OD -aR -ZH -ZH -ZH -pM +Pz +Lg +Gs +Hj ZH +qh +hd +xA KA Yu eC @@ -21602,82 +26834,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (69,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh pu @@ -21694,19 +26926,19 @@ Qr Qr bq Rh +nS +nS +nS +nS +nS +nS Rh Rh -ji -Rh -Rh -Rh -Rh -Rh -li +BW PY yW ij -Wv +mp BT mR mR @@ -21723,60 +26955,60 @@ mR mR mR BT -Ji -Du -py -py -py -py -Ji -Mv -Mv -Mv -Ji -Mv -Mv -Mv -Un -Un -Mv -wI -wI -wI -Mv -Un -Un -Mv -Mv -Mv -Ji -kL -kL -kL -Ji -Wv -Ji -kL +eO +RN +py +py +py +py +eO +Bj +Bj +Bj +MD +Bj +Bj +Bj +jm +jm +Bj +Vv +Vv +Vv lF +JT +JT lF +lF +lF +lF +lF +lF +lF +kL +ai +Yw +lF +sb +ZH xA -xA +ZH ak GW GW GW GW -rC -PD -Wh -Wh -Wh -ff -Cy -aR +SY +Rq +Qa +Qa +Qa +XO +Fq +Gs ZH ZH -xA +qh UW tu XI @@ -21796,82 +27028,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (70,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh pu @@ -21888,15 +27120,15 @@ zb Qr Qr Rh -Rh -Rh +nS +nS +cZ +cZ +cZ +cZ +ji +ji ji -Rh -Rh -Rh -Rh -Rh -Rh PY tc ij @@ -21917,41 +27149,41 @@ BT BT BT BT -Ji -Ji -Ji -Ji -Ji -Ji -Ji -XF -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +bR +eO +eO py py py py py -Ji -Un -yZ -yZ -yZ -Un -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Wv -Ji -Ji +eO +Xg +pw +pw +pw +Xg +eO +eO +eO +eO +eO +eO +eO +eO +eO +Yw +ai +Yw lF +Pu ZH xA xA @@ -21960,19 +27192,19 @@ GW GW GW GW -rC -Tc -wH -wH -wH -wH -gV -aR +Lo +yn +WJ +WJ +WJ +tH +lR +Gs ZH ZH -xA -wD -rn +qh +Hy +bx KA Yk eC @@ -21990,136 +27222,136 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (71,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt -Rh -Rh -Jy -HS -Dc -Dc -cL -cL -cL -cL -cL -zb -zb -zb -Qi -Rh -Rh -Rh -ji -Rh -Rh -Rh -pJ -iE -Rh -PY -zU -ij -py +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn +Rh +Rh +Jy +HS +Dc +Dc +cL +cL +cL +cL +cL +zb +zb +zb +Qi +Rh +nS +nS +cZ +Rh +Rh +Rh +pJ +iE +Rh +PY +AC +ij +py Cu -Wv +mp Cu Cu Cu Cu -Wv -Wv +mp +mp py si py -Wv -Wv -Wv +mp +mp +mp Cu -Wv -Wv +mp +mp Cu Cu -UQ -UQ -Wv -Wv -sG -Wv +hj +hj +mp +mp +CA +mp Cu TV TV @@ -22127,46 +27359,46 @@ TV Cu Cu Cu -YN -sF -sF -sF -YN -Wv +yh +qV +qV +qV +yh +mp Cu Cu -UQ -UQ +hj +hj TV -Wv -Wv -Ji -Ji -Wv -Ji -kL +mp +mp +eO +eO +mp +eO lF -lF -xA +ZH +ZH xA +qb ak vT pL GW GW -Ib -aR -aR -aR -aR -aR -ea -aR -ZH -ZH -xA -wD -SL +Gs +Gs +Gs +Gs +Gs +Gs +CU +Gs +qh +qh +qh +Hy +mS KA Eq eC @@ -22184,82 +27416,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (72,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Sn Rh Rh pu @@ -22276,9 +27508,9 @@ zb Qr Qr Rh -Rh -Rh -ji +nS +nS +cZ Rh He ld @@ -22288,32 +27520,32 @@ PY PY Tx ij -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI +Ab +Ab +Ab +Ab +Ab +Ab +Ab +Ab ZI Cu py Cu -Ji -Ji -Ji +eO +eO +eO py -Ji -Ji +eO +eO py py -Ji -Ji -Ji -Ji -XF -Ji +eO +eO +eO +eO +bR +eO py py py @@ -22321,36 +27553,36 @@ py py py py -Un -GE -GE -GE -Un -Ji +Xg +JV +JV +JV +Xg +eO py py -Ji -Ji +eO +eO py -Ji -Ji -Wv -Ji -Wv -Ji -kL +eO +eO +mp +eO +mp +eO lF lF +ZH xA -xA +ZH ak uw nR GW GW ak -ZH -ZH +Hz +gZ ZH ZH ZH @@ -22358,9 +27590,9 @@ vA ZH ZH ZH -xA -wD ZH +Hy +xA KA VZ EG @@ -22378,82 +27610,82 @@ KA uX uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (73,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -qt +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Sn Rh Rh pu @@ -22470,9 +27702,9 @@ Qr Qr eF Rh -Rh -Rh -ji +nS +nS +cZ Rh Fu xJ @@ -22482,32 +27714,32 @@ lJ SW Of ij -Dc -Dc -Dc -Dc -Dc -Dc -Dc -ZI +ne +ne +ne +ne +ne +ne +ne +Ab ZI py hQ py -Ji -Ji -Ji +eO +eO +eO py -Ji -Ji +eO +eO py py -Ji -Ji -Ji -Ji -XF -Ji +eO +eO +eO +eO +bR +eO py py py @@ -22515,28 +27747,28 @@ py py py py -Un -gz -gz -gz -Un -Ji +Xg +GW +GW +GW +Xg +eO py py -Ji -Ji +eO +eO py -Ji -Ji -Ji +eO +eO +eO hQ py py -kL lF lF +ZH xA -xA +ZH ak ak ak @@ -22546,15 +27778,15 @@ RJ xA xA iQ -iQ -Ar -Hu +Jg +rl +fr yt yt yt yt -iw -ZH +ah +qn KA KA KA @@ -22571,82 +27803,82 @@ KA KA uX uX -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (74,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw ij ij ij @@ -22664,9 +27896,9 @@ Rh Rh Rh Rh -Rh -Rh -ji +nS +nS +cZ ij ij pJ @@ -22676,14 +27908,14 @@ ij pJ ij ij -ZI -Dc -ZI -ZI -ZI -Dc -ZI -ZI +Ab +ne +Ab +Ab +Ab +ne +Ab +Ab ZI py ql @@ -22691,44 +27923,44 @@ py kL kL kL -Ji +eO kL kL kL -Ji +eO kL kL kL -Ji +eO kL kL kL -Ji +eO kL kL kL -Ji -Mv -Mv -gz -gz -gz +eO Mv +WU +GW +GW +GW +WU Mv -Ji +eO kL kL kL -Ji +eO kL kL kL -Wv -Ji -Ji -kL +mp +eO +eO lF lF +ZH xA xA UD @@ -22737,10 +27969,10 @@ ak GW GW UD -lF -lF -lF -lF +ZH +ZH +ZH +Av lF lF lF @@ -22749,7 +27981,7 @@ ZH lF lF lF -ZH +lF lF lF lF @@ -22764,103 +27996,103 @@ lF ZH lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (75,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw vr ij ij Rh Rh -Rh +pi EL Rh Rh ji ji +Fa +JB +Fa ji ji -ji -ji -ji -ji -ji -ji +cZ +cZ +cZ ij vr vr @@ -22870,18 +28102,18 @@ vr vr vr vr +Ab +Ab +Ab +Ab +Ab +Ab +Ab +Ab ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI -ZI -XF -sG -XF +bR +CA +bR kL UD UD @@ -22904,9 +28136,9 @@ UD UD WU WU -UV -UV -UV +Vv +Vv +Vv WU WU UD @@ -22917,24 +28149,24 @@ UD UD UD UD -Ts -EJ -Ts -UD -UD -UD -jH -UD +eO +mp +eO +lF +lF +ZH +xA +lF UD UD UD GW -GW +kU UD -wV -wV -wV -wV +cM +cM +cM +wU cM cM cM @@ -22957,86 +28189,86 @@ lF lF lF lF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (76,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab xd xd @@ -23052,9 +28284,9 @@ xd xd xd ij -ld -ld -ld +it +it +it ij Ab ne @@ -23114,124 +28346,124 @@ UD Xg yh Xg -UD -UD -UD -Bq -UD +lF +lF +lF +ot +lF UD UD GW GW GW UD -wV -wV -wV -wV -cM cM cM +wV +pE cM -sx cM cM cM -wV cM cM cM -wV cM +GK cM cM -wV +GK +GK +GK +GK +GK +GK cM cM cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (77,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab Ab Ab @@ -23243,22 +28475,22 @@ SI ne ne ne -ne -ne +Pi +Pi vP bH bH bH vP +HX ne -ne -Kl -Kl -Kl -Kl -Kl -Pw -Kl +SI +SI +SI +SI +SI +Vn +SI ne ne Hn @@ -23267,9 +28499,9 @@ ne Ab Ab kL -Za +Yw KE -Za +Yw kL UD UD @@ -23279,7 +28511,7 @@ sD sD ak GW -GW +qJ GW GW GW @@ -23287,7 +28519,7 @@ qX GW GW GW -GW +qJ GW GW gF @@ -23299,7 +28531,7 @@ GW gF GW GW -GW +qJ GW GW GW @@ -23308,7 +28540,7 @@ GW vs CX KU -GW +aX qX GW GW @@ -23318,117 +28550,117 @@ GW GW GW GW -rQ -wV -wV -wV -wV -wV -sx -wV -wV -sx -wV -wV +ak wV wV wV +pE +pE +wU +pE +pE cM -wV -wV -wV -wV -wV +Jj +Ae +By +GK +GK cM +GK +GK +GK +GK +GK cM cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (78,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab Ab Ab @@ -23444,15 +28676,15 @@ VM VM VM vP +fs +ne +SI +ne +ne ne ne -Kl -Hn -Hn -Hn -Hn Hn -Kl +sP ne ne Hn @@ -23461,9 +28693,9 @@ ne Ab Ab kL -Za +Yw ai -Za +Yw kL UD UD @@ -23513,20 +28745,19 @@ GW GW GW ak -kq -wV -sx -sx -sx -sx wV wV -sx wV wV wV +sx wV +pE cM +pW +GK +fA +GK cM cM cM @@ -23534,135 +28765,136 @@ cM cM cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (79,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ab -Ab -Ab -TN -ne -ne -SI -ne -ne -vP -bH -bH -bH -vP -SI -Kl -Kl -Hn -ne -ne -ne -Hn -Kl -Kl -Kl -Pw -Kl -ne -Ab -Ab -kL -Za -Za -ai -kL -UD -UD -Bx -sD +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Ab +Ab +Ab +TN +ne +ne +SI +ne +ne +pJ +bH +bH +bH +pJ +SI +SI +SI +ak +ak +ak +ak +ak +SI +SI +SI +Vn +SI +ne +Ab +Ab +kL +Yw +Yw +ai +kL +UD +UD +Bx +sD sD GW HP @@ -23680,9 +28912,9 @@ GW GW gF GW -GW -GW -GW +dR +ZY +aG GW gF GW @@ -23707,20 +28939,19 @@ GW GW GW ak -vu -wV -sx -wV -wV -sx wV wV sx sx sx sx -sx +wV +pE cM +QP +GK +fA +Ae cM cM cM @@ -23728,12 +28959,13 @@ cM cM cM cM -Za -Za -Za -Za -Za -Za +cM +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -23748,77 +28980,77 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (80,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Ab Ab va @@ -23828,31 +29060,31 @@ SI SI SI ZK -eX -eX -eX +PM +Lw +PM ZK SI ne TN -Hn -ne -ne -ne -Hn +ak +UA +ku +yT +ak Gf Hn Hn Hn -Kl +SI ne ne Ab -Ji -Za +eO +Yw Dz -Za -Wv +Yw +mp yh Rm sD @@ -23876,7 +29108,7 @@ ak ak ak ak -xc +LK ak ak ak @@ -23893,8 +29125,8 @@ Xg UD UD ak -Bq ak +Bq ak ak ak @@ -23906,28 +29138,28 @@ sx sx wV wV -Dj -ok -ok -sx -wV -wV -wV +rU wV +pE cM cM cM +HV cM cM -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +cM +cM +cM +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -23942,57 +29174,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (81,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24012,8 +29244,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24021,31 +29253,31 @@ ne fs ne eN -vP -bH +pJ bH +Ep bH -vP -ne +pJ +ow ne va -Hn -ne -ne -ne -ne +ak +Wr +sD +JO +ak ne ne ne Hn -Kl +SI ne Ab Ab kL -Za -Za -Za +Yw +Yw +Yw kL UD UD @@ -24070,8 +29302,8 @@ Rc HD Rc Rc -jC -Xq +PV +Ma Rc Rc Ey @@ -24087,41 +29319,41 @@ py kL cM cM -ok -wV -wV wV -sx -wV -wV -sx wV wV wV wV wV -sx wV -ok sx +Gp +CE +HY wV wV +sx wV -wV -wV +pE cM -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +Xn +GK +fA +GK +up +cM +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24136,57 +29368,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (82,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24206,8 +29438,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24215,31 +29447,31 @@ ne fs ne cD -vP -bH +pJ bH +Ep bH -vP +pJ ne ne Hn -Hn -ne -ne -ne -ne +ak +sD +sD +sD +ak ne ne ne Hn -Kl +SI ne Ab Ab kL -Za -Za -Za +Yw +Yw +Yw kL UD UD @@ -24264,9 +29496,9 @@ HD HD HD hs -Rc +PV +jC jC -Rc Rc Ey Rc @@ -24281,41 +29513,41 @@ py kL cM cM -ok wV wV wV -sx wV wV -sx wV wV +sx +Gp wV wV wV +aZ sx sx -Dj -sx -wV -wV -wV -wV +wU cM +ug +GK +fA +ev cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24330,57 +29562,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (83,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24400,33 +29632,33 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab ne ne ne +SR fs fs -fs -vP -bH +pJ bH +Ep bH -vP -ak -ak -ak +pJ ak ak ak ak +GW +GW +GW ak ak ak ak ak -rX +mz ak UD UD @@ -24458,10 +29690,10 @@ HD HD HD bK +PV Rc jC -mD -tV +Rc Ey Rc Rc @@ -24475,41 +29707,41 @@ py kL cM cM -ok wV wV wV -sx -wV -wV -sx wV wV wV wV -wV -sx -wV -ok sx wV wV wV +HY +aZ +sx wV +pE cM +Uc +GK +fA +GK cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24524,57 +29756,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (84,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24594,8 +29826,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24603,11 +29835,11 @@ ne lU ne ne -vP -bH -bH +pJ bH +Ep bH +Ux GW GW GW @@ -24620,7 +29852,7 @@ GW GW GW GW -GW +aG GW GW gF @@ -24651,29 +29883,29 @@ Rc HD HD HD -Ey -Ey -jC -Ey -Ey +Rc +PV +Rc +AP +Rc Ey Rc Rc Rc Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO cM wV -ok wV wV wV -sx +wV +wV wV wV sx @@ -24684,26 +29916,26 @@ sx sx sx wV -ok -Dj -ok -ok -ok -wV +pE +kF +fA +fA +fA +Ql cM cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24718,57 +29950,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (85,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24788,8 +30020,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab ne @@ -24797,11 +30029,11 @@ ne wu ne ne -vP -bH -bH -bH +pJ +Za +Ep bH +Ux GW GW GW @@ -24814,7 +30046,7 @@ GW GW GW GW -GW +aG GW GW gF @@ -24836,10 +30068,9 @@ GW Mq ak UD +HO Rc Rc -Rc -jC jC jC jC @@ -24847,57 +30078,58 @@ jC uU jC jC -jC -jC -jC -uU -jC +PV +Rc +Ey +Ey +Ey +Rc Rc Rc HD HD kL -Za +Yw ai -Za +Yw kL cM cM -ok -wV wV wV -sx -wV wV -sx wV wV wV -FI wV sx wV wV -sx -wV wV -ok +FI wV +sx wV +Ju cM -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +BC +GK +fA +GK +up +cM +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24912,57 +30144,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (86,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -24982,8 +30214,8 @@ Dz Dz Dz Dz -Za -Za +Yw +Yw Ab Ab Ab @@ -24991,32 +30223,32 @@ ne ne ne ne -vP -bH -bH +pJ bH +Ep bH +Ux GW GW GW +hh GW GW GW GW GW +hh GW GW -GW -GW -GW +aG GW GW gF +hh GW GW GW -GW -GW +hh qX GW GW @@ -25024,7 +30256,7 @@ GW GW GW GW -GW +hh GW GW Mq @@ -25040,25 +30272,25 @@ HD HD HD GL -Rc -Rc -Rc -Rc -Ey -jC -Rc -Rc +PV +PV +PV +PV +uM +PV +PV +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM -Dj sx +rU sx sx sx @@ -25072,26 +30304,26 @@ Me wV sx wV -wV -sx -wV -wV -ok -wV +pE cM +ec +GK +fA +HH cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25106,57 +30338,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (87,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25176,33 +30408,33 @@ Dz Dz Dz Dz -Za -Za -Ab -Ab +Yw +Yw Ab -ra -TU -TU -TU -ra -ix +Zw +Zw +Sl +Ra +Ra +Ra +Sl ix +iz ix -vP -ak -ak -ak -ak -ak -ak -ak +ij +SC +Tn +SC +ij +GW +GW +GW ak ak ak ak ak -rX +mz ak UD UD @@ -25239,53 +30471,53 @@ Ey Ey Ey Ey -uU Ey Ey +uM HD HD kL -Za +Yw ai -Za +Yw kL cM cM -ok -ok -ok -ok -Dj -ok -wV -sx wV wV wV -ok wV sx wV wV sx +wV +wV +wV +ok +wV sx -sx -Dj -sx +wV +pE cM cM +lg +wW cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +cM +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25300,57 +30532,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (88,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25370,41 +30602,41 @@ Dz Dz Dz Dz -Za -Za -Ji -Ab -Ab -TU -sZ -sZ -sZ -TU -bH +Yw +Yw +eO +Zw +Zw +Ra +LN +LN +bv +Ra bH +Ep bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -ne -ne -Ab -Ji -Za -Za -Za -Ji +SC +PC +Hq +Nd +SC +sD +sD +sD +ak +sn +sn +Jf +sn +TH +sn +sn +Zw +eO +Yw +Yw +Yw +eO HD HK HK @@ -25416,12 +30648,12 @@ Rc Rc Rc Rc -HD -HD +Rc HD Rc Rc Rc +Rc jC Rc HD @@ -25431,18 +30663,18 @@ Rc Rc Rc Rc -Ey Rc -jC Rc +Ey Rc +PV Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO cM wV wV @@ -25450,7 +30682,7 @@ wV wV wV sx -ok +wV wV sx wV @@ -25460,26 +30692,26 @@ ok wV sx wV -wV -sx -wV -wV -ok -wV +pE cM +OT +SF +Iu +Mt cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25494,57 +30726,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (89,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25564,40 +30796,40 @@ Dz Dz Dz Dz -Za -Za -Ji -aw -Ab -TU -sZ -sZ -sZ -WX -bH +Yw +Yw +eO +eO +Zw +Ra +LN +LN +LN +mv bH +Ep bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -eN -Ab -Ab +Tn +id +VA +Fu +ij +sD +sD +sD +ak +sn +sn +jM +sn +TH +rE +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -25625,17 +30857,17 @@ Rc Rc Rc Rc -Ey Rc -jC Rc +Ey Rc +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -25644,36 +30876,36 @@ wV wV wV sx -Dj +HF sx sx -wV -wV -wV -ok -wV sx sx sx +HF sx -wV -wV -ok -wV -wV +sx +sx +wU cM -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +OT +Fe +Iu +Fe +Fe +wE +bh +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25688,57 +30920,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (90,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25758,40 +30990,40 @@ Dz Dz Dz Dz -Za -Za -Ji -aw -Ab -TU -sZ -sZ -sZ -WX -bH +Yw +Yw +eO +eO +Zw +Ra +LN +LN +LN +mv bH +Ep bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -cD -Ab -Ab +SC +db +ld +fz +SC +sD +sD +sD +ak +sn +sn +Jf +mW +TH +ov +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -25819,17 +31051,17 @@ Rc Rc Rc Rc +Rc +Rc Ey Rc -jC -jC -jC +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -25838,36 +31070,36 @@ wV wV wV sx -ok wV -sx wV +sx wV wV -ok -kq sx ok -ok -Dj -ok -ok -ok +kq +vu wV +pE cM -cM -cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za +yo +yo +dr +Fe +Fe +wE +bh +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25882,57 +31114,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (91,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -25952,40 +31184,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -TU -sZ -sZ -sZ -TU -bH -bH +Yw +Yw +Yw +eO +Zw +Ra +LN +LN +LN +Ra bH -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -ne -Ab -Ab +Ep +ZM +ij +ij +ij +nx +ij +ak +GW +ak +ak +sn +sn +Jf +sn +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26007,23 +31239,23 @@ HD HD HD HD -HD -Zm -sU -sU -sU -sU -sU -sU -uU -sU -jC +nd +sQ +bl +bl +bl +bl +bl +bl +bl +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26032,36 +31264,36 @@ wV wV wV sx -ok -wV -sx -wV wV wV -ok -vu -sx -ok -wV sx wV wV -ok -wV -cM -cM +sx +za +ni +pE +pE +pE cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Fe +Fe +Fe +Fe +Fe +wE +bh +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26076,57 +31308,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (92,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26146,41 +31378,41 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -ra -TU -TU -TU -ra -vP -vH -vP -vP -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -Kl -ne -ne -Ab -Ji -Za -Za -Za -Ji +Yw +Yw +Yw +eO +Zw +Sl +Ra +Ra +Ra +Sl +Zp +Eg +Zp +Zp +Zp +Zp +Ze +Ze +Ze +Ze +Ze +Jf +sn +sn +iG +sn +TH +sn +sn +Zw +eO +Yw +Yw +Yw +eO HD HK HK @@ -26195,30 +31427,30 @@ KZ HD HD HD -Ji -HD +eO HD HD -Ji HD +eO HD -Zm -MV -MV -MV -MV -MV -MV -MV -sU -jC +nd +sQ +aD +aD +aD +aD +aD +aD +aD +Ve +PV Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO cM wV wV @@ -26226,36 +31458,36 @@ wV wV wV sx -ok +wV wV sx -sx -sx -sx -Dj -sx -sx -ok +wV wV sx wV wV ok wV +wV cM -cM -cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +oM +oM +bd +Fe +Fe +wE +kL +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26270,57 +31502,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (93,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26340,40 +31572,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -gl -ne -Kl -Kl -Kl -Kl -Kl -ne -Hn -ne -ne -ne -ne -Hn -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +eO +Zw +jZ +sn +dw +sn +Zp +CB +qo +kB +vK +Rb +Zp +Ze +Ze +Ze +Ze +Ze +Jf +sn +sn +Jf +sn +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26388,30 +31620,30 @@ mA HK Rc HD -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -MV -MV -MV -MV -MV -MV -sU -jC +nd +sQ +aD +aD +aD +aD +aD +aD +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26420,16 +31652,10 @@ wV wV wV sx -ok -wV -wV wV wV sx -ok -ok -ok -ok +wV wV sx wV @@ -26438,18 +31664,24 @@ ok wV wV cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +OT +SF +Iu +Fe +Fe +wE +bh +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26464,57 +31696,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (94,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26534,40 +31766,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -ne -Hn -ne -ne -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Ab -Ab +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +dE +Lp +rf +rf +mF +PR +Ze +Ze +Ze +Ze +Ze +Jf +Jf +Jf +Jf +sn +TH +kn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26582,30 +31814,30 @@ mA HD HD HD -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -MT -MT -MT -Tq -Tq -MV -sU -jC +nd +sQ +aD +kd +kd +kd +Xp +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26614,36 +31846,36 @@ wV wV wV sx -ok -wV -wV wV wV sx wV wV -wV -wV -wV sx wV wV ok wV +wV cM +OT +Fe +Iu +FR cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26658,57 +31890,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (95,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26728,40 +31960,40 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -Ab -Ab -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -Hn -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +Cd +Oj +yF +Jo +Jm +Zp +Ze +Ze +Ze +Ze +Ze +Jf +sn +sn +Jf +sn +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD @@ -26777,29 +32009,29 @@ HD HD HD Dz -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -qH -qH -qH -Rj -Tq -MV -sU -jC +nd +sQ +aD +LQ +LQ +LQ +LU +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM cM @@ -26808,14 +32040,8 @@ sx sx sx sx -ok -sx -sx -sx -sx -sx -sx -sx +wV +wV sx sx sx @@ -26824,20 +32050,26 @@ sx sx Dj sx +sx cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +cM +cM +cM +cM +cM +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26852,57 +32084,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (96,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -26922,41 +32154,41 @@ Dz Dz Dz Dz -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -ne -Ab -Ji -Za -Za -Za -Ji +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +bb +fa +yF +xK +AG +Zp +Jf +Jf +Jf +Jf +Jf +Jf +sn +sn +Jf +sn +TH +sn +sn +Zw +eO +Yw +Yw +Yw +eO HD HK HK @@ -26966,44 +32198,44 @@ mA Rc Rc Rc -mA +CF HD HD HD Dz -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw Dz -HD -Zm -MV -Tq -mH -qH -Rj -Tq -MV -sU -jC +nd +sQ +aD +Xp +iH +LQ +LU +Xp +aD +bl +PV Rc HD -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO Kh hb ba ba zW +Ld sx wV -ok -sx +wV wV wV wV @@ -27016,22 +32248,22 @@ wV wV wV wV -ok +wV wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27046,57 +32278,57 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (97,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27116,92 +32348,92 @@ Dz Dz Dz Dz -Za -Za -Za -aw -aw -Ab -ne -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +eO +LB +Zw +sn +dw +sn +Zp +HN +TX +yF +Jo +vO +Zp +sn +sn +sn +sn +sn +sn +sn +dw +YX +dw +TH +sn +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD -Ey +HD mZ mZ mZ -Ey +HD mA Rc -Rc +Jr Rc HD -Ji -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw Dz -Ji -Zm -MV -qH -qH -qH -Rj -Tq -MV -sU -jC +eO +sQ +aD +LQ +LQ +LQ +LU +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM zW tm Sb YR -Dj -ok -ok -Dj -ok -ok -ok -ok +Ld +jF +wV +wV +wV +wV +wV +wV wV wV wV @@ -27210,22 +32442,22 @@ wV wV wV wV -ok +wV wV wV cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27240,186 +32472,186 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (98,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +rV +ZX +ax +Jo +vO +Zp +dw +dw +dw +dw +dw +dw +dw +dw +Jf +mW +TH +TH +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD -Ey +HD OW OW OW -Ey +HD HK Rc -mA -HD +nJ HD HD -Za -Za -Za -Za -Za -Za -Za HD -Zm -MV -Np -Np -Np -Tq -Tq -MV -sU -jC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +aD +qU +qU +qU +Xp +Xp +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM hb QB YR PF +Ld sx -ok wV -sx wV wV wV -ok -ok -ok -ok -Dj -ok -ok -ok -ok -ok +wV +wV +wV +wV +wV +rU +wV +wV +wV +wV +wV wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27434,158 +32666,158 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (99,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +lq +qm +Jo +Jo +vO +Zp +dw +Jf +Jf +Jf +Jf +ws +Jf +Jf +Jf +sn +sn +TH +Zw +Zw kL -Za -Za -Za +Yw +Yw +Yw kL HD HD -Ey +HD OW OW OW -Ey +HD HK Rc -mA +nJ HD HD HD -Za -Za -Za -Za -Za -Za -Za -HD -Zm -MV -MV -MV -MV -MV -MV -MV -sU -jC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +aD +aD +aD +aD +aD +aD +aD +bl +PV HD HD kL -Za +Yw ai -Za +Yw kL cM uE MC sM +YR JR sx -ok wV -sx +wV wV wV wV @@ -27603,17 +32835,17 @@ wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27628,158 +32860,158 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (100,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -ne -ne -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -Hn -ne -ne -ne -ne -ne -ne -ne -Ab -Ji -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +GU +QY +QY +we +Ce +Zp +dw +Jf +sn +sn +sn +sn +sn +sn +Jf +sn +sn +TH +sn +Zw +eO +Yw +Yw +Yw +eO +HD +HD HD -Ey -Ey OW OW OW -Ey +HD HK mA -mA +nJ HK HD -Ji -Za -Za -Za -Za -Za -Za -Za -HD -Zm -MV -MV -MV -TT -MV -MV -MV -sU -jC +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +aD +aD +aD +BZ +aD +aD +aD +bl +PV Rc HD -Ji +eO py Cu py -Ji +eO Kh xI uE MR JR +JR sx -ok wV -sx +wV wV wV wV @@ -27797,17 +33029,17 @@ wV cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -27822,106 +33054,106 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (101,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab -Ab -ne -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +sn +Zp +Zp +Zp +fg +Zp +Zp +Zp +dw +Zw +Zw +sn +Zw +Zw +Zw +sn +Zw +Zw +Zw +TH +Zw +Zw kL py py @@ -27929,41 +33161,41 @@ py kL HD HD -Ey -Ey -Ey +HD +HD +HD HD HD HK mA -mA -HD +nJ HD HD -Za -Za -Za -Za -Za -Za -Za HD -Zm -Zm -ti -lA -Zm -Zm -MV -MV -Zm -jC +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nd +sQ +sQ +Vs +Uz +sQ +sQ +aD +aD +sQ +PV HD HD kL -Ji -Wv -Ji +eO +mp +eO kL cM cM @@ -27971,7 +33203,7 @@ qR cM cM cM -ok +sx cM cM cM @@ -27990,18 +33222,18 @@ cM wV cM cM -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -28016,110 +33248,110 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (102,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -aw -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab -Ab +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Zw +Zw +sn +dw +dw +dw +dw +dw +dw +dw +dw +dw +dw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +gy +Zw +Zw kL -Ji -Ji -Ji +eO +eO +eO kL nH nH @@ -28130,17 +33362,17 @@ nH nH nw nw -ke +se nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -28151,13 +33383,13 @@ sQ sQ aD sQ -ou +tE nw nw kL -Ji -Wv -Ji +eO +mp +eO kL cM cM @@ -28165,11 +33397,11 @@ cM cM cM cM -Dj cM cM cM cM +HF cM cM cM @@ -28185,17 +33417,17 @@ cM cM cM cM -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -28210,93 +33442,93 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (103,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -Zw -sn -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +kL +kL Zw sn -Zw -Zw -Zw sn -Zw +sn +sn +sn +sn +sn +sn +sn +sn Zw Zw sn @@ -28307,7 +33539,7 @@ sn Zw Zw Zw -sn +TH Zw Zw kL @@ -28324,7 +33556,7 @@ nH nH wM wM -uv +Dt nw nw nw @@ -28345,13 +33577,13 @@ sQ aD aD sQ -uv +lI nw nw kL -Ji -Wv -Ji +eO +mp +eO kL IF IF @@ -28359,11 +33591,11 @@ HE IF IF IF -oa +HE IF IF IF -HE +oa IF IF IF @@ -28379,17 +33611,17 @@ IF IF kL kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -28404,82 +33636,82 @@ Dz Dz Dz Dz -Za -Za -Za +Yw +Yw +Yw "} (104,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO Zw sn sn @@ -28501,14 +33733,14 @@ sn sn Jf sn -sn +TH sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX xH Ge @@ -28518,18 +33750,18 @@ Ge Ip wM wM -uv +LD wM fX -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +eO +eO rA pc aD @@ -28539,25 +33771,25 @@ tx aD ft bl -uv +lI wM fX -Ji +eO py Cu py -Ji +eO IF HE HE HE HE HE -oa HE -Ic HE +Ic HE +oa HE IF HE @@ -28571,109 +33803,109 @@ HE HE IF IF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (105,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -28695,13 +33927,13 @@ sn sn Jf sn -sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -28709,10 +33941,10 @@ Ge Ge Ge Ge -MM -uv -uv -uv +nv +wM +wM +LD nw nw nw @@ -28733,13 +33965,13 @@ rm aD aD bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF IF @@ -28748,10 +33980,10 @@ HE HE HE oa -HE -Ic -HE -HE +oa +sL +oa +oa IF IF IF @@ -28765,111 +33997,111 @@ IF IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (106,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -28881,42 +34113,42 @@ Zw Zw Zw Zw -Jf -Jf -Jf -Jf -Jf -Jf -Jf sn sn +sn +sn +sn +sn +Jf +sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -CW +kv Ge CW CW Ip wM wM -NW +hR nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -28927,13 +34159,13 @@ Xp aD Vf bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF IF @@ -28942,7 +34174,7 @@ HE HE HE oa -HE +JA Ic HE HE @@ -28957,121 +34189,121 @@ IF IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (107,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL kL kL -Ji +eO Zw Zw Zw @@ -29081,15 +34313,15 @@ sn sn sn sn -Jf -sn +ws sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29100,17 +34332,17 @@ CW Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -29121,13 +34353,13 @@ fy aD aD bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF IF @@ -29143,130 +34375,130 @@ HE IF IF IF -Ji +eO IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(108,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(108,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO +eO Zw sn sn @@ -29276,15 +34508,15 @@ sn sn sn Jf -sn -sn +mW +TH sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX xH CW @@ -29294,18 +34526,18 @@ CW Ip wM wM -uv +LD wM fX -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO rA QW aD @@ -29315,14 +34547,14 @@ Ci aD ft bl -uv +lI wM fX -Ji -Za +eO +Yw ai -Za -Ji +Yw +eO IF HE oa @@ -29336,130 +34568,130 @@ HE HE HE IF -Ji -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (109,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +eO Zw Zw Zw @@ -29471,13 +34703,13 @@ sn sn Jf sn -sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29488,17 +34720,17 @@ Ge Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -29509,13 +34741,13 @@ mV aD aD bl -uv +lI nw nw kL -Za +Yw ai -Za +Yw kL IF Ic @@ -29523,155 +34755,155 @@ sL Ic Ic Ic -oa -HE +KB +Ic +Ic +Ic Ic -HE -HE IF IF IF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(110,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(110,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Zw +Zw +Zw +Zw +Zw Zw Zw Zw Jf Jf Jf -Jf -Jf -Jf -Jf -Jf -Jf +sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29682,14 +34914,14 @@ fd Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za +Yw +Yw +Yw +Yw Dz Dz Dz @@ -29703,7 +34935,7 @@ Jc aD uV bl -uv +lI nw nw kL @@ -29718,113 +34950,113 @@ ei Ng Ic oa -HE -Ic -Ic Ic +HE +HE +HE IF IF IF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (111,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -29832,40 +35064,40 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO Zw +UB +Rf +UB +xW +UB +UB Zw sn sn -Jf -sn -sn -sn -sn sn sn +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -29876,7 +35108,7 @@ xy Ip wM wM -uv +LD nw nw nw @@ -29897,13 +35129,13 @@ iU aD aD bl -uv +lI nw nw kL -Ji -Wv -Ji +eO +mp +eO kL IF Ph @@ -29912,113 +35144,113 @@ qy Wu Ic oa -HE Ic HE HE +HE IF IF IF -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(112,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(112,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30026,41 +35258,41 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Zw +UB +UB +UB +UB +UB +UB Zw -sn -sn -sn -Jf -sn -sn sn sn sn sn +TH sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX PO ej @@ -30070,18 +35302,18 @@ xy Ip wM wM -uv +LD wM fX -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +eO +eO rA Xp en @@ -30091,128 +35323,128 @@ QW aD aD bl -uv +Ag DZ fX -Ji -Ji -Wv -Ji -Ji -IF -Ph +eO +eO +mp +eO +eO +Md Ph Ph Ph Ic +Ic oa -HE Ic HE HE HE +HE IF -Ji -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (113,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30220,40 +35452,40 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO Zw -sn -sn -Jf -sn -sn -sn -sn -sn -sn +BJ +UB +UB +UB +UB +bg +zF +TH +TH +TH +TH +TH Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH @@ -30264,7 +35496,7 @@ Ip Ip wM wM -uv +LD nw nw nw @@ -30285,128 +35517,128 @@ QW aD ft bl -uv +Ag nw nw kL -Ji -Wv -Ji +eO +mp +eO kL IF -Ph -Ph +RD Ph uR Ic -oa HE +oa Ic HE HE +HE IF IF IF -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (114,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30414,61 +35646,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ps +UB +UB +UB +UB +UB +bg Zw sn sn -Jf -sn -sn -sn sn sn sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +wT ej ej ex Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -30479,7 +35711,7 @@ aD aD ya bl -uv +ey nw nw kL @@ -30489,118 +35721,118 @@ py kL IF Ph -Ph lp pU Ic -oa HE +oa Ic -Ic -Ic +HE +HE +HE IF IF IF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (115,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30608,61 +35840,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ps +UB +UB +UB +UB +UB +bg Zw -sn -sn Jf -sn -sn -sn -sn -sn -sn +Jf +Jf +ws +Jf Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +SB ej ej ex Ip wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -30673,128 +35905,128 @@ aD aD pt oX -jc +OO nw nw kL -Za -Za +Yw +Yw ai kL IF -Ph -lp -lp +LI +NH pU Ic -oa HE +oa Ic HE HE +HE IF IF IF -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (116,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30802,62 +36034,62 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +ps +UB +UB +UB +UB +UB +HL Zw sn sn sn -Jf -sn -sn -sn -sn sn sn sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX PO -ej +SB ej QU Ip Ip Ip wM -uv +LD wM fX -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO rA QW Xp @@ -30870,125 +36102,125 @@ bl ey FW fX -Ji -Za -Za -Za -Wv +eO +Yw +Yw +Yw +mp tQ -pU -pU +zc pU lp Ic -oa HE +oa Ic HE HE HE +HE IF -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (117,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -30996,61 +36228,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Zw -Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +ps +UB +UB +UB +UB +UB +UB Zw sn sn -Jf -sn -sn -sn sn sn sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +SB ej ej iW WM Ip wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -31070,119 +36302,119 @@ py py kL IF -IF +KB Ic Ic Ic -Ic -oa HE +oa +Ic Ic HE HE IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (118,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -31190,61 +36422,61 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw -Jf -Jf -Jf -Jf -Jf -Jf -Jf -Jf -Jf +Zw +Zw +Zw +Zw +Zw +sn +sn +sn +sn +sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -ej +SB ej ej Ip SQ Ip wM -NW +hR nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw nd sQ sQ @@ -31259,12 +36491,12 @@ ey nw nw nw -Ji -Ji -Ji +eO +eO +eO kL IF -IF +oa HE HE HE @@ -31277,106 +36509,106 @@ HE IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (119,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -31384,22 +36616,22 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO Zw Zw Zw @@ -31415,20 +36647,20 @@ sn Zw Zw kL -Za -Za -Za +Yw +Yw +Yw kL nH nH -zi +WK ej ej Dy kK Ip wM -uv +LD nw nw nw @@ -31458,143 +36690,143 @@ nw fX nw IF -IF +oa HE HE HE HE oa -HE -Ic +oa +fq HE HE IF IF IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (120,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO Zw sn sn @@ -31608,32 +36840,32 @@ sn sn sn Zw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO fX PO -zi +WK ej ej Ip Ip Ip wM -uv +LD wM fX -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji -Ji +eO +eO +eO +eO +eO +eO +eO +eO +eO SJ kN ON @@ -31664,130 +36896,130 @@ HE HE HE IF -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (121,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -31809,14 +37041,14 @@ py kL nH nH -zi +Sg ej ej nH nH wM wM -uv +LD nw nw nw @@ -31859,129 +37091,129 @@ HE IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (122,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw @@ -31997,30 +37229,30 @@ Zw Zw Zw kL -Ji -Ji -Ji +eO +eO +eO kL nH nH -Si +em Ip nH nH nH nw sJ -JZ +OE nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw mY SJ SJ @@ -32031,13 +37263,13 @@ SJ nw nw wM -NW +Od nw nw nw -Ji -Ji -Ji +eO +eO +eO kL IF IF @@ -32053,129 +37285,129 @@ rN IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (123,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL Zw @@ -32183,11 +37415,11 @@ sn Zw Zw kL -Ji +eO kL -Za +Yw kL -Ji +eO kL kL kL @@ -32197,24 +37429,24 @@ py kL nw nw -ey +kA DZ FW nw nw wM wM -uv +LD nw nw nw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw mY SJ SJ @@ -32223,9 +37455,9 @@ Mp hA SJ nw +jw wM -wM -uv +lI nw nw kL @@ -32235,11 +37467,11 @@ py kL kL kL -Ji +eO kL -Za +Yw kL -Ji +eO IF IF IF @@ -32247,169 +37479,169 @@ HE IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (124,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL Zw sn sn Zw -Ji -Ji -Za -Za -Za -Ji +eO +eO +Yw +Yw +Yw +eO kL kL -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO nw -uv -ey -uv -uv -uv -uv -uv -uv -uv +wM +kA +wM +wM +wM +wM +wM +wM +LD wM nw -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO RM Cx Mp @@ -32419,191 +37651,191 @@ kN wM wM wM -uv +lI wM nw -Ji -Za -Za -Za -Ji +eO +Yw +Yw +Yw +eO kL kL -Ji -Za -Za -Za -Ji -Ji +eO +Yw +Yw +Yw +eO +eO IF HE HE IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (125,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw sn sn Zw -Ji -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw kL kL kL -Za -Za -Za +Yw +Yw +Yw kL nw nw -ey -wM -wM -wM -uv -wM -wM -wM +rz +HB +RY +nK +nK +nK +nK +BG wM nw -Ji -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO RM Cx EV @@ -32613,177 +37845,177 @@ kN wM wM wM -uv +lI nw nw kL -Za -Za -Za +Yw +Yw +Yw kL kL kL -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +eO IF HE HE IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (126,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw sn sn Zw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za +Yw +Yw +Yw kL nw nw -ey -NB +rr +wM +wM wM wM -uv wM wM wM @@ -32791,11 +38023,11 @@ nw nw nw nw -Ji +eO nw nw nw -Ji +eO nw mY SJ @@ -32803,371 +38035,371 @@ SJ kN kN kN -uv -uv -uv -uv -uv +lI +lI +lI +lI +lI nw nw kL -Za -Za -Za +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw IF HE HE IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (127,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Zw -sn -sn -Zw -Za -Za -Za -Za -Za -Za -Za -kL -kL -Za -Za -Za -kL -nw -nw -Lf -nw -nw -nw -JZ -sJ -sJ -sJ -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -nw -wM -wM -wM -uv -nw -nw -nw -nw -nw -nw -kL -Za -Za -Za -kL -kL -Za -Za -Za -Za -Za -Za -Za -IF -HE -HE -IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Zw +sn +sn +Zw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +kL +kL +Yw +Yw +Yw +kL +nw +nw +po +nw +nw +nw +JZ +sJ +sJ +sJ +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +nw +wM +wM +wM +lI +nw +nw +nw +nw +nw +nw +kL +Yw +Yw +Yw +kL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +IF +HE +HE +IF +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (128,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw sn sn Zw -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Ji +Yw +Yw +Yw +eO nw wM -oD +kA wM wM nw @@ -33191,169 +38423,169 @@ nw wM wM wM -uv +lI nw wM -wM +nw wM wM nw -Ji -Za -Za -Za +eO +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw IF HE HE IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(129,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(129,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Zw Zw Zw Zw -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL py py @@ -33361,7 +38593,7 @@ py kL nw nw -oD +kA wM wM nw @@ -33385,10 +38617,10 @@ wM wM wM wM -uv +lI nw wM -wM +WC wM nw nw @@ -33397,165 +38629,165 @@ py py py kL -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw IF IF IF IF -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (130,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL -Ji -Ji -Ji +eO +eO +eO kL nw nw -oD +kA wM wM nw @@ -33579,169 +38811,169 @@ nw wM wM wM -NW +Od nw wM -wM +fB wM nw nw kL -Ji -Ji -Ji +eO +eO +eO kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (131,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL py py @@ -33749,7 +38981,7 @@ py kL nw nw -oD +Ga wM wM nw @@ -33770,11 +39002,11 @@ wM nw nw nw -uv -uv -uv -uv -nw +lI +lI +lI +lI +GC wM wM wM @@ -33785,356 +39017,356 @@ py py py kL -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (132,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -kL -kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -nw -VH -hm -wM -wM -nw -wM -wM -wM -uv -nw -nw -nw -WN -wM -wM -RP -wM -wM -wM -nw -nw -nw -uv -wM -wM -wM -nw -nw -nw -nw -wM -nw -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw kL kL -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +nw +VH +hm +wM +wM +nw +wM +wM +wM +uv +nw +nw +nw +WN +wM +wM +RP +wM +wM +wM +nw +nw +nw +lI +wM +wM +wM +nw +wM +wM +wM +wM +nw +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +kL +kL +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (133,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO nw nw nw @@ -34158,182 +39390,182 @@ nw nw nw wM -uv +lI wM wM wM nw -Za -Ji nw nw +wM +wM nw -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(134,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(134,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL kL -Ji -Ji -Za +eO +eO +Yw nw nw wM @@ -34352,377 +39584,377 @@ nw nw nw nw -uv +lI wM wM kL kL -Za -Ji -Ji -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(135,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -kL -Ji -Ji -Za -Za +Yw nw wM wM -uv -nw -cl -wM -Cb -Cb -sK -sK -ga -tp -Ah -nw -nw nw -uv -wM -wM -kL -Za -Za -Ji -Ji -kL -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(136,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(135,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL -Ji -Ji -Ji -Za -Za +kL +eO +eO +Yw +Yw +nw +wM +wM +uv +nw +cl +wM +Cb +Cb +sK +sK +ga +tp +Ah +nw +nw +nw +lI +wM +wM +kL +Yw +Yw +nw +wM +wM +nw +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(136,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +kL +eO +eO +eO +Yw +Yw nw nw wM @@ -34740,184 +39972,184 @@ oj nw nw nw -uv +lI wM nw kL -Za -Za -Ji -Ji -Ji -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(137,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji +Yw +Yw +nw +wM +wM +nw +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(137,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO kL -Ji -Ji -Ji -Za -Za -Za +eO +eO +eO +Yw +Yw +Yw nw wM uv @@ -34934,4645 +40166,4645 @@ Ah nw nw nw -uv -wM -nw -Za -Za -Za -Ji -Ji -Ji -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(138,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -kL -Ji -Ji -Ji -Za -Za -Za -nw -wM -uv -wM -wM -nw -nw -gH -nw -nw -nw +lI wM nw +Yw +Yw +Yw nw wM wM -uv -wM nw -Za -Za -Za -Ji -Ji -Ji -kL -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(139,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(138,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +kL +eO +eO +eO +Yw +Yw +Yw nw wM uv -nw +wM wM nw nw +gH nw nw nw -nw -UJ -nw -nw -wM -nw -uv wM nw -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(140,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -nw -wM -uv nw wM -nw wM +lI wM nw +Yw +Yw +Yw nw nw -wM -wM -nw -wM nw -uv -wM nw -Za -Za -Za -Za -Za -Ji -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(141,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -Ji -Za -Za -Za -Za -Za -Za +(139,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw nw wM -tj -uv uv -JZ -uv -wM -wM nw wM -wM -uv -JZ -uv -uv -uv -wM -nw -Za -Za -Za -Za -Za -Za -Ji -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(142,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -nw -nw -nw -nw -nw -nw -uv nw nw nw nw nw -uv -nw nw +UJ nw nw +wM nw +lI +wM nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(143,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -eg -nw +(140,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw nw -uv wM +uv nw -nw +wM nw wM -uv +wM nw nw -eg -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(144,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -BX -Ji nw -uv wM wM -wq -FW +nw wM -uv nw -Ji -BX -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +lI +wM +nw +Yw +Yw +Yw +Yw +Yw +eO +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(145,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Ji -BX -Ji +(141,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw nw +wM +tj +uv +uv +JZ uv wM wM -xb -DZ +nw +wM +wM +lI +YP +lI +lI +lI wM -NW nw -Ji -BX -Ji -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +eO +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(146,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -SN -EM +(142,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +nw nw nw -uv -uv -uv -uv -uv -uv uv nw nw -OS -bE -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(147,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za nw nw -wM -wM -wM -wM -wM -wM -wM nw +lI nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(148,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za nw nw nw nw -wM -wM -wM nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(143,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +RF nw nw +uv +wM nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(149,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za nw nw wM -wM -wM +lI nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(150,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +RF +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(144,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Wo +eO nw +uv wM wM +wq +FW wM +lI nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Wo +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(151,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -nw -nw -nw +(145,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +eO +Wo +eO nw +uv +wM +wM +xb +DZ +wM +lI nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +eO +Wo +eO +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(152,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -lP -lP -lP -so -lP -lP -Za -Za -Za -Za -Za -nw +(146,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Zk +Kq nw nw +cX +lI +lI +lI +lI +lI +lI nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +ly +XR +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(153,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -tJ -Vm -Mx -au -xS -TS -Pa -Za -Za -Za -Za -Za -nw +(147,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw nw nw +wM +wM +wM +wM +wM +wM +Jx nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(154,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -Re -WT -LP -NV -gi -ao -Za -Za -Za -Za -Za -Za +(148,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw nw nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(155,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -Oc -pp -vx -Vy -Sj -Pa -Za -Za -Za -Za -Za -Za nw +wM +wM +wM nw nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(156,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -lP -Mw -Ew -Ew -zt -hX -Pa -Za -Za -Za -Za -Za -Za nw nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(149,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nw +nw +wM +wM +wM nw -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(157,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(150,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +nw +wM +wM +wM +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(151,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +Au +Au +Au +Au +Au +Au +Au +Au +Yw +Yw +Yw +Yw +nw +nw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(152,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au lP lP lP lP +so lP lP -Pa -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Au +Yw +Yw +Yw +Yw +nw +nw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(153,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +tJ +Vm +Mx +au +xS +TS +Pa +Au +Yw +Yw +Yw +Yw +nw +nw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(154,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +Re +WT +LP +NV +gi +ao +Au +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(155,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +Oc +pp +vx +Vy +xG +Pa +Au +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(158,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(156,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +Mw +Ew +Ew +zt +hX +Pa +Au +Yw +Yw +Yw +Yw +Yw +nw +nw +nw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(157,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +lP +lP +lP +lP +lP +lP +Pa +Au +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(158,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Au +Au +Au +Au +Au +Au +Au +Au +Au +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (159,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (160,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (161,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -39595,178 +44827,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(162,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(162,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -39789,178 +45021,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (163,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -39983,178 +45215,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (164,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40177,178 +45409,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(165,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(165,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40371,178 +45603,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (166,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40565,178 +45797,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (167,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40759,178 +45991,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(168,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(168,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -40953,178 +46185,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (169,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41147,178 +46379,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (170,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41341,178 +46573,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(171,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(171,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41535,178 +46767,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (172,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41729,178 +46961,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (173,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -41923,178 +47155,178 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (174,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw Dz Dz Dz @@ -42117,3560 +47349,3560 @@ Dz Dz Dz Dz -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (175,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (176,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(177,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(178,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(177,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(178,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (179,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (180,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(181,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(182,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(181,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(182,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (183,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (184,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(185,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(186,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(185,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(186,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (187,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (188,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -"} -(189,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} -(190,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +(189,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +"} +(190,1,1) = {" +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (191,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} (192,1,1) = {" -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za -Za +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw +Yw "} diff --git a/maps/euthenia/levels/misc.dmm b/maps/euthenia/levels/misc.dmm index 4a77e983cf..d48eec6a7b 100644 --- a/maps/euthenia/levels/misc.dmm +++ b/maps/euthenia/levels/misc.dmm @@ -18,10 +18,44 @@ /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"ae" = ( +/obj/structure/railing, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) "af" = ( /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_checker) +"aj" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"am" = ( +/turf/unsimulated/wall, +/area/centcom/suppy) +"ax" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "az" = ( /obj/structure/railing, /turf/simulated/floor/holofloor/space, @@ -40,6 +74,15 @@ }, /turf/simulated/floor/holofloor/carpet, /area/space) +"aJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "aS" = ( /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) @@ -55,6 +98,9 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"ba" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/bar) "be" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/holodorm/source_space) @@ -73,9 +119,55 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"bC" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"bN" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"bP" = ( +/obj/machinery/computer/communications, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "bR" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"bS" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"bU" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"bV" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) "bX" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/red/full{ @@ -95,6 +187,16 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"ck" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "co" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -110,6 +212,20 @@ }, /turf/simulated/floor/holofloor/reinforced, /area/holodeck/source_wildlife) +"cr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "cu" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -126,6 +242,27 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"cv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "cB" = ( /obj/effect/floor_decal/carpet{ dir = 9 @@ -136,6 +273,25 @@ /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"cE" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"cP" = ( +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth{ + pixel_x = -24; + pixel_y = -8 + }, +/obj/item/storage/secure/briefcase, +/obj/item/multitool, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "cR" = ( /obj/effect/overlay/palmtree_l, /turf/simulated/floor/holofloor/beach/sand, @@ -164,10 +320,23 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"dy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "dK" = ( /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_checker) +"dO" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "dU" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" @@ -199,6 +368,15 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"el" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "em" = ( /obj/structure/lattice, /obj/structure/railing, @@ -213,6 +391,9 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"eL" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "eM" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/carpet, @@ -220,6 +401,11 @@ "eR" = ( /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/holodorm/source_beach) +"eT" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "eW" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove{ @@ -228,6 +414,21 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"eZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"fl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "fn" = ( /obj/effect/floor_decal/corner/green/full{ dir = 4 @@ -242,13 +443,49 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) +"fz" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "fD" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"fE" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry{ + dir = 1 + }, +/area/shuttle/supply) "fF" = ( /turf/space, /area/space) +"fK" = ( +/obj/structure/window/reinforced, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_x = -32 + }, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "fN" = ( /obj/structure/window/reinforced, /turf/unsimulated/wall, @@ -257,10 +494,87 @@ /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"fT" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"fW" = ( +/obj/spawner/window/borosillicate/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/shuttle/escape) +"fY" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"ge" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = 26 + }, +/obj/structure/bed/chair/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"gf" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "gg" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, /area/holodeck/holodorm/source_desert) +"gl" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"go" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"gr" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "gz" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, @@ -283,6 +597,15 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_theatre) +"gW" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "gX" = ( /obj/structure/bed/chair/holochair, /obj/effect/floor_decal/carpet{ @@ -290,6 +613,20 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"hf" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"hl" = ( +/obj/structure/closet/walllocker/autolok_wall, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "ho" = ( /obj/effect/floor_decal/sign/c, /turf/simulated/floor/holofloor/wood, @@ -347,6 +684,15 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"hC" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "hG" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -354,6 +700,39 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"hM" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"hQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"ib" = ( +/turf/simulated/floor/reinforced, +/area/space) "ic" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, @@ -361,6 +740,12 @@ "ie" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"ii" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) "ij" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) @@ -383,6 +768,31 @@ /obj/item/clothing/head/pin/flower, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) +"iN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) +"iO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "iR" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -421,6 +831,18 @@ }, /turf/simulated/floor/holofloor/space, /area/space) +"js" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "jv" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/holofloor/wood, @@ -448,6 +870,25 @@ "jL" = ( /turf/unsimulated/wall, /area/space) +"jP" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/door/airlock/glass_external/public{ + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "jY" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -507,15 +948,30 @@ }, /turf/simulated/floor/holofloor/carpet, /area/space) +"kG" = ( +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "kH" = ( /obj/effect/debris/cleanable/dirt, /obj/structure/holostool, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"kP" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) "kS" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"kT" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/communications, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "lf" = ( /obj/effect/floor_decal/carpet{ dir = 1 @@ -543,6 +999,15 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"lu" = ( +/obj/machinery/button/windowtint{ + id = "emergency_security"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/structure/bed/chair/shuttle, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "lF" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -551,6 +1016,16 @@ }, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"lH" = ( +/obj/structure/sign/warning/docking_area, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"lJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "ma" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -571,12 +1046,44 @@ /obj/structure/window/reinforced, /turf/unsimulated/wall, /area/space) +"mq" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) "ms" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) +"mB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/obj/machinery/door/blast/regular/open{ + id = "emergency_shuttle_lockdown"; + name = "Emergency Shuttle Blast Door" + }, +/obj/spawner/window/full/firelocks, +/turf/simulated/floor/reinforced, +/area/shuttle/escape) +"nn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "np" = ( /turf/simulated/floor/holofloor/beach/water, /area/holodeck/holodorm/source_beach) +"nA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "nB" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -606,6 +1113,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"oE" = ( +/obj/machinery/door/airlock/command{ + name = "Cockpit" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "oM" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -637,6 +1150,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"pj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "pp" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -663,6 +1182,9 @@ /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor/snow, /area/holodeck/source_snowfield) +"py" = ( +/turf/unsimulated/floor/steel, +/area/centcom/simulated/terminal) "pJ" = ( /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, @@ -673,6 +1195,21 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_boxingcourt) +"pR" = ( +/obj/machinery/door/airlock/command{ + name = "Cockpit" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"pW" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"qb" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "qd" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -680,6 +1217,16 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"qe" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "supply_shuttle_hatch"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/shuttle/floor, +/area/shuttle/supply) "qk" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -693,6 +1240,24 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"ql" = ( +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/fuel_port{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"qm" = ( +/obj/structure/table/standard, +/obj/random/plushie, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "qo" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -714,12 +1279,36 @@ /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"qK" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"qT" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/industrial/danger, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"qZ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "rb" = ( /obj/effect/floor_decal/corner/red{ dir = 6 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"rc" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "re" = ( /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/holofloor/wood, @@ -728,6 +1317,24 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/holodorm/source_garden) +"rk" = ( +/obj/machinery/door/airlock/medical{ + name = "Shuttle Medical" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"rm" = ( +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"rp" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/airless, +/area/shuttle/supply) "rs" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -740,10 +1347,29 @@ /obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"rz" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"rD" = ( +/turf/unsimulated/floor/dark, +/area/centcom/suppy) "rF" = ( /obj/structure/catwalk, /turf/simulated/floor/holofloor/reinforced, /area/space) +"rG" = ( +/obj/machinery/vending/blood, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"rN" = ( +/obj/machinery/door/airlock/security{ + name = "Shuttle Security" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "sa" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 @@ -759,6 +1385,15 @@ /obj/item/chess/bpawn, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"sw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "sE" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 8 @@ -776,6 +1411,19 @@ /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"sO" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/turf/unsimulated/floor/steel, +/area/centcom/simulated/terminal) +"sP" = ( +/turf/simulated/floor/reinforced, +/area/shuttle/escape) "tg" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -792,10 +1440,35 @@ "tl" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"tm" = ( +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "tv" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_desert) +"tz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/structure/handrail, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"tB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) "tP" = ( /obj/machinery/door/window/holowindoor{ name = "Red Team" @@ -806,6 +1479,32 @@ /obj/item/chess/brook, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"uc" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdown"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/turf/space/transit/west, +/area/space) +"ue" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "ui" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, @@ -816,6 +1515,21 @@ "ul" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"un" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"ur" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "ut" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -847,6 +1561,25 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"uU" = ( +/obj/machinery/holoplant{ + pixel_y = 6 + }, +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "uW" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -856,6 +1589,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"ve" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "vv" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 4 @@ -865,6 +1604,16 @@ "vw" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_meetinghall) +"vx" = ( +/obj/structure/table/standard, +/obj/item/defib_kit/loaded, +/obj/item/storage/firstaid/clotting{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/firstaid/adv, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "vC" = ( /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, @@ -875,6 +1624,22 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"vI" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"vK" = ( +/obj/machinery/status_display, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"vM" = ( +/obj/machinery/computer/shuttle_control/emergency{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "vO" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, @@ -891,6 +1656,13 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"vR" = ( +/obj/machinery/door/window/brigdoor/southright{ + dir = 4; + name = "holding cell" + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "vV" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_seating) @@ -898,10 +1670,35 @@ /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"wb" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "wc" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"wi" = ( +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/fuel_port{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"wj" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "wm" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -919,6 +1716,24 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"wp" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "ws" = ( /obj/machinery/door/window/holowindoor{ name = "Red Team" @@ -945,6 +1760,24 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"wX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "xa" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -968,12 +1801,56 @@ }, /turf/simulated/floor/holofloor/carpet, /area/space) +"xm" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "xv" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"xx" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"xy" = ( +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"xB" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"xI" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "xO" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -983,6 +1860,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"xR" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "xS" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -1012,6 +1900,12 @@ /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor/snow, /area/holodeck/holodorm/source_snow) +"yE" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) "yH" = ( /obj/structure/catwalk, /obj/structure/table/holotable, @@ -1025,6 +1919,26 @@ /obj/item/chess/bking, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"za" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + landmark_tag = "supply_cc"; + name = "Centcom Supply Depot" + }, +/turf/simulated/shuttle/plating/airless/carry{ + dir = 1 + }, +/area/shuttle/supply) +"zg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "zm" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, @@ -1073,6 +1987,20 @@ /obj/structure/lattice, /turf/simulated/floor/holofloor/space, /area/space) +"As" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/obj/machinery/button/windowtint{ + id = "emergency_cockpit"; + pixel_x = -24; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"AB" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/shuttle/supply) "AG" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) @@ -1082,6 +2010,15 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"AJ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "AQ" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1111,6 +2048,10 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"Bj" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) "Bn" = ( /obj/landmark{ name = "Wolfgirl Spawn" @@ -1124,6 +2065,15 @@ }, /turf/simulated/floor/holofloor/reinforced, /area/space) +"Bq" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Br" = ( /obj/structure/railing{ dir = 4 @@ -1141,24 +2091,82 @@ /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"BK" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "BO" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Cb" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Cd" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_desert) +"Ce" = ( +/turf/space/transit/west, +/area/space) +"Cg" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "Ch" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" }, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) +"Ck" = ( +/obj/machinery/status_display/supply_display, +/turf/unsimulated/wall, +/area/centcom/suppy) +"Cm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Co" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"Cp" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/unsimulated/floor/steel, +/area/centcom/simulated/main_hall) "Cu" = ( /obj/structure/window/reinforced/holowindow{ dir = 4 @@ -1178,10 +2186,44 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"Cy" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/machinery/camera/network/crescent{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) +"Cz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"CU" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "CW" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"CX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) +"Db" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) "Dj" = ( /obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ @@ -1227,6 +2269,19 @@ /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"Dt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"DD" = ( +/obj/spawner/window/full/firelocks, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "DF" = ( /obj/structure/table/woodentable/holotable, /obj/effect/floor_decal/carpet{ @@ -1238,6 +2293,32 @@ /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, /area/space) +"DS" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"DU" = ( +/obj/machinery/vending/medical, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "DW" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1284,19 +2365,51 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"Ex" = ( +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) "Ey" = ( /obj/item/chess/bqueen, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"EH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) "EO" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"EZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/crew, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Fd" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"Ff" = ( +/obj/item/handcuffs, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Fh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Fl" = ( /turf/simulated/floor/holofloor/desert, /area/holodeck/holodorm/source_desert) @@ -1329,6 +2442,24 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"FO" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"FS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "FU" = ( /obj/structure/holostool, /obj/structure/window/reinforced/holowindow{ @@ -1340,6 +2471,19 @@ /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"Gb" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/shuttle_control/emergency, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Gc" = ( +/obj/structure/table/standard, +/obj/item/material/ashtray/glass, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"Gk" = ( +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Gm" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -1353,6 +2497,16 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"Gz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/structure/handrail, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "GI" = ( /obj/structure/railing{ dir = 8 @@ -1369,16 +2523,39 @@ /obj/effect/floor_decal/sign/a, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"GM" = ( +/obj/machinery/door/airlock/glass_external/public, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "GW" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"Hf" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/camera/network/crescent{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "Hj" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Hq" = ( +/obj/structure/sign/warning/nosmoking_2, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"Ht" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "Hz" = ( /obj/effect/floor_decal/carpet{ dir = 1 @@ -1399,6 +2576,18 @@ /obj/structure/window/reinforced/holowindow, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"HK" = ( +/obj/effect/step_trigger/teleporter/random, +/turf/space, +/area/space) +"HQ" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/industrial/danger/corner, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"Im" = ( +/turf/simulated/floor/tiled, +/area/shuttle/escape) "Io" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_theatre) @@ -1417,6 +2606,47 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"IC" = ( +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"IL" = ( +/obj/spawner/window/full/firelocks, +/turf/simulated/floor, +/area/shuttle/escape) +"IO" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"IR" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) +"IU" = ( +/obj/effect/step_trigger/teleporter/random, +/turf/space/basic, +/area/space) +"IZ" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Jd" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/camera/network/crescent{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "Jg" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -1453,6 +2683,15 @@ /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"JX" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"JZ" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/restaurant) "Kb" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1481,6 +2720,21 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"Kl" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Ko" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, @@ -1514,6 +2768,21 @@ }, /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_basic) +"KG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/escape) +"KK" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/camera/network/crescent{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "KQ" = ( /obj/item/checker/redking, /obj/item/checker/redking, @@ -1545,16 +2814,72 @@ }, /turf/unsimulated/wall, /area/space) +"Lq" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Ls" = ( /obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"LC" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/door/airlock/glass_external/public{ + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"LD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "LF" = ( /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, /area/space) +"LY" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "supply_shuttle"; + pixel_x = 26; + req_one_access = list(13,31); + tag_door = "supply_shuttle_hatch" + }, +/turf/simulated/shuttle/floor, +/area/shuttle/supply) "Mf" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -1563,6 +2888,10 @@ /obj/item/chess/wqueen, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"Mm" = ( +/obj/machinery/power/pointdefense, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) "MG" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -1578,6 +2907,17 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"MZ" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/firstaid/surgery, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Na" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1594,9 +2934,38 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"Nh" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Nk" = ( /turf/simulated/floor/holofloor/carpet, /area/space) +"Np" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"NA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) +"NC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "NF" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1608,10 +2977,25 @@ /obj/item/clothing/gloves/boxing/hologlove, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"NX" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Oa" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/holofloor/grass, /area/holodeck/holodorm/source_garden) +"Ob" = ( +/turf/simulated/shuttle/floor, +/area/shuttle/supply) "Oe" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, @@ -1622,6 +3006,10 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"Oh" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) "Oj" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -1661,11 +3049,23 @@ "OA" = ( /turf/simulated/floor/holofloor/lino, /area/holodeck/source_meetinghall) -"ON" = ( -/obj/effect/floor_decal/carpet{ - dir = 5 +"OM" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/obj/effect/floor_decal/carpet{ +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"ON" = ( +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/obj/effect/floor_decal/carpet{ dir = 6 }, /obj/effect/floor_decal/carpet{ @@ -1699,6 +3099,16 @@ "Pf" = ( /turf/simulated/floor/holofloor/reinforced, /area/holodeck/source_wildlife) +"Ph" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) "Pk" = ( /obj/machinery/door/window/holowindoor, /turf/simulated/floor/holofloor/tiled, @@ -1706,6 +3116,27 @@ "Pl" = ( /turf/simulated/floor/holofloor/beach/water, /area/holodeck/source_beach) +"Pz" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "PF" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/holofloor/wood, @@ -1713,6 +3144,11 @@ "PI" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) +"PO" = ( +/obj/structure/medical_stand/anesthetic, +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "PX" = ( /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor/snow, @@ -1743,10 +3179,44 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"Qf" = ( +/obj/structure/table/standard, +/obj/item/deck/cards, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"Qn" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"Qq" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/main_hall) "Qr" = ( /obj/effect/overlay/palmtree_r, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"Qs" = ( +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Qw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Qx" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -1758,6 +3228,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"QB" = ( +/obj/machinery/atmospherics/component/binary/pump/fuel{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "QP" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1765,6 +3246,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"QR" = ( +/obj/machinery/atmospherics/component/unary/engine/biggest{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/escape) "QU" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove{ @@ -1779,12 +3266,37 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) +"Rc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"Rm" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/centcom/terminal; + base_turf = /turf/unsimulated/floor/techfloor_grid; + landmark_tag = "escape_cc"; + name = "Escape Shuttle Centcom" + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) "Rs" = ( /obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"Rx" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/folder/blue, +/obj/item/pen, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "RC" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -1803,11 +3315,48 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"RM" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"RO" = ( +/obj/machinery/sleep_console{ + dir = 4 + }, +/obj/machinery/button/windowtint{ + id = "emergency_medical"; + pixel_x = -24; + pixel_y = -8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"RP" = ( +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "RT" = ( /obj/structure/catwalk, /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/holofloor/reinforced, /area/space) +"RV" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "RX" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -1821,6 +3370,60 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) +"Se" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "emergency_shuttle_lockdown"; + name = "Emergency Blast Doors"; + pixel_x = 24; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Sg" = ( +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth{ + pixel_x = 24; + pixel_y = -8 + }, +/obj/item/folder/blue, +/obj/item/radio{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/radio, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Sp" = ( +/obj/structure/window/reinforced, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_x = 32 + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) +"Sr" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "SE" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1833,6 +3436,18 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"SG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "SI" = ( /obj/structure/railing, /obj/structure/lattice, @@ -1862,9 +3477,37 @@ /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, /area/holodeck/holodorm/source_seating) +"SY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Te" = ( /turf/space/basic, /area/space) +"Tk" = ( +/obj/item/paper{ + info = "You're not supposed to be here."; + name = "unnerving letter" + }, +/turf/unsimulated/floor/dark, +/area/centcom/suppy) +"Tn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/escape) "Tt" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_basic) @@ -1902,6 +3545,13 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"Uf" = ( +/obj/effect/shuttle_landmark{ + landmark_tag = "escape_transit"; + name = "Escape Transit" + }, +/turf/space/transit/west, +/area/space) "Us" = ( /obj/item/chess/wrook, /turf/simulated/floor/holofloor/tiled/dark, @@ -1913,6 +3563,36 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"Uw" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/unsimulated/floor/techfloor_grid, +/area/centcom/simulated/terminal) +"UF" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"UJ" = ( +/turf/simulated/shuttle/wall, +/area/shuttle/supply) +"UN" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"UQ" = ( +/obj/machinery/pointdefense_control, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "UT" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -1921,6 +3601,21 @@ /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_chess) +"UW" = ( +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = -26 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "UZ" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -1940,9 +3635,51 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Vi" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/obj/machinery/meter, +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Vk" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"Vo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/escape) +"Vv" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "VO" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1954,6 +3691,32 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"VQ" = ( +/obj/structure/closet/crate, +/turf/unsimulated/floor/dark, +/area/centcom/suppy) +"VR" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "VW" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full{ @@ -1961,6 +3724,26 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"Wg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/structure/handrail, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"Ws" = ( +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "Wt" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -1970,6 +3753,32 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"Wv" = ( +/obj/structure/sign/warning{ + name = "\improper STAND AWAY FROM TRACK EDGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"WA" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) +"WM" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) +"WO" = ( +/obj/structure/table/glass, +/obj/random/action_figure, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "WU" = ( /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, @@ -1984,15 +3793,59 @@ /obj/structure/bed/holobed, /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_basic) +"Xp" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/escape) +"Xt" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"Xu" = ( +/obj/structure/bed/chair/bay/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "XI" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_checker) "XT" = ( /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) +"XU" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/steel_grid, +/area/shuttle/escape) "XX" = ( /turf/simulated/floor/holofloor/tiled, /area/space) +"Ye" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/unsimulated/floor/steel, +/area/centcom/simulated/terminal) "Yg" = ( /obj/structure/railing{ dir = 4 @@ -2050,6 +3903,30 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"Zh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/escape) +"Zj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/centcom/simulated/terminal) +"Zl" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Zq" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -2069,1767 +3946,30 @@ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_basketball) -"ZH" = ( -/turf/simulated/floor/holofloor/snow, -/area/holodeck/source_snowfield) -"ZJ" = ( -/obj/structure/holohoop{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_basketball) - -(1,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(2,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(3,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(4,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(5,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(6,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(7,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(8,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(9,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -"} -(10,1,1) = {" +/area/holodeck/source_basketball) +"ZB" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"ZH" = ( +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"ZJ" = ( +/obj/structure/holohoop{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"ZO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/escape) + +(1,1,1) = {" Te Te Te @@ -4023,7 +4163,7 @@ Te Te Te "} -(11,1,1) = {" +(2,1,1) = {" Te Te Te @@ -4217,7 +4357,7 @@ Te Te Te "} -(12,1,1) = {" +(3,1,1) = {" Te Te Te @@ -4411,7 +4551,7 @@ Te Te Te "} -(13,1,1) = {" +(4,1,1) = {" Te Te Te @@ -4605,7 +4745,7 @@ Te Te Te "} -(14,1,1) = {" +(5,1,1) = {" Te Te Te @@ -4799,7 +4939,7 @@ Te Te Te "} -(15,1,1) = {" +(6,1,1) = {" Te Te Te @@ -4993,7 +5133,7 @@ Te Te Te "} -(16,1,1) = {" +(7,1,1) = {" Te Te Te @@ -5187,7 +5327,7 @@ Te Te Te "} -(17,1,1) = {" +(8,1,1) = {" Te Te Te @@ -5381,7 +5521,7 @@ Te Te Te "} -(18,1,1) = {" +(9,1,1) = {" Te Te Te @@ -5575,7 +5715,7 @@ Te Te Te "} -(19,1,1) = {" +(10,1,1) = {" Te Te Te @@ -5769,7 +5909,7 @@ Te Te Te "} -(20,1,1) = {" +(11,1,1) = {" Te Te Te @@ -5963,7 +6103,7 @@ Te Te Te "} -(21,1,1) = {" +(12,1,1) = {" Te Te Te @@ -6157,7 +6297,7 @@ Te Te Te "} -(22,1,1) = {" +(13,1,1) = {" Te Te Te @@ -6351,7 +6491,7 @@ Te Te Te "} -(23,1,1) = {" +(14,1,1) = {" Te Te Te @@ -6545,7 +6685,7 @@ Te Te Te "} -(24,1,1) = {" +(15,1,1) = {" Te Te Te @@ -6739,7 +6879,7 @@ Te Te Te "} -(25,1,1) = {" +(16,1,1) = {" Te Te Te @@ -6933,7 +7073,7 @@ Te Te Te "} -(26,1,1) = {" +(17,1,1) = {" Te Te Te @@ -7127,7 +7267,7 @@ Te Te Te "} -(27,1,1) = {" +(18,1,1) = {" Te Te Te @@ -7321,7 +7461,7 @@ Te Te Te "} -(28,1,1) = {" +(19,1,1) = {" Te Te Te @@ -7515,7 +7655,7 @@ Te Te Te "} -(29,1,1) = {" +(20,1,1) = {" Te Te Te @@ -7709,11 +7849,7 @@ Te Te Te "} -(30,1,1) = {" -Te -Te -Te -Te +(21,1,1) = {" Te Te Te @@ -7725,6 +7861,35 @@ Te Te Te Te +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB Te Te Te @@ -7877,6 +8042,8 @@ Te Te Te Te +"} +(22,1,1) = {" Te Te Te @@ -7888,6 +8055,35 @@ Te Te Te Te +lH +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +mq +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +ZB +mq +ZB +ZB +ZB +ZB +ZB +ZB +Wv Te Te Te @@ -7902,8 +8098,6 @@ Te Te Te Te -"} -(31,1,1) = {" Te Te Te @@ -8042,6 +8236,8 @@ Te Te Te Te +"} +(23,1,1) = {" Te Te Te @@ -8053,6 +8249,35 @@ Te Te Te Te +ZB +FO +Hf +FO +RM +FO +FO +FO +FO +RM +FO +FO +FO +FO +RM +FO +FO +FO +FO +RM +FO +FO +FO +FO +RM +FO +Hf +FO +ZB Te Te Te @@ -8096,8 +8321,6 @@ Te Te Te Te -"} -(32,1,1) = {" Te Te Te @@ -8207,6 +8430,8 @@ Te Te Te Te +"} +(24,1,1) = {" Te Te Te @@ -8218,6 +8443,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +IC +IC +IC +IC +IC +bV +Nh +NC +NA +mB +mB +NA +nn +IC +IC +IC +IC +IC +IC +IC +IC +ZB Te Te Te @@ -8290,8 +8544,6 @@ Te Te Te Te -"} -(33,1,1) = {" Te Te Te @@ -8372,6 +8624,8 @@ Te Te Te Te +"} +(25,1,1) = {" Te Te Te @@ -8383,6 +8637,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +Zh +lJ +NA +mB +NA +NA +NA +KG +bN +bN +bN +eT +zg +RV +Bj +IC +IC +IC +IC +IC +IC +ZB Te Te Te @@ -8484,8 +8767,6 @@ Te Te Te Te -"} -(34,1,1) = {" Te Te Te @@ -8537,6 +8818,8 @@ Te Te Te Te +"} +(26,1,1) = {" Te Te Te @@ -8548,6 +8831,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +Mm +Db +fY +KG +ue +gl +fz +NX +Gk +fT +ZO +vR +ZO +Bq +zg +NA +RV +Bj +IC +bC +bC +bC +IC +ZB Te Te Te @@ -8678,8 +8990,6 @@ Te Te Te Te -"} -(35,1,1) = {" Te Te Te @@ -8702,6 +9012,8 @@ Te Te Te Te +"} +(27,1,1) = {" Te Te Te @@ -8713,6 +9025,35 @@ Te Te Te Te +ZB +pW +IC +Gk +Db +IL +Gk +ue +fK +ck +tm +tm +xR +Gk +ge +tm +tm +rc +Db +tB +ql +Db +Db +Qn +nA +sw +Dt +qK +ZB Te Te Te @@ -8865,6 +9206,8 @@ Te Te Te Te +"} +(28,1,1) = {" Te Te Te @@ -8872,12 +9215,39 @@ Te Te Te Te -"} -(36,1,1) = {" Te Te Te Te +ZB +pW +Gk +Gk +Db +UQ +vK +VR +Oh +iO +tm +aj +bS +Gk +lu +tm +tm +Ff +Gk +Vi +FS +AJ +jP +WA +WA +py +qT +qK +ZB Te Te Te @@ -9030,6 +9400,8 @@ Te Te Te Te +"} +(29,1,1) = {" Te Te Te @@ -9041,6 +9413,35 @@ Te Te Te Te +ZB +pW +Db +Db +cP +Xu +IL +tz +tm +hQ +tm +Kl +UW +Db +Gk +rN +IL +vK +Db +Gz +rm +gr +LC +WA +WA +py +qT +qK +ZB Te Te Te @@ -9066,8 +9467,6 @@ Te Te Te Te -"} -(37,1,1) = {" Te Te Te @@ -9195,6 +9594,8 @@ Te Te Te Te +"} +(30,1,1) = {" Te Te Te @@ -9206,6 +9607,35 @@ Te Te Te Te +ZB +pW +IL +kT +As +hl +IL +Fh +rz +rz +rz +rz +ax +WO +Pz +tm +XU +uU +IL +Np +QB +EH +EH +Uw +LD +py +qT +qK +ZB Te Te Te @@ -9260,8 +9690,6 @@ Te Te Te Te -"} -(38,1,1) = {" Te Te Te @@ -9360,6 +9788,8 @@ Te Te Te Te +"} +(31,1,1) = {" Te Te Te @@ -9371,6 +9801,35 @@ Te Te Te Te +ZB +pW +IL +Gb +IO +tm +oE +tm +qm +Gc +Qf +qm +tm +tm +tm +tm +tm +eL +xm +wj +pj +RV +Bj +ae +LD +py +qT +qK +ZB Te Te Te @@ -9454,8 +9913,6 @@ Te Te Te Te -"} -(39,1,1) = {" Te Te Te @@ -9525,6 +9982,8 @@ Te Te Te Te +"} +(32,1,1) = {" Te Te Te @@ -9536,6 +9995,35 @@ Te Te Te Te +ZB +pW +IL +EZ +Se +hl +IL +Qw +vI +vI +vI +vI +Ws +UF +Lq +tm +wX +cr +IL +js +bU +Db +Db +kP +LD +py +qT +qK +ZB Te Te Te @@ -9648,8 +10136,6 @@ Te Te Te Te -"} -(40,1,1) = {" Te Te Te @@ -9690,6 +10176,8 @@ Te Te Te Te +"} +(33,1,1) = {" Te Te Te @@ -9701,6 +10189,35 @@ Te Te Te Te +ZB +pW +Db +Db +Sg +wb +IL +Wg +tm +cv +tm +SY +Sr +Db +Gk +rk +IL +vK +Db +Gz +IZ +AJ +jP +WA +WA +py +qT +qK +ZB Te Te Te @@ -9842,8 +10359,6 @@ Te Te Te Te -"} -(41,1,1) = {" Te Te Te @@ -9855,6 +10370,8 @@ Te Te Te Te +"} +(34,1,1) = {" Te Te Te @@ -9866,6 +10383,35 @@ Te Te Te Te +ZB +pW +Gk +Gk +Db +Rx +vK +DS +Oh +Vv +tm +Cb +go +Gk +RO +tm +WM +WM +Gk +xx +SG +gr +LC +WA +WA +py +qT +qK +ZB Te Te Te @@ -10018,6 +10564,8 @@ Te Te Te Te +"} +(35,1,1) = {" Te Te Te @@ -10029,6 +10577,35 @@ Te Te Te Te +ZB +pW +IC +Gk +Db +IL +Gk +gf +Sp +ck +tm +tm +xR +Gk +RP +tm +tm +Cg +Db +tB +wi +Db +Db +Uw +LD +py +qT +qK +ZB Te Te Te @@ -10036,8 +10613,6 @@ Te Te Te Te -"} -(42,1,1) = {" Te Te Te @@ -10183,6 +10758,8 @@ Te Te Te Te +"} +(36,1,1) = {" Te Te Te @@ -10194,6 +10771,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +Mm +Db +hM +iN +gf +xy +wp +OM +Gk +DU +tm +tm +tm +rG +zg +NA +RV +Bj +ae +LD +py +qT +qK +ZB Te Te Te @@ -10230,8 +10836,6 @@ Te Te Te Te -"} -(43,1,1) = {" Te Te Te @@ -10348,6 +10952,8 @@ Te Te Te Te +"} +(37,1,1) = {" Te Te Te @@ -10359,6 +10965,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +yE +Tn +NA +mB +NA +NA +NA +iN +MZ +Qs +PO +vx +zg +RV +Bj +IC +ae +LD +py +qT +qK +ZB Te Te Te @@ -10424,8 +11059,6 @@ Te Te Te Te -"} -(44,1,1) = {" Te Te Te @@ -10513,6 +11146,8 @@ Te Te Te Te +"} +(38,1,1) = {" Te Te Te @@ -10524,6 +11159,35 @@ Te Te Te Te +ZB +pW +IC +IC +IC +IC +IC +IC +IC +IC +IC +IC +bV +el +JX +Cm +mB +mB +Cm +ve +IC +IC +IC +ae +LD +py +qT +qK +ZB Te Te Te @@ -10618,8 +11282,6 @@ Te Te Te Te -"} -(45,1,1) = {" Te Te Te @@ -10678,6 +11340,8 @@ Te Te Te Te +"} +(39,1,1) = {" Te Te Te @@ -10689,6 +11353,35 @@ Te Te Te Te +ZB +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +bC +Qn +LD +py +qT +qK +ZB Te Te Te @@ -10812,8 +11505,6 @@ Te Te Te Te -"} -(46,1,1) = {" Te Te Te @@ -10843,6 +11534,8 @@ Te Te Te Te +"} +(40,1,1) = {" Te Te Te @@ -10854,6 +11547,35 @@ Te Te Te Te +Zl +aJ +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +sw +BK +py +qT +xB +ZB Te Te Te @@ -11007,8 +11729,7 @@ Te Te Te "} -(47,1,1) = {" -Te +(41,1,1) = {" Te Te Te @@ -11020,6 +11741,35 @@ Te Te Te Te +CU +kG +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +py +qT +xB +ZB Te Te Te @@ -11172,6 +11922,8 @@ Te Te Te Te +"} +(42,1,1) = {" Te Te Te @@ -11183,6 +11935,35 @@ Te Te Te Te +Xt +Zj +dy +dy +dy +dy +dy +dy +gW +py +py +py +py +py +py +py +py +py +py +py +HQ +dy +dy +dy +dy +dy +eZ +xB +ZB Te Te Te @@ -11200,8 +11981,6 @@ Te Te Te Te -"} -(48,1,1) = {" Te Te Te @@ -11337,6 +12116,8 @@ Te Te Te Te +"} +(43,1,1) = {" Te Te Te @@ -11348,6 +12129,35 @@ Te Te Te Te +ZB +hC +cE +cE +cE +cE +cE +hf +LD +py +py +Ye +qZ +Ph +sO +Ph +Cy +IR +py +py +qT +xI +cE +cE +cE +cE +cE +pW +ZB Te Te Te @@ -11394,8 +12204,6 @@ Te Te Te Te -"} -(49,1,1) = {" Te Te Te @@ -11502,6 +12310,8 @@ Te Te Te Te +"} +(44,1,1) = {" Te Te Te @@ -11513,6 +12323,35 @@ Te Te Te Te +ZB +Ht +Jd +ur +ZB +ZB +ZB +ZB +ZB +ZB +ZB +Hq +Qq +Cp +Cp +Cp +Qq +JZ +JZ +JZ +JZ +JZ +JZ +JZ +ba +ur +KK +Ht +ZB Te Te Te @@ -11588,8 +12427,6 @@ Te Te Te Te -"} -(50,1,1) = {" Te Te Te @@ -11667,6 +12504,8 @@ Te Te Te Te +"} +(45,1,1) = {" Te Te Te @@ -11678,6 +12517,35 @@ Te Te Te Te +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL +jL Te Te Te @@ -11782,8 +12650,6 @@ Te Te Te Te -"} -(51,1,1) = {" Te Te Te @@ -11832,6 +12698,8 @@ Te Te Te Te +"} +(46,1,1) = {" Te Te Te @@ -11976,8 +12844,6 @@ Te Te Te Te -"} -(52,1,1) = {" Te Te Te @@ -12026,6 +12892,8 @@ Te Te Te Te +"} +(47,1,1) = {" Te Te Te @@ -12170,8 +13038,6 @@ Te Te Te Te -"} -(53,1,1) = {" Te Te Te @@ -12220,6 +13086,8 @@ Te Te Te Te +"} +(48,1,1) = {" Te Te Te @@ -12364,8 +13232,6 @@ Te Te Te Te -"} -(54,1,1) = {" Te Te Te @@ -12414,6 +13280,8 @@ Te Te Te Te +"} +(49,1,1) = {" Te Te Te @@ -12558,8 +13426,6 @@ Te Te Te Te -"} -(55,1,1) = {" Te Te Te @@ -12608,6 +13474,8 @@ Te Te Te Te +"} +(50,1,1) = {" Te Te Te @@ -12639,6 +13507,14 @@ Te Te Te Te +ib +ib +eL +fW +fW +eL +ib +ib Te Te Te @@ -12752,8 +13628,6 @@ Te Te Te Te -"} -(56,1,1) = {" Te Te Te @@ -12794,6 +13668,8 @@ Te Te Te Te +"} +(51,1,1) = {" Te Te Te @@ -12825,6 +13701,14 @@ Te Te Te Te +ib +dO +Ex +fW +fW +Ex +eL +ib Te Te Te @@ -12946,8 +13830,6 @@ Te Te Te Te -"} -(57,1,1) = {" Te Te Te @@ -12980,6 +13862,8 @@ Te Te Te Te +"} +(52,1,1) = {" Te Te Te @@ -13011,6 +13895,14 @@ Te Te Te Te +ib +Ex +Ex +vM +Xp +Ex +Ex +ib Te Te Te @@ -13140,8 +14032,6 @@ Te Te Te Te -"} -(58,1,1) = {" Te Te Te @@ -13166,6 +14056,8 @@ Te Te Te Te +"} +(53,1,1) = {" Te Te Te @@ -13197,6 +14089,14 @@ Te Te Te Te +ib +Ex +bP +qb +qb +Im +Ex +ib Te Te Te @@ -13334,8 +14234,6 @@ Te Te Te Te -"} -(59,1,1) = {" Te Te Te @@ -13352,6 +14250,8 @@ Te Te Te Te +"} +(54,1,1) = {" Te Te Te @@ -13383,6 +14283,14 @@ Te Te Te Te +ib +Ex +Im +Im +Im +Im +Ex +ib Te Te Te @@ -13528,8 +14436,6 @@ Te Te Te Te -"} -(60,1,1) = {" Te Te Te @@ -13538,6 +14444,8 @@ Te Te Te Te +"} +(55,1,1) = {" Te Te Te @@ -13569,6 +14477,14 @@ Te Te Te Te +ib +Ex +Im +Im +Im +Im +Ex +ib Te Te Te @@ -13723,15 +14639,7 @@ Te Te Te "} -(61,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te +(56,1,1) = {" Te Te Te @@ -13763,6 +14671,14 @@ Te Te Te Te +ib +Ex +Ex +DD +pR +Ex +Ex +ib Te Te Te @@ -13917,15 +14833,7 @@ Te Te Te "} -(62,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te +(57,1,1) = {" Te Te Te @@ -13957,6 +14865,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14111,23 +15027,7 @@ Te Te Te "} -(63,1,1) = {" -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +(58,1,1) = {" Te Te Te @@ -14159,6 +15059,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14304,8 +15212,6 @@ Te Te Te Te -"} -(64,1,1) = {" Te Te Te @@ -14314,6 +15220,8 @@ Te Te Te Te +"} +(59,1,1) = {" Te Te Te @@ -14345,6 +15253,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14499,7 +15415,8 @@ Te Te Te "} -(65,1,1) = {" +(60,1,1) = {" +Te Te Te Te @@ -14530,6 +15447,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14683,6 +15608,8 @@ Te Te Te Te +"} +(61,1,1) = {" Te Te Te @@ -14692,8 +15619,6 @@ Te Te Te Te -"} -(66,1,1) = {" Te Te Te @@ -14716,6 +15641,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -14869,6 +15802,8 @@ Te Te Te Te +"} +(62,1,1) = {" Te Te Te @@ -14886,8 +15821,6 @@ Te Te Te Te -"} -(67,1,1) = {" Te Te Te @@ -14902,6 +15835,14 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -15055,6 +15996,8 @@ Te Te Te Te +"} +(63,1,1) = {" Te Te Te @@ -15080,14 +16023,20 @@ Te Te Te Te -"} -(68,1,1) = {" Te Te Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te Te @@ -15241,6 +16190,8 @@ Te Te Te Te +"} +(64,1,1) = {" Te Te Te @@ -15272,10 +16223,16 @@ Te Te Te Te +ib +Ex +qb +Im +Im +qb +Ex +ib Te Te -"} -(69,1,1) = {" Te Te Te @@ -15427,6 +16384,8 @@ Te Te Te Te +"} +(65,1,1) = {" Te Te Te @@ -15458,6 +16417,14 @@ Te Te Te Te +Ex +Db +qb +Im +Im +qb +Db +Ex Te Te Te @@ -15468,8 +16435,6 @@ Te Te Te Te -"} -(70,1,1) = {" Te Te Te @@ -15613,6 +16578,8 @@ Te Te Te Te +"} +(66,1,1) = {" Te Te Te @@ -15644,6 +16611,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -15662,8 +16637,6 @@ Te Te Te Te -"} -(71,1,1) = {" Te Te Te @@ -15799,6 +16772,8 @@ Te Te Te Te +"} +(67,1,1) = {" Te Te Te @@ -15830,6 +16805,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -15856,8 +16839,6 @@ Te Te Te Te -"} -(72,1,1) = {" Te Te Te @@ -15985,6 +16966,8 @@ Te Te Te Te +"} +(68,1,1) = {" Te Te Te @@ -16016,6 +16999,14 @@ Te Te Te Te +Ex +qb +Im +Im +Rm +Im +Im +Db Te Te Te @@ -16050,8 +17041,6 @@ Te Te Te Te -"} -(73,1,1) = {" Te Te Te @@ -16171,6 +17160,8 @@ Te Te Te Te +"} +(69,1,1) = {" Te Te Te @@ -16202,6 +17193,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +Db Te Te Te @@ -16244,8 +17243,6 @@ Te Te Te Te -"} -(74,1,1) = {" Te Te Te @@ -16357,6 +17354,8 @@ Te Te Te Te +"} +(70,1,1) = {" Te Te Te @@ -16388,6 +17387,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -16438,8 +17445,6 @@ Te Te Te Te -"} -(75,1,1) = {" Te Te Te @@ -16543,6 +17548,8 @@ Te Te Te Te +"} +(71,1,1) = {" Te Te Te @@ -16574,6 +17581,14 @@ Te Te Te Te +Ex +qb +Im +Im +Im +Im +Im +GM Te Te Te @@ -16632,8 +17647,6 @@ Te Te Te Te -"} -(76,1,1) = {" Te Te Te @@ -16729,6 +17742,8 @@ Te Te Te Te +"} +(72,1,1) = {" Te Te Te @@ -16760,6 +17775,14 @@ Te Te Te Te +Ex +Db +Ex +Im +Ex +Ex +Ex +Db Te Te Te @@ -16826,8 +17849,6 @@ Te Te Te Te -"} -(77,1,1) = {" Te Te Te @@ -16915,6 +17936,8 @@ Te Te Te Te +"} +(73,1,1) = {" Te Te Te @@ -16946,6 +17969,14 @@ Te Te Te Te +ib +Ex +fl +un +un +Cz +Ex +ib Te Te Te @@ -17020,8 +18051,6 @@ Te Te Te Te -"} -(78,1,1) = {" Te Te Te @@ -17101,6 +18130,8 @@ Te Te Te Te +"} +(74,1,1) = {" Te Te Te @@ -17132,6 +18163,14 @@ Te Te Te Te +ib +CX +Rc +UN +Rc +Rc +ii +ib Te Te Te @@ -17214,8 +18253,6 @@ Te Te Te Te -"} -(79,1,1) = {" Te Te Te @@ -17287,6 +18324,8 @@ Te Te Te Te +"} +(75,1,1) = {" Te Te Te @@ -17318,6 +18357,14 @@ Te Te Te Te +ib +tB +Vo +Vo +Vo +Vo +tB +ib Te Te Te @@ -17408,8 +18455,6 @@ Te Te Te Te -"} -(80,1,1) = {" Te Te Te @@ -17473,6 +18518,8 @@ Te Te Te Te +"} +(76,1,1) = {" Te Te Te @@ -17504,6 +18551,14 @@ Te Te Te Te +ib +sP +sP +QR +sP +sP +QR +ib Te Te Te @@ -17602,8 +18657,6 @@ Te Te Te Te -"} -(81,1,1) = {" Te Te Te @@ -17659,6 +18712,8 @@ Te Te Te Te +"} +(77,1,1) = {" Te Te Te @@ -17676,7 +18731,28 @@ Te Te Te Te +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU Te +ib +sP +sP +sP +sP +sP +sP +ib Te Te Te @@ -17796,8 +18872,6 @@ Te Te Te Te -"} -(82,1,1) = {" Te Te Te @@ -17832,6 +18906,8 @@ Te Te Te Te +"} +(78,1,1) = {" Te Te Te @@ -17849,7 +18925,28 @@ Te Te Te Te +IU +am +am +am +am +am +am +am +am +am +am +am +IU Te +ib +sP +sP +sP +sP +sP +sP +ib Te Te Te @@ -17990,8 +19087,6 @@ Te Te Te Te -"} -(83,1,1) = {" Te Te Te @@ -18005,6 +19100,8 @@ Te Te Te Te +"} +(79,1,1) = {" Te Te Te @@ -18022,6 +19119,19 @@ Te Te Te Te +IU +am +VQ +VQ +VQ +VQ +rD +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18185,7 +19295,7 @@ Te Te Te "} -(84,1,1) = {" +(80,1,1) = {" Te Te Te @@ -18203,6 +19313,19 @@ Te Te Te Te +IU +am +rD +rD +rD +rD +rD +rD +rD +rD +rD +am +IU Te Te Te @@ -18365,6 +19488,8 @@ Te Te Te Te +"} +(81,1,1) = {" Te Te Te @@ -18378,12 +19503,23 @@ Te Te Te Te -"} -(85,1,1) = {" Te Te Te Te +IU +am +VQ +VQ +VQ +rD +Tk +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18546,6 +19682,8 @@ Te Te Te Te +"} +(82,1,1) = {" Te Te Te @@ -18563,6 +19701,19 @@ Te Te Te Te +IU +am +VQ +VQ +VQ +rD +rD +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18572,8 +19723,6 @@ Te Te Te Te -"} -(86,1,1) = {" Te Te Te @@ -18727,6 +19876,8 @@ Te Te Te Te +"} +(83,1,1) = {" Te Te Te @@ -18744,6 +19895,19 @@ Te Te Te Te +IU +am +rD +rD +rD +rD +rD +rD +rD +rD +rD +am +IU Te Te Te @@ -18766,8 +19930,6 @@ Te Te Te Te -"} -(87,1,1) = {" Te Te Te @@ -18908,6 +20070,8 @@ Te Te Te Te +"} +(84,1,1) = {" Te Te Te @@ -18925,6 +20089,19 @@ Te Te Te Te +IU +am +VQ +VQ +VQ +VQ +rD +rD +VQ +VQ +VQ +am +IU Te Te Te @@ -18960,8 +20137,6 @@ Te Te Te Te -"} -(88,1,1) = {" Te Te Te @@ -19089,6 +20264,8 @@ Te Te Te Te +"} +(85,1,1) = {" Te Te Te @@ -19106,6 +20283,19 @@ Te Te Te Te +HK +am +am +am +am +Ck +rD +rD +Ck +am +am +am +HK Te Te Te @@ -19154,8 +20344,6 @@ Te Te Te Te -"} -(89,1,1) = {" Te Te Te @@ -19270,6 +20458,8 @@ Te Te Te Te +"} +(86,1,1) = {" Te Te Te @@ -19287,6 +20477,19 @@ Te Te Te Te +HK +fF +AB +UJ +UJ +UJ +qe +qe +UJ +UJ +AB +fF +HK Te Te Te @@ -19348,8 +20551,6 @@ Te Te Te Te -"} -(90,1,1) = {" Te Te Te @@ -19451,6 +20652,8 @@ Te Te Te Te +"} +(87,1,1) = {" Te Te Te @@ -19468,6 +20671,19 @@ Te Te Te Te +HK +AB +AB +Ob +Ob +Ob +Ob +Ob +Ob +Ob +AB +AB +HK Te Te Te @@ -19542,8 +20758,6 @@ Te Te Te Te -"} -(91,1,1) = {" Te Te Te @@ -19632,6 +20846,8 @@ Te Te Te Te +"} +(88,1,1) = {" Te Te Te @@ -19649,6 +20865,19 @@ Te Te Te Te +HK +fE +rp +Ob +Ob +Ob +Ob +Ob +Ob +Ob +Ob +UJ +HK Te Te Te @@ -19736,8 +20965,6 @@ Te Te Te Te -"} -(92,1,1) = {" Te Te Te @@ -19813,6 +21040,8 @@ Te Te Te Te +"} +(89,1,1) = {" Te Te Te @@ -19830,6 +21059,19 @@ Te Te Te Te +HK +za +rp +Ob +Ob +Ob +Ob +Ob +Ob +Ob +Ob +UJ +HK Te Te Te @@ -19930,8 +21172,6 @@ Te Te Te Te -"} -(93,1,1) = {" Te Te Te @@ -19994,6 +21234,8 @@ Te Te Te Te +"} +(90,1,1) = {" Te Te Te @@ -20011,6 +21253,19 @@ Te Te Te Te +HK +fE +rp +Ob +Ob +Ob +Ob +Ob +Ob +Ob +Ob +UJ +HK Te Te Te @@ -20124,8 +21379,6 @@ Te Te Te Te -"} -(94,1,1) = {" Te Te Te @@ -20175,6 +21428,8 @@ Te Te Te Te +"} +(91,1,1) = {" Te Te Te @@ -20192,6 +21447,19 @@ Te Te Te Te +HK +AB +AB +Ob +Ob +LY +Ob +Ob +Ob +Ob +AB +AB +HK Te Te Te @@ -20318,8 +21586,6 @@ Te Te Te Te -"} -(95,1,1) = {" Te Te Te @@ -20356,6 +21622,8 @@ Te Te Te Te +"} +(92,1,1) = {" Te Te Te @@ -20373,6 +21641,19 @@ Te Te Te Te +HK +fF +AB +UJ +UJ +UJ +UJ +UJ +UJ +UJ +AB +fF +HK Te Te Te @@ -20512,8 +21793,6 @@ Te Te Te Te -"} -(96,1,1) = {" Te Te Te @@ -20537,6 +21816,8 @@ Te Te Te Te +"} +(93,1,1) = {" Te Te Te @@ -20554,6 +21835,19 @@ Te Te Te Te +HK +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +IU +HK Te Te Te @@ -20706,8 +22000,6 @@ Te Te Te Te -"} -(97,1,1) = {" Te Te Te @@ -20718,6 +22010,8 @@ Te Te Te Te +"} +(94,1,1) = {" Te Te Te @@ -20735,6 +22029,7 @@ Te Te Te Te +HK Te Te Te @@ -20746,6 +22041,7 @@ Te Te Te Te +HK Te Te Te @@ -20900,8 +22196,6 @@ Te Te Te Te -"} -(98,1,1) = {" Te Te Te @@ -20910,6 +22204,8 @@ Te Te Te Te +"} +(95,1,1) = {" Te Te Te @@ -20927,6 +22223,7 @@ Te Te Te Te +HK Te Te Te @@ -20938,6 +22235,7 @@ Te Te Te Te +HK Te Te Te @@ -21094,14 +22392,14 @@ Te Te Te Te -"} -(99,1,1) = {" Te Te Te Te Te Te +"} +(96,1,1) = {" Te Te Te @@ -21119,6 +22417,7 @@ Te Te Te Te +HK Te Te Te @@ -21130,6 +22429,7 @@ Te Te Te Te +HK Te Te Te @@ -21288,12 +22588,12 @@ Te Te Te Te -"} -(100,1,1) = {" Te Te Te Te +"} +(97,1,1) = {" Te Te Te @@ -21311,6 +22611,7 @@ Te Te Te Te +HK Te Te Te @@ -21322,6 +22623,7 @@ Te Te Te Te +HK Te Te Te @@ -21482,10 +22784,10 @@ Te Te Te Te -"} -(101,1,1) = {" Te Te +"} +(98,1,1) = {" Te Te Te @@ -21503,6 +22805,7 @@ Te Te Te Te +HK Te Te Te @@ -21514,6 +22817,7 @@ Te Te Te Te +HK Te Te Te @@ -21677,9 +22981,7 @@ Te Te Te "} -(102,1,1) = {" -Te -Te +(99,1,1) = {" Te Te Te @@ -21697,6 +22999,7 @@ Te Te Te Te +HK Te Te Te @@ -21708,6 +23011,7 @@ Te Te Te Te +HK Te Te Te @@ -21871,11 +23175,7 @@ Te Te Te "} -(103,1,1) = {" -Te -Te -Te -Te +(100,1,1) = {" Te Te Te @@ -21893,6 +23193,7 @@ Te Te Te Te +HK Te Te Te @@ -21904,6 +23205,7 @@ Te Te Te Te +HK Te Te Te @@ -21972,6 +23274,39 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22033,6 +23368,8 @@ Te Te Te Te +"} +(101,1,1) = {" Te Te Te @@ -22050,6 +23387,19 @@ Te Te Te Te +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK +HK Te Te Te @@ -22064,8 +23414,6 @@ Te Te Te Te -"} -(104,1,1) = {" Te Te Te @@ -22115,6 +23463,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22176,6 +23562,8 @@ Te Te Te Te +"} +(102,1,1) = {" Te Te Te @@ -22258,8 +23646,6 @@ Te Te Te Te -"} -(105,1,1) = {" Te Te Te @@ -22271,6 +23657,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22332,6 +23756,8 @@ Te Te Te Te +"} +(103,1,1) = {" Te Te Te @@ -22425,6 +23851,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22452,8 +23916,6 @@ Te Te Te Te -"} -(106,1,1) = {" Te Te Te @@ -22488,6 +23950,8 @@ Te Te Te Te +"} +(104,1,1) = {" Te Te Te @@ -22581,6 +24045,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22642,12 +24144,12 @@ Te Te Te Te +"} +(105,1,1) = {" Te Te Te Te -"} -(107,1,1) = {" Te Te Te @@ -22737,6 +24239,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22798,6 +24338,8 @@ Te Te Te Te +"} +(106,1,1) = {" Te Te Te @@ -22840,8 +24382,6 @@ Te Te Te Te -"} -(108,1,1) = {" Te Te Te @@ -22893,6 +24433,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -22954,6 +24532,8 @@ Te Te Te Te +"} +(107,1,1) = {" Te Te Te @@ -23034,8 +24614,6 @@ Te Te Te Te -"} -(109,1,1) = {" Te Te Te @@ -23049,6 +24627,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23110,6 +24726,8 @@ Te Te Te Te +"} +(108,1,1) = {" Te Te Te @@ -23203,6 +24821,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23228,8 +24884,6 @@ Te Te Te Te -"} -(110,1,1) = {" Te Te Te @@ -23266,6 +24920,8 @@ Te Te Te Te +"} +(109,1,1) = {" Te Te Te @@ -23359,6 +25015,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23420,10 +25114,10 @@ Te Te Te Te +"} +(110,1,1) = {" Te Te -"} -(111,1,1) = {" Te Te Te @@ -23515,6 +25209,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23576,6 +25308,8 @@ Te Te Te Te +"} +(111,1,1) = {" Te Te Te @@ -23616,8 +25350,6 @@ Te Te Te Te -"} -(112,1,1) = {" Te Te Te @@ -23671,6 +25403,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23732,6 +25502,8 @@ Te Te Te Te +"} +(112,1,1) = {" Te Te Te @@ -23810,8 +25582,6 @@ Te Te Te Te -"} -(113,1,1) = {" Te Te Te @@ -23827,6 +25597,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -23888,6 +25696,8 @@ Te Te Te Te +"} +(113,1,1) = {" Te Te Te @@ -23981,6 +25791,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24004,8 +25852,6 @@ Te Te Te Te -"} -(114,1,1) = {" Te Te Te @@ -24044,6 +25890,8 @@ Te Te Te Te +"} +(114,1,1) = {" Te Te Te @@ -24137,6 +25985,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24293,44 +26179,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24487,44 +26373,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24681,44 +26567,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -24875,44 +26761,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25069,44 +26955,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25263,44 +27149,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25392,72 +27278,34 @@ yM Ee nV bR -nV -bR -aA -Ks -tl -Oy -aI -aI -aI -Nk -xi -kj -Nk -aI -aI -aI -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +nV +bR +aA +Ks +tl +Oy +aI +aI +aI +Nk +xi +kj +Nk +aI +aI +aI +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy Te Te Te @@ -25495,6 +27343,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25651,44 +27537,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -25845,44 +27731,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26039,44 +27925,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26233,44 +28119,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26427,44 +28313,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26621,44 +28507,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -26815,44 +28701,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27009,44 +28895,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Uf +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27203,44 +29089,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27397,44 +29283,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27591,44 +29477,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27720,72 +29606,34 @@ pf iR pf iR -SQ -iR -Jn -iR -XI -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +SQ +iR +Jn +iR +XI +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy Te Te Te @@ -27823,6 +29671,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -27979,44 +29865,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28173,44 +30059,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28367,44 +30253,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28561,44 +30447,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28755,44 +30641,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -28949,44 +30835,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29143,44 +31029,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +uc +uc +uc +uc +uc +uc +uc +uc +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29337,44 +31223,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29531,44 +31417,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29725,44 +31611,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -29919,44 +31805,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30048,72 +31934,34 @@ Kd Kd bh yH -yH -ip -YC -YC -YC -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -Oy -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +yH +ip +YC +YC +YC +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy +XX +XX +XX +XX +XX +XX +XX +XX +XX +XX +Oy Te Te Te @@ -30151,6 +31999,44 @@ Te Te Te Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30307,44 +32193,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30501,44 +32387,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30695,44 +32581,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -30889,44 +32775,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -31083,44 +32969,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te @@ -31277,44 +33163,44 @@ Te Te Te Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te -Te +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce +Ce Te Te Te diff --git a/maps/euthenia/shuttle_stub.dm b/maps/euthenia/shuttle_stub.dm new file mode 100644 index 0000000000..e13be1c60f --- /dev/null +++ b/maps/euthenia/shuttle_stub.dm @@ -0,0 +1,10 @@ +/datum/shuttle/autodock/ferry/emergency/escape/tether + name = "Escape" + location = FERRY_LOCATION_OFFSITE + shuttle_area = /area/shuttle/escape + warmup_time = 10 + landmark_offsite = "escape_cc" + landmark_station = "escape_station" + landmark_transition = "escape_transit" + move_time = SHUTTLE_TRANSIT_DURATION_RETURN + move_direction = WEST diff --git a/maps/generic/turbolifts.dm b/maps/generic/turbolifts.dm index c4bfdc2a9f..73fd8510eb 100644 --- a/maps/generic/turbolifts.dm +++ b/maps/generic/turbolifts.dm @@ -94,9 +94,55 @@ /area/turbolift/t_station/level2 ) +/obj/turbolift_map_holder/tether/two + dir = WEST + areas_to_use = list( + /area/turbolift/t_surface/elevator_two/level1, + /area/turbolift/t_surface/elevator_two/level2, + /area/turbolift/t_surface/elevator_two/level3, + /area/turbolift/tether/elevator_two/transit, + /area/turbolift/t_station/elevator_two/level1, + /area/turbolift/t_station/elevator_two/level2 + ) +/**Euthenia Lifts + */ +/obj/turbolift_map_holder/euthenia_medical + name = "Medical Elevator" + dir = NORTH + depth = 4 + lift_size_x = 2 + lift_size_y = 2 + icon = 'icons/obj/turbolift_preview_3x3.dmi' + wall_type = null // Don't make walls + floor_type = /turf/simulated/floor/glass/reinforced + areas_to_use = list( + /area/turbolift/medical/EutheniaDeck0, + /area/turbolift/medical/EutheniaDeck1, + /area/turbolift/medical/EutheniaDeck2, + /area/turbolift/medical/EutheniaDeck3 + ) + + +/obj/turbolift_map_holder/euthenia_cargo + name = "Cargo Elevator" + dir = SOUTH + depth = 5 + lift_size_x = 3 + lift_size_y = 2 + icon = 'icons/obj/turbolift_preview_3x3.dmi' + wall_type = null // Don't make walls + floor_type = /turf/simulated/floor/tiled/techfloor/monogrid + areas_to_use = list( + /area/turbolift/cargo/EutheniaDeck0, + /area/turbolift/cargo/EutheniaDeck1, + /area/turbolift/cargo/EutheniaDeck2, + /area/turbolift/cargo/EutheniaDeck3, + /area/turbolift/cargo/EutheniaDeck4 + ) +// I love finding these kevvy /* SHUT UP /datum/turbolift music = list('sound/music/elevator1.ogg', 'sound/music/elevator2.ogg') // Woo elevator music! diff --git a/maps/map_levels/140x140/fueldepot.dmm b/maps/map_levels/140x140/fueldepot.dmm index 9afa68ae9d..b4923e8bb1 100644 --- a/maps/map_levels/140x140/fueldepot.dmm +++ b/maps/map_levels/140x140/fueldepot.dmm @@ -297,8 +297,7 @@ dir = 6 }, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/airless, diff --git a/maps/map_levels/140x140/lavaland_dungeon.dmm b/maps/map_levels/140x140/lavaland_dungeon.dmm index 18ce1ba21c..b883bd7697 100644 --- a/maps/map_levels/140x140/lavaland_dungeon.dmm +++ b/maps/map_levels/140x140/lavaland_dungeon.dmm @@ -968,10 +968,7 @@ /turf/simulated/floor/tiled/steel_dirty/lavaland, /area/lavaland/dungeon/facility) "Sk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "1-8" }, diff --git a/maps/map_levels/140x140/talon/talon1.dmm b/maps/map_levels/140x140/talon/talon1.dmm index edaa06a6a1..cff249acb7 100644 --- a/maps/map_levels/140x140/talon/talon1.dmm +++ b/maps/map_levels/140x140/talon/talon1.dmm @@ -1,7 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -25 }, /obj/machinery/lathe/autolathe, @@ -242,10 +241,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) "ct" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/structure/handrail{ dir = 8 }, @@ -384,8 +380,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_port) "dx" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -412,9 +407,7 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/starboard_solar) "dO" = ( @@ -502,8 +495,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/tiled/eris/white/orangecorner, @@ -656,18 +648,14 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 29 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/dark/brown_perforated, /area/talon/deckone/starboard_eng) "ge" = ( /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -732,8 +720,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/steel, @@ -984,8 +971,7 @@ dir = 1; icon_state = "4-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -1319,10 +1305,7 @@ /turf/simulated/wall/rshull, /area/talon/maintenance/deckone_port) "lr" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 29 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/atmospherics/portables_connector{ dir = 8; @@ -1782,8 +1765,7 @@ /area/talon/deckone/brig) "pN" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24; req_access = list(301) }, @@ -2117,8 +2099,7 @@ name = "Talon Starboard SMES Connection"; name_tag = "TLN-SBD-SMES" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/dark/cyancorner, @@ -2521,8 +2502,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/plating, @@ -2577,8 +2557,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -2603,9 +2582,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/steel/cargo, /area/talon/deckone/workroom) "wG" = ( @@ -2780,7 +2757,7 @@ pixel_x = 22 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "talon_port"; name = "interior access button"; @@ -2861,8 +2838,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -2901,8 +2877,7 @@ /turf/space, /area/space) "yl" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -29 }, /obj/machinery/atmospherics/portables_connector{ @@ -2952,8 +2927,7 @@ /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/starboard_solar) "yR" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/eris/dark/brown_platform, @@ -3358,10 +3332,7 @@ name = "Talon Port SMES Connection"; name_tag = "TLN-PRT-SMES" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/port_solar) "BU" = ( @@ -3532,11 +3503,7 @@ /turf/simulated/wall, /area/talon/deckone/bridge_hallway) "CR" = ( -/obj/machinery/firealarm/alarms_hidden{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/eris/steel, @@ -3545,7 +3512,7 @@ /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "talon_port"; name = "exterior access button"; @@ -3879,8 +3846,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -3934,8 +3900,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/tiled/eris/dark/orangecorner, @@ -4179,10 +4144,7 @@ /area/talon/deckone/armory) "Hp" = ( /obj/structure/closet/crate/solar, -/obj/machinery/firealarm/alarms_hidden{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/talon/deckone/starboard_eng_store) "Hr" = ( @@ -4364,8 +4326,7 @@ /area/talon/deckone/port_engine) "IU" = ( /obj/structure/catwalk, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -4409,8 +4370,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/disposalpipe/segment{ @@ -4524,13 +4484,11 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -25 }, /obj/machinery/recharger, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -4635,9 +4593,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "KW" = ( @@ -4673,8 +4629,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/deckone_starboard) "Ls" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/eris/white/orangecorner, @@ -4835,8 +4790,7 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/talon/deckone/brig) "Nf" = ( -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/machinery/light_switch{ @@ -5382,15 +5336,12 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/port_solar) "St" = ( /obj/structure/catwalk, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -5547,8 +5498,7 @@ /turf/simulated/floor/tiled/eris/white/danger, /area/talon/deckone/armory) "TG" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green, @@ -5607,8 +5557,7 @@ /turf/simulated/floor/tiled/eris/dark/brown_perforated, /area/talon/deckone/port_engine) "Up" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/dark/cyancorner, @@ -5772,8 +5721,7 @@ /obj/structure/mopbucket, /obj/item/mop, /obj/item/reagent_containers/glass/bucket, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /turf/simulated/floor/tiled/eris/dark/brown_platform, @@ -5802,8 +5750,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /turf/simulated/floor/tiled/eris/white/orangecorner, diff --git a/maps/map_levels/140x140/talon/talon2.dmm b/maps/map_levels/140x140/talon/talon2.dmm index e7ee7c96a3..dde478fa6f 100644 --- a/maps/map_levels/140x140/talon/talon2.dmm +++ b/maps/map_levels/140x140/talon/talon2.dmm @@ -9,14 +9,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2; - req_one_access = list(301) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Mess Hall" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/kitchen) "ax" = ( @@ -67,8 +66,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -505,8 +503,7 @@ }, /obj/structure/table/standard, /obj/item/paper/talon_shields, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, @@ -685,8 +682,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/eris/dark/violetcorener, @@ -831,6 +827,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/bar) "ki" = ( @@ -1054,8 +1053,7 @@ "mw" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /obj/landmark/spawnpoint/job/talon_guard, @@ -1318,10 +1316,7 @@ "pp" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/landmark/spawnpoint/job/talon_engineer, /turf/simulated/floor/carpet, /area/talon/decktwo/eng_room) @@ -1360,8 +1355,7 @@ /turf/simulated/open, /area/talon/maintenance/decktwo_aft) "pC" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /turf/simulated/floor/wood, @@ -1409,8 +1403,7 @@ /turf/simulated/wall, /area/talon/decktwo/med_room) "pW" = ( -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -1453,8 +1446,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /turf/simulated/floor/carpet, @@ -1535,8 +1527,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/decktwo/central_hallway) "rS" = ( -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -1716,8 +1707,7 @@ /obj/item/flashlight/glowstick, /obj/item/storage/box/metalfoam, /obj/item/survivalcapsule/luxury, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -1843,16 +1833,13 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 8; +/obj/machinery/air_alarm/talon/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet, /area/talon/decktwo/eng_room) "vP" = ( -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /obj/machinery/light_switch{ dir = 1; on = 0; @@ -1878,6 +1865,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/kitchen) "wQ" = ( @@ -2191,8 +2181,7 @@ /turf/simulated/floor/wood, /area/talon/decktwo/med_room) "zT" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /turf/simulated/floor/wood, @@ -2308,8 +2297,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/power/apc/talon{ - dir = 1; +/obj/machinery/air_alarm/talon/north_mount{ pixel_y = 24 }, /obj/structure/cable/green{ @@ -2500,9 +2488,7 @@ /turf/simulated/open, /area/talon/maintenance/decktwo_starboard) "DF" = ( -/obj/machinery/power/apc/talon{ - pixel_y = -28 - }, +/obj/machinery/power/apc/talon, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -2597,8 +2583,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_solars) "Eb" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /obj/machinery/light, @@ -2644,14 +2629,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2; - req_one_access = list(301) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Bar" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/talon/decktwo/bar) "Ew" = ( @@ -2815,8 +2799,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /turf/simulated/floor/carpet, @@ -2824,16 +2807,14 @@ "Gy" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /obj/landmark/spawnpoint/job/talon_pilot, /turf/simulated/floor/carpet, /area/talon/decktwo/pilot_room) "GA" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green{ @@ -3000,10 +2981,7 @@ "Ja" = ( /obj/item/bedsheet, /obj/structure/bed/padded, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/landmark/spawnpoint/job/talon_doctor, /turf/simulated/floor/carpet, /area/talon/decktwo/med_room) @@ -3254,8 +3232,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_solars) "LU" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -30 }, /turf/simulated/floor/tiled/eris/steel, @@ -3890,8 +3867,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/decktwo_aft) "Tm" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green{ @@ -4473,8 +4449,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/decktwo_port) "ZE" = ( -/obj/machinery/power/apc/talon{ - dir = 4; +/obj/machinery/air_alarm/talon/east_mount{ pixel_x = 24 }, /obj/structure/cable/green{ diff --git a/maps/map_levels/192x192/fueldepot.dmm b/maps/map_levels/192x192/fueldepot.dmm index 5ae2be2cce..7397596b9c 100644 --- a/maps/map_levels/192x192/fueldepot.dmm +++ b/maps/map_levels/192x192/fueldepot.dmm @@ -414,8 +414,7 @@ dir = 6 }, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -24 }, /turf/simulated/floor/airless, diff --git a/maps/minitest/levels/minitest.dmm b/maps/minitest/levels/minitest.dmm index dcf043c5dd..7243199041 100644 --- a/maps/minitest/levels/minitest.dmm +++ b/maps/minitest/levels/minitest.dmm @@ -22,12 +22,7 @@ /obj/machinery/camera/network/telecom{ c_tag = "Telecoms Main Computer Room" }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "af" = ( @@ -74,8 +69,7 @@ }, /obj/item/radio/intercom{ name = "General Listening Channel"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) @@ -158,11 +152,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "ay" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -174,7 +164,6 @@ /area/space) "aA" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - icon_state = "map"; dir = 4 }, /turf/simulated/floor/plating, @@ -192,7 +181,6 @@ /area/tcommsat/computer) "aD" = ( /obj/machinery/atmospherics/component/unary/freezer{ - dir = 2; icon_state = "freezer_1"; set_temperature = 73; use_power = 1 @@ -252,7 +240,6 @@ frequency = 1381; id_tag = "server_access_airlock"; name = "Server Access Airlock"; - pixel_x = 0; pixel_y = 25; tag_airpump = "server_access_pump"; tag_chamber_sensor = "server_access_sensor"; @@ -421,14 +408,12 @@ "aX" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/plating, /area/engineering/engine_room) "aY" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ - icon_state = "intact"; dir = 5 }, /obj/structure/cable{ @@ -495,12 +480,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; initial_gas_mix = "n2=100;TEMP=80" @@ -609,8 +589,7 @@ "bq" = ( /obj/machinery/air_alarm{ dir = 4; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -643,11 +622,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/engineering/engine_room) "bx" = ( @@ -781,8 +756,7 @@ /area/hallway/secondary/engineering_hallway) "bP" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light{ icon_state = "tube1"; @@ -859,8 +833,7 @@ /area/tcommsat/chamber) "ca" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -875,8 +848,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/secondary/engineering_hallway) @@ -929,11 +901,7 @@ "cj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -32 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -948,7 +916,6 @@ }, /obj/machinery/air_alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -1289,8 +1256,7 @@ "dd" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/medical/medbay) @@ -1425,6 +1391,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/medical/medbay) "ds" = ( @@ -1498,8 +1467,7 @@ "dE" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -1514,11 +1482,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay) "dG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1563,12 +1527,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/civilian_hallway_aft) "dL" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1738,11 +1697,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay2) "ef" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /turf/simulated/floor/tiled, /area/medical/medbay2) @@ -1759,8 +1714,7 @@ "eh" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1891,8 +1845,7 @@ /area/medical/medbay) "eB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -1908,8 +1861,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/crew_quarters/bar) @@ -2029,11 +1981,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/bar) "eT" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -2056,8 +2004,7 @@ "eW" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2119,11 +2066,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/civilian_hallway_fore) "fe" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -2134,8 +2077,7 @@ "ff" = ( /obj/machinery/air_alarm{ dir = 4; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2144,7 +2086,6 @@ "fg" = ( /obj/machinery/air_alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2236,12 +2177,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "fq" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -2264,8 +2200,7 @@ /area/hallway/primary/fore) "fs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -2380,8 +2315,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/primary/fore) @@ -2399,12 +2333,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) "fJ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -2464,8 +2393,7 @@ "fS" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/crew_quarters/cafeteria) @@ -2578,21 +2506,11 @@ /turf/simulated/floor/tiled, /area/bridge) "gi" = ( -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/bridge) "gj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -2629,8 +2547,7 @@ "go" = ( /obj/machinery/light{ dir = 8; - icon_state = "tube1"; - pixel_y = 0 + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/bridge) @@ -2653,8 +2570,7 @@ /area/bridge) "gs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2916,7 +2832,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ id_tag = "station_hangar"; layer = 3.1; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/tiled, @@ -3004,10 +2919,119 @@ /obj/landmark/spawnpoint/overflow/station, /turf/simulated/floor/tiled, /area/bridge) +"jV" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) +"ko" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "kU" = ( /obj/structure/shuttle, /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/overmapdemo) +"lm" = ( +/obj/machinery/light, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"lA" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"lH" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/rift/surfaceeva/airlock/main) +"lQ" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"lX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"nY" = ( +/turf/space/basic, +/area/space) +"ok" = ( +/obj/machinery/embedded_controller/radio/airlock/phoron{ + dir = 8; + id_tag = "civ_airlock"; + pixel_x = 25; + pixel_y = -30 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/airlock_sensor/phoron{ + id_tag = "civ_airlock_sensor"; + pixel_x = 25; + pixel_y = -40 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"oO" = ( +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/space) +"pG" = ( +/turf/simulated/wall/prepainted, +/area/rift/surfaceeva/airlock/main) +"qb" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) "ql" = ( /obj/machinery/door/airlock/external{ frequency = 1379; @@ -3024,17 +3048,231 @@ }, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"qN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"qR" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 4; + frequency = 1379; + id_tag = "eva_port_pump" + }, +/obj/machinery/airlock_sensor{ + pixel_y = -28 + }, +/obj/machinery/camera/network/command, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +"rJ" = ( +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"sc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"si" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"sn" = ( +/turf/simulated/mineral, +/area/storage/surface_eva/external) +"sq" = ( +/obj/structure/railing, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"sv" = ( +/turf/unsimulated/mineral/virgo3b, +/area/space) "sA" = ( /obj/structure/shuttle/engine/heater, /turf/space, /turf/simulated/shuttle/plating/carry, /area/shuttle/multidemo) +"sQ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"tk" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"tU" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4"; + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"vl" = ( +/obj/machinery/access_button/airlock_exterior{ + master_tag = "civ_airlock"; + pixel_x = -8; + pixel_y = -25 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_outer"; + locked = 1 + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) +"vm" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "eva_port_airlock"; + pixel_y = 28 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +"vo" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_outer"; + locked = 1 + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) "vP" = ( /obj/machinery/computer/ship/engines{ dir = 8 }, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"ws" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"wN" = ( +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 1379; + master_tag = "eva_port_airlock"; + name = "interior access button"; + pixel_y = -10; + req_one_access = list(18) + }, +/turf/simulated/wall/prepainted/command, +/area/ai_monitored/storage/eva) +"wQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"xb" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/access_button{ + command = "cycle_ext"; + frequency = 1379; + master_tag = "eva_port_airlock"; + name = "exterior access button"; + pixel_x = 4; + pixel_y = -26; + req_access = list(18) + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"xP" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/bridge) +"yj" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"yy" = ( +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"yO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/meter, +/turf/simulated/floor/tiled, +/area/bridge) "zf" = ( /obj/effect/wingrille_spawn/reinforced, /turf/simulated/shuttle/floor/voidcraft/external/light, @@ -3047,22 +3285,185 @@ /obj/overmap/entity/visitable/ship/landable/overmapdemo, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"Bg" = ( +/turf/simulated/wall, +/area/storage/surface_eva/external) +"BU" = ( +/obj/structure/railing, +/obj/machinery/embedded_controller/radio/airlock/phoron{ + dir = 8; + id_tag = "central_airlock"; + name = "Frost Lock Controller"; + pixel_x = 26; + pixel_y = -5 + }, +/obj/machinery/airlock_sensor/phoron{ + dir = 8; + id_tag = "central_airlock_sensor"; + name = "frostlock sensor"; + pixel_x = 24; + pixel_y = 6 + }, +/obj/structure/grille, +/obj/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"BW" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_inner"; + locked = 1 + }, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) +"BZ" = ( +/obj/structure/railing, +/obj/structure/grille, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "civ_airlock_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"Cu" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/access_button/airlock_interior{ + dir = 4; + master_tag = "central_airlock"; + pixel_x = 2; + pixel_y = -26 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"EK" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"FK" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"FZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/bridge) "Gz" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/overmapdemo) +"GK" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "central_airlock_pump" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/cable/green, +/obj/machinery/power/apc/west_mount, +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"GR" = ( +/turf/unsimulated/wall/planetary/lythios43c{ + desc = "Glacial permafrost, compacted harder than stone."; + icon_state = "icerock-dark" + }, +/area/space) +"Jn" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) "JA" = ( /obj/overmap/entity/visitable/sector/citadel_minitest/station, /turf/space, /area/space) +"JD" = ( +/turf/simulated/wall, +/area/space) +"JJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"JZ" = ( +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) "LJ" = ( /obj/machinery/computer/shuttle_control/web{ - dir = 2; my_doors = list("webdemo_docker_hatch"="Hatch"); name = "Web-Demo Console"; shuttle_tag = "Web-Demo" }, /turf/simulated/shuttle/floor, /area/shuttle/webdemo) +"Ms" = ( +/obj/machinery/atmospherics/component/binary/pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"MC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/tiled, +/area/medical/medbay) "ML" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ id_tag = "station_dock2"; @@ -3071,6 +3472,12 @@ }, /turf/simulated/floor/tiled, /area/bridge) +"NX" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "Oc" = ( /obj/machinery/light, /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -3092,35 +3499,268 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/engineering/engine_room) +"OX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/signnew/cryogenics{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) +"Pa" = ( +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) +"Pe" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "central_airlock_pump" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/rift/surfaceeva/airlock/main) "Pg" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, /turf/simulated/shuttle/plating/carry, /area/shuttle/multidemo) +"Ps" = ( +/turf/simulated/wall/r_wall, +/area/storage/surface_eva/external) +"QI" = ( +/obj/machinery/atmospherics/pipe/tank{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"QT" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Ro" = ( +/obj/machinery/air_alarm, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Rs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_y = -32 + }, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"Rw" = ( +/obj/structure/railing, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/grille, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "civ_airlock_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) "RZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass/engineering, /turf/simulated/floor/plating, /area/engineering/engine_room) +"Sd" = ( +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) +"St" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Sv" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/machinery/door/blast/regular/open{ + id = "main_ext_blast"; + name = "Surface External Blast Door" + }, +/obj/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) "SN" = ( /obj/machinery/door/airlock/external{ frequency = 1379; icon_state = "door_locked"; - id_tag = "station_dock2_hatch"; + id_tag = "station_dock2_hatch"; + locked = 1 + }, +/turf/simulated/floor/tiled, +/area/bridge) +"Tq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/storage/surface_eva/external) +"Tv" = ( +/obj/machinery/door/airlock/glass_external/public{ + name = "Public External Airlock" + }, +/obj/machinery/door/blast/regular/open{ + id = "main_ext_blast"; + name = "Surface External Blast Door" + }, +/obj/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/machinery/access_button/airlock_exterior{ + dir = 8; + master_tag = "central_airlock"; + pixel_x = -2; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/surfaceeva/airlock/main) +"TK" = ( +/obj/machinery/atmospherics/component/binary/pump/on, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"TX" = ( +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/tiled, +/area/bridge) +"Ud" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/sign/fire{ + pixel_y = -32 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/techmaint, +/area/storage/surface_eva/external) +"Uh" = ( +/obj/machinery/computer/ship/sensors{ + dir = 1 + }, +/turf/simulated/shuttle/floor/voidcraft/light, +/area/shuttle/overmapdemo) +"UY" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Cafe"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Vk" = ( +/turf/simulated/wall/prepainted/command, +/area/ai_monitored/storage/eva) +"VE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Cafe"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"Ws" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) +"WT" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "civ_airlock_inner"; locked = 1 }, +/obj/machinery/access_button/airlock_interior{ + master_tag = "civ_airlock"; + pixel_x = 8; + pixel_y = 25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/storage/surface_eva/external) +"WX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/bridge) -"Uh" = ( -/obj/machinery/computer/ship/sensors{ - dir = 1 +/area/medical/medbay) +"Xq" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/shuttle/floor/voidcraft/light, -/area/shuttle/overmapdemo) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/medical/medbay) "XZ" = ( /obj/machinery/computer/ship/helm, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/overmapdemo) +"Yn" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) (1,1,1) = {" aa @@ -3610,9 +4250,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -3712,9 +4352,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -3814,9 +4454,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -3916,9 +4556,9 @@ aa aa aa aa -aa -aa -aa +nY +nY +nY aa aa aa @@ -4017,10 +4657,10 @@ aa aa aa aa -aa -aa -aa -aa +Vk +xb +Vk +nY aa aa aa @@ -4116,13 +4756,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +Vk +qR +Vk +nY aa aa aa @@ -4221,9 +4861,9 @@ aa aa aa aa -aa -aa -aa +Vk +vm +Vk aa aa aa @@ -4323,9 +4963,9 @@ aa fX ge ge -ge -ge -ge +wN +Rs +Vk ge ge ge @@ -4423,10 +5063,10 @@ aa aa aa fY -gf -go -gf -gf +TX +xP +FZ +yO go gf gf @@ -5521,12 +6161,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +JD +JD +JD +JD +JD +JD aa aa aa @@ -5616,19 +6256,19 @@ aa aa aa aa +JD +JD +JD +JD +JD +JD aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +JD +GR +GR +GR +GR +JD aa aa aa @@ -5718,19 +6358,19 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +JD +sv +sv +sv +sv +JD +nY +JD +oO +oO +oO +oO +JD aa aa aa @@ -5819,20 +6459,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +nY +JD +Yn +Pa +Pa +Sd +sn +lH +lH +lH +Sv +Tv +lH +JD aa aa aa @@ -5921,20 +6561,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bg +Bg +Bg +vo +vl +Bg +Ps +lH +yy +sq +EK +tU +GK +JD aa aa aa @@ -6023,20 +6663,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bg +JZ +BZ +yj +FK +Ud +Ps +lH +OX +sq +lX +qb +ws +JD aa aa aa @@ -6125,20 +6765,20 @@ aP aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Bg +Jn +Rw +Tq +ok +jV +Ps +lH +yy +BU +tk +sQ +Pe +JD aa aa gZ @@ -6227,20 +6867,20 @@ aP aa cE cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cL -cS -aa +Bg +Bg +Bg +WT +BW +Bg +Ps +lH +pG +pG +lA +Cu +pG +JD aa aa aa @@ -6330,17 +6970,17 @@ aa cF cM cM -cM -dd -cM -cM -cM -cM -cM -cM +du dd -cM -cM +ko +sc +si +NX +du +rJ +lQ +sc +JJ cF aa aa @@ -6432,17 +7072,17 @@ aa cF cM cM +du +Ro +qN cM +St cM +du +Ro +St cM -cM -cM -cM -cM -cM -cM -cM -cM +qN cF aa aa @@ -6534,17 +7174,17 @@ aa cF cN cM -cM -cM -cM -cM -cM -cM du cM -cM -cM -cM +WX +MC +TK +QI +du +QT +Ms +MC +Xq cF aa aa @@ -6636,17 +7276,17 @@ aa cF cM cM -cM -cM -cM -cM -cM -cM +du +du +el +UY +du +du +du +du du cM -cM -cM -cM +VE cF aa aa @@ -6740,7 +7380,7 @@ cM cM cM cM -cM +el cM cM cM @@ -6748,7 +7388,7 @@ du cM cM cM -eC +lm cI eM eM @@ -6850,7 +7490,7 @@ du cM cM ez -cO +wQ eF eN eN @@ -6952,7 +7592,7 @@ ek cP cP df -cP +Ws eG eO eO @@ -7481,12 +8121,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7583,12 +8223,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7685,12 +8325,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7787,12 +8427,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa @@ -7889,12 +8529,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +nY +nY +nY +nY +nY +nY aa aa aa diff --git a/maps/minitest/levels/sector1.dmm b/maps/minitest/levels/sector1.dmm index 0b007721c3..17b7fa4cd6 100644 --- a/maps/minitest/levels/sector1.dmm +++ b/maps/minitest/levels/sector1.dmm @@ -128,11 +128,7 @@ "av" = ( /obj/item/storage/toolbox/electrical, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -507,7 +503,7 @@ icon_state = "intact" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1375; master_tag = "carp_airlock"; name = "interior access button"; @@ -678,7 +674,7 @@ /area/awaymission) "ca" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1375; master_tag = "carp_airlock"; name = "exterior access button"; diff --git a/maps/rift/levels/rift-01-underground3.dmm b/maps/rift/levels/rift-01-underground3.dmm index c486064ee9..a67d016326 100644 --- a/maps/rift/levels/rift-01-underground3.dmm +++ b/maps/rift/levels/rift-01-underground3.dmm @@ -246,6 +246,7 @@ "oE" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/quartermaster/mining_airlock) "oQ" = ( @@ -652,11 +653,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -833,9 +830,9 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(31) }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/quartermaster/mining_airlock) "ZA" = ( diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm index 9cd0d53d68..d86851608d 100644 --- a/maps/rift/levels/rift-02-underground2.dmm +++ b/maps/rift/levels/rift-02-underground2.dmm @@ -288,11 +288,7 @@ /obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/engineering/workshop) "aT" = ( @@ -322,8 +318,7 @@ /area/maintenance/lower/atmos) "aX" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -358,10 +353,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -1049,9 +1041,7 @@ /area/engineering/engine_room) "dD" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -1164,7 +1154,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "dY" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1196,8 +1186,7 @@ /area/rift/station/stairs_one) "ee" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -1260,11 +1249,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "ek" = ( @@ -1508,7 +1493,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -1574,10 +1558,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) "eX" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1859,11 +1840,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/door/firedoor/glass{ dir = 8 }, @@ -1979,7 +1956,7 @@ /area/engineering/break_room) "gq" = ( /obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 8 }, @@ -2017,8 +1994,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -2306,11 +2282,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -2362,9 +2335,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "hz" = ( @@ -2408,11 +2379,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/door/firedoor/glass{ dir = 1 }, @@ -2439,7 +2406,6 @@ }, /obj/machinery/button/windowtint{ id = "ce_office"; - layer = 3.3; pixel_x = 26; pixel_y = 9 }, @@ -2465,10 +2431,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "hS" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2583,7 +2546,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/effect/paint/sun, @@ -2615,7 +2577,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/structure/catwalk, @@ -2664,11 +2625,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "iD" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -2784,9 +2741,7 @@ /area/crew_quarters/public_bunker) "iZ" = ( /obj/structure/closet/secure_closet/atmos_personal, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/locker_room) "jc" = ( @@ -3058,8 +3013,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ name = "north bump"; pixel_y = 24 }, @@ -3078,9 +3032,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -3095,6 +3047,15 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) +"jL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/rnd/secure_storage/lower) "jM" = ( /obj/machinery/cryopod/robot, /turf/simulated/floor/tiled/techfloor, @@ -3259,10 +3220,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) "jX" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -3379,10 +3337,12 @@ name = "General Storage"; req_one_access = list(47) }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) "kq" = ( @@ -3484,8 +3444,7 @@ /turf/simulated/floor/tiled/steel, /area/engineering/locker_room) "kF" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor{ @@ -3840,7 +3799,7 @@ /turf/simulated/mineral/icerock/lythios43c, /area/engineering/engine_room) "lT" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3961,10 +3920,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -3988,7 +3944,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/button/remote/blast_door{ @@ -4063,10 +4018,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/power/apc/high{ - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/high, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4475,14 +4427,8 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4820,11 +4766,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/structure/catwalk, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) @@ -4864,9 +4806,7 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/cryo) "oy" = ( @@ -5186,10 +5126,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, @@ -5681,10 +5618,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) "rd" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "0-2" @@ -5698,11 +5632,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/atmos) "rg" = ( @@ -5825,7 +5755,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5961,10 +5891,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "rX" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/power/sensor{ name = "Powernet Sensor - Master Grid"; name_tag = "Master" @@ -5972,6 +5899,10 @@ /obj/structure/cable, /turf/simulated/floor, /area/engineering/engine_smes) +"rZ" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel, +/area/quartermaster/miningdock) "sa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/borderfloor/corner2{ @@ -6254,9 +6185,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_room) "tf" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -6872,11 +6801,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "vL" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -7020,8 +6946,7 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) "wn" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -7120,6 +7045,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "wG" = ( @@ -7194,11 +7122,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -7385,8 +7309,8 @@ "xs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/glass, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) "xt" = ( @@ -7461,11 +7385,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "xF" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7511,12 +7431,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ id_tag = "chapel_crematorium"; name = "Funeral Services"; req_one_access = list(27) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/chapel/main) "xK" = ( @@ -7536,6 +7456,7 @@ /turf/simulated/floor/wood, /area/chapel/observation) "xM" = ( +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -7741,9 +7662,7 @@ /area/rift/surfacebase/underground/under2) "yJ" = ( /obj/machinery/power/emitter, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/engineering/storage) "yL" = ( @@ -7974,6 +7893,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) +"zE" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/hallway) "zG" = ( /turf/simulated/floor/tiled/monotile, /area/engineering/engine_room) @@ -8079,11 +8005,7 @@ /area/engineering/atmos/hallway) "Ah" = ( /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -8218,10 +8140,7 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/miningdock) "AO" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8439,7 +8358,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-2" @@ -8875,11 +8794,7 @@ /turf/simulated/floor/carpet, /area/engineering/break_room) "Dh" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8952,9 +8867,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/techfloor, @@ -9002,9 +8915,7 @@ /turf/simulated/floor, /area/engineering/engine_room) "Dv" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/engine, /turf/simulated/floor, /area/engineering/engine_room) @@ -9014,8 +8925,7 @@ pixel_y = 5 }, /obj/item/storage/toolbox/electrical, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -9104,6 +9014,13 @@ /obj/machinery/washing_machine, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_waste) +"DT" = ( +/obj/structure/catwalk, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/engineering/storage) "DV" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -9271,10 +9188,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "EJ" = ( @@ -9339,11 +9253,7 @@ /turf/simulated/wall/prepainted, /area/quartermaster/miningdock) "ER" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9643,6 +9553,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/miningdock) +"Gn" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/break_room) "Gp" = ( /obj/machinery/light, /turf/simulated/floor/wood, @@ -9877,11 +9791,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -9965,10 +9876,13 @@ "Hp" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/engine_eva) +"Hq" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/foyer) "Hr" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -10043,10 +9957,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -10272,7 +10183,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/break_room) "IE" = ( @@ -10341,11 +10252,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "IR" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10460,11 +10367,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/chapel) "Jt" = ( @@ -10509,7 +10412,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(11,24) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/foyer) "JC" = ( @@ -10618,9 +10521,7 @@ /turf/simulated/floor/plating, /area/quartermaster/miningdock) "JY" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -10825,11 +10726,8 @@ /turf/simulated/floor, /area/engineering/engine_room) "KP" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -11118,11 +11016,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -11141,10 +11035,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/miningdock) "LP" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -26 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -11181,8 +11072,7 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under2) "LV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor, @@ -11361,8 +11251,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/lino, @@ -11429,10 +11318,12 @@ dir = 4; name = "Radiation Prep - Cleanup" }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) "MR" = ( @@ -11472,6 +11363,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) "MX" = ( @@ -11693,10 +11587,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/chapel/observation) "NJ" = ( @@ -11839,11 +11730,7 @@ "Of" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/engineering/storage) @@ -11874,11 +11761,7 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) "Ol" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11902,9 +11785,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "Or" = ( @@ -11962,9 +11843,7 @@ /area/engineering/storage) "Oy" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/locker_room) @@ -11975,11 +11854,7 @@ /obj/machinery/computer/security/engineering{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12052,10 +11927,7 @@ /area/quartermaster/belterdock/refinery) "OP" = ( /obj/landmark/spawnpoint/job/station_engineer, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12095,11 +11967,10 @@ /obj/machinery/door/airlock/multi_tile/metal{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 - }, /obj/structure/catwalk, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/engineering/storage) "OX" = ( @@ -12399,11 +12270,7 @@ }, /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12453,7 +12320,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/metal, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/storage) "Qz" = ( @@ -12468,11 +12335,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "QC" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12833,6 +12696,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/lower) +"Sd" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/engineering/storage) "Se" = ( /turf/simulated/wall/prepainted/civilian, /area/chapel/office) @@ -12872,10 +12741,7 @@ /area/chapel/chapel_morgue) "Sm" = ( /obj/landmark/spawnpoint/job/shaft_miner, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12936,9 +12802,7 @@ /area/engineering/engine_room) "Sw" = ( /obj/structure/bed/chair/bay/chair/padded/yellow, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/engineering/foyer) "Sy" = ( @@ -13498,7 +13362,7 @@ desc = "A large cabinet with drawers. They seem to be ominously empty."; name = "Classified Science Records" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13560,11 +13424,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "Uz" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "UC" = ( @@ -13688,7 +13548,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 4 }, /obj/machinery/light{ dir = 1 @@ -14026,11 +13886,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "Wg" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -14049,9 +13906,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -14070,11 +13925,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/engineering/workshop) "Wm" = ( @@ -14147,9 +13998,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/techfloor, @@ -14363,8 +14212,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "Xm" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/recharge_station, @@ -14488,7 +14336,6 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/airlock_sensor/airlock_exterior{ id_tag = "eng_al_ext_snsr"; - layer = 3.3; master_tag = "engine_room_airlock"; pixel_x = -22; req_access = list(10) @@ -14522,6 +14369,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/atmos) +"Yf" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "Yj" = ( /obj/machinery/light{ dir = 4 @@ -14634,9 +14485,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "YG" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/engineering/engine_eva) @@ -14647,10 +14496,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14762,10 +14608,7 @@ /area/maintenance/lower/mining) "Zf" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, @@ -14915,7 +14758,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) @@ -14926,9 +14769,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/toilet, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) @@ -22680,17 +22521,17 @@ Ow gN bD DI -MH +jL kp DI Xy DI -MH +jL kp DI Xy Xy -MH +jL kp Xy Xy @@ -27680,7 +27521,7 @@ Yj zY zY zY -zY +Yf zY Vf EK @@ -28480,7 +28321,7 @@ zK sR UU Vu -Qd +Sd Qd BE BF @@ -28872,7 +28713,7 @@ KF KF KF KF -BF +DT OW KF KF @@ -29640,7 +29481,7 @@ OK Ak Ak wp -wp +Hq Pr WY ce @@ -31204,7 +31045,7 @@ YJ YJ MC wF -ce +zE Im Qp cX @@ -31386,7 +31227,7 @@ rU qW qW wp -wp +Hq Pr fB nD @@ -32554,7 +32395,7 @@ uP ul Pr zq -Tt +Gn lL Ib Ko @@ -34087,7 +33928,7 @@ TU CC CC CC -CC +rZ uW CC CC diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm index f10000d25c..c9d41673aa 100644 --- a/maps/rift/levels/rift-03-underground1.dmm +++ b/maps/rift/levels/rift-03-underground1.dmm @@ -141,10 +141,7 @@ /area/engineering/atmos) "aw" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/maintenance/public_bunker) "ax" = ( @@ -260,8 +257,7 @@ /area/maintenance/engineering/upper) "aM" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -277,10 +273,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) "aO" = ( @@ -484,11 +477,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "bp" = ( @@ -629,9 +618,7 @@ pixel_y = 24 }, /obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_two) "bG" = ( @@ -656,10 +643,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/sign/directions/cargo{ dir = 1; pixel_x = 32; @@ -682,8 +666,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/sign/directions/medical{ @@ -842,9 +825,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_two) "bW" = ( @@ -860,11 +841,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_two) "bY" = ( @@ -1075,10 +1052,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1212,10 +1186,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/upper) "cN" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -1328,7 +1299,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled/steel, @@ -1520,10 +1491,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -1665,7 +1633,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/cable/green{ @@ -1753,7 +1721,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/station/protean_nanite_room) "dR" = ( @@ -1821,16 +1789,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) -"eb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "ec" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -2220,9 +2178,7 @@ }, /obj/item/folder/yellow, /obj/item/pen/red, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/item/pen/blue, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos/hallway) @@ -2241,11 +2197,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -2270,9 +2222,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/item/storage/single_use/med_pouch/oxyloss, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos/hallway) @@ -2286,9 +2236,7 @@ }, /obj/item/packageWrap, /obj/item/hand_labeler, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/item/toy/figure/engineer{ pixel_x = -17 }, @@ -2487,9 +2435,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) @@ -2548,6 +2494,9 @@ name = "Hangar Lockdown Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "gz" = ( @@ -3216,10 +3165,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/secure_storage/upper) "jg" = ( @@ -3315,8 +3261,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel, @@ -3395,8 +3340,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "jJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/concrete/rng/indoors, @@ -3502,8 +3446,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/segment, @@ -3901,9 +3844,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/atmos) "lF" = ( @@ -4320,8 +4261,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/industrial/warning, @@ -4597,8 +4537,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) "ok" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/kafel_full/blue, @@ -4811,9 +4750,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -5178,7 +5115,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -5292,9 +5229,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) @@ -5433,8 +5368,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/underground/under1) "rw" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -5479,11 +5413,7 @@ dir = 4 }, /obj/machinery/light/small, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) @@ -5880,11 +5810,8 @@ /area/engineering/atmos) "tm" = ( /obj/structure/grille, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) @@ -5892,10 +5819,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/railing{ dir = 1 }, @@ -6307,15 +6231,11 @@ }, /obj/structure/catwalk, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/rift/station/fighter_bay/hangar) "uQ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techmaint, @@ -6340,11 +6260,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "uV" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -6755,8 +6672,7 @@ /turf/simulated/floor/plating, /area/rift/surfacebase/underground/under1) "ws" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/concrete/rng/indoors, @@ -7220,9 +7136,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "xJ" = ( @@ -7292,7 +7206,7 @@ "xU" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -7377,11 +7291,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "yf" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7570,19 +7480,9 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage) -"yS" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) "yT" = ( /turf/simulated/floor/plating, /area/rift/trade_shop) @@ -8268,11 +8168,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8357,10 +8253,10 @@ /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, /area/rift/surfacebase/underground/under1) "BS" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Ready Room" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "BT" = ( @@ -8533,7 +8429,9 @@ /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "CC" = ( -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -8634,11 +8532,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "CU" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -8651,11 +8545,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8747,7 +8637,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "Dq" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; name = "Fighter Hangar"; @@ -8760,6 +8649,9 @@ name = "Hangar Lockdown Blast Doors"; opacity = 0 }, +/obj/machinery/door/firedoor/glass{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "Ds" = ( @@ -8973,11 +8865,7 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "Ep" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9740,9 +9628,7 @@ dir = 8; pixel_x = 22 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) "GO" = ( @@ -9790,8 +9676,7 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/wood, @@ -9857,10 +9742,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/crystal, /area/rift/station/adherent_maintenance) "Hn" = ( @@ -10094,8 +9976,7 @@ /area/maintenance/engineering) "Ib" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -10535,11 +10416,7 @@ /area/maintenance/engineering/upper) "JC" = ( /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10818,11 +10695,7 @@ /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage) "KG" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11946,11 +11819,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/marker_beacon/red, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12689,11 +12558,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) "Rf" = ( @@ -12711,11 +12576,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/meter, /obj/structure/cable/green{ icon_state = "0-4" @@ -12753,12 +12614,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) -"Rn" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) "Rp" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -13018,9 +12873,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "Sr" = ( @@ -13482,12 +13335,8 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/machinery/door/firedoor/glass{ - dir = 1 - }, +/obj/machinery/fire_alarm/north_mount, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "Uw" = ( @@ -13645,11 +13494,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "UZ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13798,8 +13643,7 @@ /obj/machinery/light/spot{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/computer/general_air_control/large_tank_control{ @@ -13879,9 +13723,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) "VT" = ( @@ -14130,6 +13972,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/rift/station/fighter_bay) "WH" = ( @@ -14183,10 +14026,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "WO" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -14516,11 +14356,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -28750,7 +28586,7 @@ ae ae cW CC -eb +XF XQ dI XQ @@ -32651,7 +32487,7 @@ kl ka Zx Zx -Rn +qT NU NU NU @@ -32845,7 +32681,7 @@ eT eT Zx Zx -yS +qT Zx Zx Zx diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 0359f3104c..cb325caa62 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -202,7 +202,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -690,8 +690,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -1131,10 +1130,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/virologyisolation) "aPZ" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -1586,7 +1582,7 @@ /area/maintenance/starboard) "bhT" = ( /obj/structure/railing, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1637,11 +1633,7 @@ }, /obj/item/inflatable/door, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -1892,11 +1884,7 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "boW" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 }, @@ -2339,11 +2327,7 @@ /turf/simulated/floor/wood, /area/maintenance/maint_bar) "bEN" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2621,8 +2605,7 @@ /obj/structure/bed/chair/wood{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -3069,9 +3052,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library) "cdH" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -3176,10 +3157,7 @@ /turf/simulated/floor/water/deep/indoors, /area/rift/station/public_garden) "cfP" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/tool_storage) "cgz" = ( @@ -3263,10 +3241,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3465,11 +3440,7 @@ /turf/simulated/floor/outdoors/snow/noblend/lythios43c, /area/rift/surfacebase/outside/outside1) "crk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3771,10 +3742,7 @@ /turf/simulated/floor/wood, /area/rift/surfacebase/outside/outside1) "cAs" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -4008,10 +3976,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4233,10 +4198,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva) "cQP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -4248,19 +4210,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "cRN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4507,13 +4462,6 @@ /obj/item/book/bundle/custom_library/religious, /turf/simulated/floor/wood, /area/library) -"das" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/security/prison) "daS" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -5278,8 +5226,7 @@ /turf/simulated/floor/plating, /area/maintenance/evahallway) "dxC" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -5355,9 +5302,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/firedoor/glass{ dir = 4 }, @@ -5718,11 +5663,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/security/lower) "dMB" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) @@ -5834,11 +5775,7 @@ "dPu" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/research/lower) @@ -6045,10 +5982,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6069,10 +6003,7 @@ "dVj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -6183,11 +6114,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) @@ -6352,11 +6279,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "ecn" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/security/brig/bathroom) @@ -6480,10 +6403,7 @@ /turf/simulated/floor/plating, /area/medical/virologypurge) "egb" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /obj/structure/catwalk, /obj/structure/cable{ @@ -6758,11 +6678,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) "eqw" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/radiation, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, @@ -6913,8 +6829,7 @@ /area/engineering/engine_eva) "evh" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -7168,11 +7083,8 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "eDQ" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /obj/structure/cable/green{ icon_state = "0-8" @@ -7424,9 +7336,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/lino, @@ -7630,11 +7540,7 @@ /area/maintenance/research/lower) "eXL" = ( /obj/machinery/washing_machine, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/medical_restroom) "eYJ" = ( @@ -7861,11 +7767,7 @@ "fhR" = ( /obj/structure/bed, /obj/item/bedsheet/brown, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7934,10 +7836,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/maintenance/starboard) "flr" = ( @@ -8374,8 +8273,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -8501,11 +8399,7 @@ "fFt" = ( /obj/structure/table/standard, /obj/item/toy/plushie/purple_fox, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 28 @@ -8735,11 +8629,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/medbreak) "fNh" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner/purple{ dir = 5 }, @@ -8802,11 +8692,8 @@ "fOz" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -9491,9 +9378,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/medical/psych) "gri" = ( @@ -9509,9 +9394,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -9574,8 +9457,7 @@ /obj/structure/closet/medical_wall{ pixel_y = 35 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/storage/firstaid/regular, @@ -9728,11 +9610,7 @@ /area/medical/patient_a) "gxe" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -9820,10 +9698,7 @@ dir = 4 }, /obj/random/trash_pile, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/maintenance/library) "gCZ" = ( @@ -10358,8 +10233,7 @@ pixel_y = 11 }, /obj/item/storage/box/syringes, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -10474,11 +10348,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10582,8 +10452,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) "gXw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/disposal, @@ -11352,11 +11221,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/medical/virologyisolation) "hqo" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -11625,10 +11490,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/office) "hCl" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "4-8" @@ -11748,11 +11610,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12112,10 +11970,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "hPI" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/holopad, /turf/simulated/floor/wood, /area/lawoffice) @@ -12320,13 +12175,13 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rift/surfaceeva) "hWp" = ( @@ -12356,7 +12211,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -12386,11 +12241,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/scale, /obj/structure/cable/green{ icon_state = "0-8" @@ -12490,8 +12341,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -12520,10 +12370,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/rnd/testingroom) "iaF" = ( @@ -12969,9 +12816,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "iqR" = ( @@ -13620,11 +13465,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "iHL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor, /area/maintenance/substation/medical) "iHQ" = ( @@ -13918,9 +13759,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, @@ -13948,10 +13787,7 @@ /turf/simulated/floor/plating, /area/medical/virologytransitwest) "iSw" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -14183,10 +14019,7 @@ "jaY" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -14296,11 +14129,7 @@ /turf/simulated/floor/wood, /area/library) "jdT" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/door/blast/regular{ density = 0; dir = 8; @@ -14723,11 +14552,7 @@ /turf/simulated/floor/tiled/dark, /area/prison/solitary) "jsL" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/woodentable, /obj/item/storage/bag/plants, /obj/item/storage/bag/plants, @@ -15011,10 +14836,7 @@ /turf/simulated/floor/plating, /area/maintenance/research/xenobio) "jCm" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "0-8" @@ -15279,10 +15101,7 @@ /turf/simulated/floor/plating, /area/storage/tools) "jLP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/railing{ dir = 8 }, @@ -15406,11 +15225,7 @@ }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/green/bordercorner2, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/medical/virologytransiteast) @@ -15570,11 +15385,7 @@ /obj/effect/floor_decal/industrial/danger{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -15602,11 +15413,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/crate/biohazard, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) @@ -15826,10 +15633,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/office) "kfI" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/crew_quarters/game_room) @@ -16204,8 +16008,7 @@ "koz" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -16568,11 +16371,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -16859,8 +16658,7 @@ /obj/item/multitool, /obj/item/clothing/gloves/fyellow, /obj/item/flashlight, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -17068,8 +16866,7 @@ /area/tether/surfacebase/entertainment) "kNL" = ( /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/lino, @@ -17222,11 +17019,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/table/glass, /obj/item/storage/box/beakers{ pixel_x = 4; @@ -17367,10 +17160,7 @@ pixel_x = 2; pixel_y = 2 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/quartermaster/qm) @@ -17530,11 +17320,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -17953,9 +17739,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/machinery/light{ dir = 4 }, @@ -18074,10 +17858,7 @@ "lyg" = ( /obj/item/stool/padded, /obj/landmark/spawnpoint/job/entertainer, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -18216,11 +17997,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light, /obj/structure/cable/green{ icon_state = "0-4" @@ -18265,10 +18042,7 @@ /obj/item/virusdish/random, /obj/item/virusdish/random, /obj/item/virusdish/random, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/medical/virology) "lGw" = ( @@ -18624,9 +18398,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) "lRL" = ( @@ -18714,11 +18486,7 @@ /area/quartermaster/hallway) "lWh" = ( /obj/structure/closet/secure_closet/personal/patient, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -18980,11 +18748,7 @@ /obj/structure/bed/chair/wood{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -19019,10 +18783,7 @@ /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "mgI" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) @@ -19094,10 +18855,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -19148,11 +18906,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -19706,11 +19460,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -19987,7 +19737,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc/high/south_bump, +/obj/machinery/power/apc/high/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20098,8 +19848,7 @@ dir = 8; light_range = 12 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -20131,10 +19880,7 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "mNo" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "4-8" @@ -20182,10 +19928,7 @@ /turf/simulated/floor/plating, /area/maintenance/research/lower) "mPx" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) @@ -20255,11 +19998,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20404,10 +20143,7 @@ dir = 5 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20744,10 +20480,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20896,11 +20629,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "njW" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_north) "njZ" = ( @@ -21377,8 +21106,7 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "nye" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/holopad, @@ -21625,11 +21353,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" }, @@ -21817,9 +21541,7 @@ /area/maintenance/maint_bar) "nLc" = ( /obj/structure/bed/chair, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -22103,9 +21825,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/machinery/door/firedoor/glass{ dir = 4 @@ -22374,11 +22094,7 @@ /area/rift/surfacebase/outside/outside1) "oal" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) @@ -22464,11 +22180,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -23054,10 +22766,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23132,8 +22841,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/power/apc/super{ - dir = 4; +/obj/machinery/power/apc/super/east_mount{ name = "east bump"; pixel_x = 24 }, @@ -23380,8 +23088,7 @@ /turf/simulated/floor/tiled/steel, /area/security/security_cell_hallway) "oHy" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/segment{ @@ -23656,10 +23363,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/psych) @@ -23718,11 +23422,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23944,7 +23644,7 @@ /area/medical/recoveryrestroom) "oYo" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -23982,10 +23682,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/catwalk, /obj/structure/cable/green, /turf/simulated/floor/plating, @@ -24385,7 +24082,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24430,11 +24126,7 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "pjz" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25097,18 +24789,11 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/anomaly, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/xenoarch_storage) "pFz" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /mob/living/simple_mob/animal/passive/mimepet, /obj/structure/cable/green{ icon_state = "0-4" @@ -25159,8 +24844,7 @@ /area/rnd/outpost/xenobiology/outpost_main) "pHw" = ( /obj/structure/closet/crate/bin, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -25221,11 +24905,7 @@ name = "Station Intercom (General)"; pixel_x = -24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -25421,10 +25101,7 @@ pixel_y = -28 }, /obj/item/melee/baton/slime/loaded, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) @@ -25916,8 +25593,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -25931,8 +25607,7 @@ /area/rift/surfacebase/outside/outside1) "qiM" = ( /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -26213,8 +25888,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "qpF" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -26315,10 +25989,7 @@ }, /obj/structure/table/standard, /obj/item/paper_bin, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor/corner2{ dir = 10 }, @@ -26685,10 +26356,10 @@ name = "Cargo Garage"; req_one_access = list(31) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor/orange/corner{ dir = 8 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/garage) "qFN" = ( @@ -26744,10 +26415,7 @@ /obj/machinery/camera/network/security{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/security/security_cell_hallway) @@ -26851,9 +26519,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, @@ -26946,10 +26612,7 @@ /turf/simulated/floor/plating, /area/maintenance/evahallway) "qPI" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) @@ -27090,11 +26753,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) "qTT" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 }, @@ -27586,11 +27245,7 @@ /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "rld" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -27887,10 +27542,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27920,11 +27572,7 @@ dir = 10 }, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -28013,10 +27661,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -28365,7 +28010,7 @@ dir = 8 }, /obj/machinery/disposal, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -28390,11 +28035,7 @@ /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) "rIt" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light, /obj/structure/cable/green, /obj/structure/dogbed{ @@ -28614,10 +28255,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/item/paper{ info = "Use of this facility is strictly limited to scientific endeavors only. Chemicals produced here are not covered for adverse affects and reactions like Chemistry."; name = "note from CentCom about the chemlab"; @@ -28850,7 +28488,7 @@ }, /obj/machinery/light, /obj/effect/floor_decal/steeldecal/steel_decals_central6, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/monotile, /area/security/forensics) @@ -29004,8 +28642,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/research{ @@ -29152,10 +28789,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/space_heater, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, @@ -29182,10 +28816,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/security/forensics) "sjh" = ( @@ -29413,9 +29044,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/ladder{ pixel_y = 10 }, @@ -30153,7 +29782,7 @@ dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -30952,10 +30581,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/exam_room) "thE" = ( @@ -31004,8 +30630,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/paper_bin{ @@ -31179,8 +30804,7 @@ "tnt" = ( /obj/structure/table/standard, /obj/item/tape_recorder, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -31264,10 +30888,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/library) "toZ" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -31395,8 +31016,7 @@ /obj/machinery/portable_atmospherics/canister/nitrogen{ anchored = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -31812,8 +31432,7 @@ /area/maintenance/starboard) "tGL" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -32036,9 +31655,7 @@ /area/maintenance/cargo) "tMq" = ( /obj/structure/bed/chair, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -32182,7 +31799,7 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/main/secondary) @@ -32227,7 +31844,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -32491,10 +32108,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) "uaE" = ( @@ -32585,11 +32199,7 @@ dir = 8 }, /obj/random/soap, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) "ueA" = ( @@ -32840,9 +32450,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/security/security_cell_hallway) "ulQ" = ( @@ -33055,6 +32663,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rift/surfaceeva) "uqR" = ( @@ -33148,11 +32757,7 @@ /turf/simulated/floor/tiled/steel_grid/lythios43c, /area/rift/surfacebase/outside/outside1) "urH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -33429,15 +33034,8 @@ "uzb" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/east_mount, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -33560,8 +33158,7 @@ dir = 8 }, /obj/structure/disposalpipe/trunk, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/steel, @@ -33919,7 +33516,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -33960,7 +33557,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -34256,7 +33853,7 @@ tag_interior_door = "virology_airlock_interior" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -35594,8 +35191,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -35692,10 +35288,7 @@ /turf/simulated/floor/snow/gravsnow, /area/rift/surfacebase/outside/outside1) "wci" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/rift/trade_shop) @@ -35710,11 +35303,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/medical/virologyaccess) "wdf" = ( @@ -35780,11 +35369,7 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfaceone) "wdU" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/surface_south) "wdY" = ( @@ -35848,11 +35433,7 @@ dir = 1; pixel_y = 24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/wardrobe/science_white, /obj/structure/cable/green{ icon_state = "0-8" @@ -35884,8 +35465,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -36248,11 +35828,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -36635,11 +36211,7 @@ /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside1) "wDd" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -36711,8 +36283,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -36789,10 +36360,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) "wGO" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -26 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -36880,11 +36448,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -38113,6 +37677,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/garage) "xvW" = ( @@ -38158,7 +37723,7 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside1) "xwG" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/machinery/air_alarm{ dir = 4; pixel_x = -22 @@ -38285,10 +37850,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) @@ -38438,11 +38000,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -38725,14 +38283,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/evahallway) "xQG" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-8" @@ -39012,11 +38568,11 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/evahallway) "xZu" = ( @@ -39034,8 +38590,7 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "yaV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -39079,8 +38634,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -39179,8 +38733,7 @@ /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "yhe" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -39201,11 +38754,7 @@ /area/rnd/xenoarch_storage) "yhG" = ( /obj/structure/flora/pottedplant/unusual, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/camera/network/research{ dir = 1 }, @@ -56423,7 +55972,7 @@ pZn iTF abL luv -das +izR erN vsb kwn diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index c48753db0a..f69df86ecd 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -152,7 +152,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/locker) "ahw" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -185,9 +185,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -225,29 +223,6 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled/steel, /area/crew_quarters/pool) -"amc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter1"; - name = "Fighter Bay 1"; - pixel_x = -6; - pixel_y = 26 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter2"; - name = "Fighter Bay 2"; - pixel_x = 5; - pixel_y = 26 - }, -/obj/structure/handrail, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "amf" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/cable/green{ @@ -479,10 +454,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "asp" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) "asG" = ( @@ -590,10 +562,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, /area/crew_quarters/locker) "aww" = ( @@ -784,11 +753,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -806,10 +771,7 @@ "aBh" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/borderfloorblack/cee, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/clothing/accessory/permit/gun{ pixel_x = 5 }, @@ -891,11 +853,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1452,11 +1410,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -1807,7 +1761,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2066,17 +2020,13 @@ "biH" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/security/briefing_room) "biL" = ( /obj/machinery/papershredder, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -2153,11 +2103,7 @@ alpha = 255; dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/camera/network/security{ dir = 8 }, @@ -2344,10 +2290,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/machinery/light, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2476,15 +2419,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) -"buA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/security/hammerhead_bay) "buD" = ( /obj/structure/grille, /obj/structure/sign/warning/falling, @@ -2493,11 +2427,7 @@ "buN" = ( /obj/structure/table/steel, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/recharger{ pixel_x = -5; pixel_y = 3 @@ -2571,6 +2501,29 @@ }, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside2) +"byu" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerfighterport"; + name = "Port Fighter Bay"; + pixel_x = -3; + pixel_y = -30 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = 5; + pixel_y = -30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "byv" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -2754,11 +2707,7 @@ /area/rnd/research) "bEr" = ( /obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/sign/department/armory{ pixel_y = 32 }, @@ -2828,10 +2777,7 @@ /turf/simulated/floor/carpet, /area/security/warden) "bGI" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -2853,10 +2799,7 @@ name = "Powernet Sensor - Exterior Docking Pads Subgrid"; name_tag = "Exterior Docking Pads Subgrid" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-8" @@ -2930,13 +2873,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"bLw" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "bLy" = ( /obj/effect/floor_decal/borderfloorblack{ alpha = 255; @@ -3576,8 +3512,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacetwo) "cjg" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -3646,9 +3581,7 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "clA" = ( @@ -3720,8 +3653,7 @@ /turf/simulated/open, /area/rift/stairwell/primary/surfacetwo) "cnw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/carpet/blue, @@ -4006,10 +3938,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/holoposter{ pixel_x = -32 }, @@ -4060,11 +3989,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/item/mirrortool, /obj/structure/table/standard, /obj/item/paper{ @@ -4128,15 +4053,6 @@ }, /turf/simulated/floor/tiled/red, /area/security/security_processing) -"cDO" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/hammerhead/general) "cDU" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4294,10 +4210,6 @@ }, /turf/simulated/floor/water/deep/pool, /area/crew_quarters/pool) -"cJj" = ( -/obj/effect/floor_decal/corner_techfloor_gray, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "cJR" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv7"; @@ -4665,8 +4577,7 @@ /turf/simulated/floor/reinforced, /area/security/hammerhead_bay) "cWA" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -4781,10 +4692,7 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "dbd" = ( -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/rnd/breakroom) @@ -4966,11 +4874,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -5380,10 +5284,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/upper) "dwm" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 1 }, @@ -5772,9 +5673,7 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "dFH" = ( @@ -6215,6 +6114,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/lobby) +"dRQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/obj/machinery/light/no_nightshift{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/fuel, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "dSq" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -6287,8 +6196,7 @@ "dTN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -6404,10 +6312,7 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/machinery/disposal, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -6721,8 +6626,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6883,6 +6787,15 @@ /obj/structure/cable/green, /turf/simulated/floor/plating, /area/security/interrogation) +"etT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/security/hammerhead_bay) "eut" = ( /turf/simulated/wall/prepainted/medical, /area/medical/surgery) @@ -6902,11 +6815,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7061,16 +6970,6 @@ }, /turf/simulated/open, /area/hallway/primary/surfacetwo) -"eAU" = ( -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/structure/fuel_port{ - pixel_x = 30 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "eAV" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/circuits/basic, @@ -7137,10 +7036,7 @@ pixel_x = 4; pixel_y = 28 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, /area/rnd/research/testingrange) "eCc" = ( @@ -7404,11 +7300,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -7483,10 +7375,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -7756,8 +7645,7 @@ pixel_x = 4; pixel_y = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -7876,11 +7764,7 @@ /obj/machinery/camera/network/security{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -7949,13 +7833,6 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plating, /area/maintenance/dormitory) -"fcW" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "fcX" = ( /obj/structure/table/steel, /obj/item/book/manual/security_space_law, @@ -7980,6 +7857,28 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/fuel, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) +"fdo" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerfighterport"; + name = "Port Fighter Bay"; + pixel_x = 6; + pixel_y = -26 + }, +/obj/machinery/light/no_nightshift, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hammerheadpport"; + name = "Port Personnel Door"; + pixel_x = -5; + pixel_y = -26 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "fdT" = ( /obj/structure/inflatable/door, /obj/structure/cable/green{ @@ -8006,14 +7905,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/rnd) -"feI" = ( -/obj/structure/handrail{ - dir = 1 - }, -/obj/structure/lattice, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "feR" = ( /obj/structure/frame{ anchored = 1 @@ -8116,11 +8007,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8257,11 +8144,7 @@ }, /obj/item/gun/energy/ionrifle, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -8329,6 +8212,16 @@ }, /turf/simulated/floor/tiled, /area/security/briefing_room) +"fpW" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + name = "Control Room"; + req_one_access = list(1,38) + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/general) "fqf" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_3) @@ -8372,9 +8265,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/fiftyspawner/cardboard, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -8513,8 +8404,7 @@ "fuP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -8671,10 +8561,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "fDk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/pool/changing_room) @@ -8722,7 +8609,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -9405,15 +9292,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/breakroom) -"gbm" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter5"; - name = "Fighter Bay Exit 5" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "gbO" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -9432,11 +9310,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10225,11 +10099,7 @@ /turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, /area/rift/surfacebase/outside/outside2) "gzu" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green, /turf/simulated/floor/wood, @@ -10896,11 +10766,7 @@ /area/rnd/workshop) "gYu" = ( /obj/structure/bed/chair/comfy/brown, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/landmark/spawnpoint/job/medical_doctor, /obj/structure/cable/green{ icon_state = "0-2" @@ -10929,10 +10795,7 @@ /area/crew_quarters/recreation_area) "gZt" = ( /obj/machinery/cryopod/robot, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_ridged, /area/assembly/chargebay) "gZC" = ( @@ -11035,13 +10898,6 @@ "heZ" = ( /turf/simulated/wall/prepainted/medical, /area/medical/morgue) -"hfg" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "hfz" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -11289,30 +11145,19 @@ /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "hnx" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/railing{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner, /obj/structure/catwalk, +/obj/machinery/light/no_nightshift, /obj/machinery/button/remote/blast_door{ dir = 1; - id = "hammerfighter5"; - name = "Fighter Bay 5"; + id = "hammerfighterport"; + name = "Port Fighter Bay"; pixel_x = -5; pixel_y = -26 }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter6"; - name = "Fighter Bay 6"; - pixel_x = 6; - pixel_y = -26 - }, -/obj/structure/handrail{ - dir = 1 - }, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "hnY" = ( @@ -11590,11 +11435,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11839,6 +11680,23 @@ }, /turf/simulated/floor/plating, /area/maintenance/dormitory) +"hFZ" = ( +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/storage/toolbox/electrical{ + pixel_y = -4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/general) "hGo" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) @@ -12000,16 +11858,6 @@ "hKi" = ( /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/chemistry) -"hKy" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "hKz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -12589,10 +12437,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, @@ -12603,8 +12448,7 @@ /area/rift/stairwell/primary/surfacetwo) "hZL" = ( /obj/structure/table/rack/shelf/steel, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/storage/box/survival_knife{ @@ -13235,9 +13079,7 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -13318,11 +13160,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/mist, /obj/structure/cable/green{ icon_state = "0-2" @@ -13502,10 +13340,7 @@ /area/crew_quarters/heads/hos) "iGG" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -13526,11 +13361,7 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -13557,7 +13388,7 @@ /turf/simulated/floor/tiled/dark, /area/security/armory/red) "iIa" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13578,11 +13409,7 @@ /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacetwo) "iIr" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13738,11 +13565,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "iMW" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -14081,7 +13904,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "iZe" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14605,7 +14428,6 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "jqf" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Public Garden" }, @@ -14615,6 +14437,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "jqg" = ( @@ -14652,7 +14475,7 @@ "jqL" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14768,10 +14591,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -15007,11 +14827,7 @@ /area/maintenance/asmaint2) "jEp" = ( /obj/machinery/processor, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "jFC" = ( @@ -15075,6 +14891,20 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"jJS" = ( +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/light/no_nightshift{ + dir = 8 + }, +/obj/structure/fuel_port{ + pixel_x = 1; + pixel_y = 30 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "jJU" = ( /obj/map_helper/airlock/sensor/int_sensor, /obj/machinery/airlock_sensor{ @@ -15105,8 +14935,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel, @@ -15350,8 +15179,7 @@ /obj/structure/closet/hydrant{ pixel_x = -32 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -15464,9 +15292,7 @@ "jTV" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/corner/purple/border, /obj/structure/cable/green{ icon_state = "0-8" @@ -15491,9 +15317,7 @@ dir = 9 }, /obj/effect/mist, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "jVo" = ( @@ -15576,7 +15400,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "jYp" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -15686,7 +15510,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -15702,8 +15526,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "kaZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -15724,11 +15547,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15781,19 +15600,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/medbay) -"kdK" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/general) "ker" = ( /obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/red, @@ -15869,11 +15675,7 @@ dir = 4 }, /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -15900,6 +15702,7 @@ /turf/simulated/wall/r_wall/prepainted/medical, /area/medical/resleeving) "kiq" = ( +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "kiJ" = ( @@ -16231,10 +16034,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/filingcabinet/chestdrawer{ name = "Scan Records" }, @@ -16639,11 +16439,7 @@ dir = 8 }, /obj/machinery/photocopier, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/corner/red/border{ dir = 4 }, @@ -16675,11 +16471,7 @@ /area/maintenance/security/upper) "kCx" = ( /obj/structure/cable/orange, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/meter{ pixel_x = 16 }, @@ -16711,13 +16503,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/hammerhead/general) -"kEU" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/hammerhead/general) "kFB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16915,6 +16700,28 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) +"kNL" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = 5; + pixel_y = 26 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerheadpsb"; + name = "Starboard Personnel Door"; + pixel_x = -6; + pixel_y = 26 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "kNQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -17035,8 +16842,7 @@ /turf/simulated/open, /area/rift/station/public_garden/gantry) "kSp" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/reinforced, @@ -17221,15 +17027,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/lockers) -"kWx" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter3"; - name = "Fighter Bay Exit 3" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "kWP" = ( /obj/machinery/atmospherics/component/unary/cryo_cell, /obj/effect/floor_decal/corner/paleblue{ @@ -17598,9 +17395,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "ldl" = ( @@ -17727,15 +17522,13 @@ "lib" = ( /obj/structure/table/wooden_reinforced, /obj/item/reagent_containers/food/condiment/small/sugar, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, /area/crew_quarters/coffee_shop) "lig" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17981,10 +17774,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) @@ -18078,11 +17868,7 @@ /obj/effect/floor_decal/borderfloorblack/cee{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18357,22 +18143,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"lCs" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "lCv" = ( /obj/structure/toilet{ pixel_y = 9 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) -"lCY" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - name = "Control Room"; - req_one_access = list(1,38) - }, -/obj/effect/floor_decal/corner_techfloor_gray{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "lDe" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -18395,11 +18183,7 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/corner/lightorange/border{ dir = 8 }, @@ -18772,15 +18556,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/wall/r_wall/prepainted, /area/medical/chemistry) -"lPt" = ( -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "lQj" = ( /obj/structure/closet/crate{ name = "Grenade Crate" @@ -18839,7 +18614,7 @@ /turf/simulated/floor, /area/maintenance/substation/cafeteria_dock) "lQX" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19012,11 +18787,7 @@ /obj/structure/sign/department/morgue{ pixel_y = -32 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -19243,10 +19014,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -19452,7 +19220,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "mka" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -19522,9 +19290,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "mmM" = ( @@ -19605,10 +19371,7 @@ /obj/item/clothing/glasses/goggles, /obj/item/clothing/glasses/goggles, /obj/item/clothing/ears/earmuffs, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, @@ -19691,7 +19454,7 @@ /turf/simulated/floor/tiled/steel, /area/rnd/research) "mqr" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/research/rnd) @@ -20135,8 +19898,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/secure_closet/scientist, @@ -20568,11 +20330,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20891,11 +20649,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, @@ -21161,8 +20915,8 @@ /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/regular{ dir = 4; - id = "hammerfighter4"; - name = "Fighter Bay Exit 4" + id = "hammerfighterport"; + name = "Port Fighter Bay" }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -21555,22 +21309,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/brig) -"nxS" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/catwalk, -/obj/machinery/light/no_nightshift, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter6"; - name = "Fighter Bay 6"; - pixel_x = -5; - pixel_y = -26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "nxY" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/coffee_shop) @@ -21657,11 +21395,7 @@ "nzw" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -21696,8 +21430,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -22090,11 +21823,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -22127,8 +21856,7 @@ alpha = 255; dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -22225,11 +21953,8 @@ /turf/simulated/floor/tiled/monowhite, /area/medical/sleeper) "nUi" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -22644,19 +22369,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) -"ogw" = ( -/obj/machinery/light/no_nightshift{ - dir = 8 - }, -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/obj/item/radio/intercom/department/security{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "ogH" = ( /obj/machinery/meter{ pixel_x = 6; @@ -23087,8 +22799,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 24 }, /obj/machinery/button/remote/airlock{ @@ -23500,8 +23211,8 @@ /obj/machinery/atmospheric_field_generator/perma, /obj/machinery/door/blast/regular{ dir = 4; - id = "hammerfighter1"; - name = "Fighter Bay Exit 1" + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay Exit" }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -23782,8 +23493,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -24054,9 +23764,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -24071,8 +23779,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/corner/red{ @@ -24548,8 +24255,7 @@ /area/crew_quarters/pool) "prL" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -24888,11 +24594,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25070,11 +24772,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -25164,8 +24862,7 @@ "pRj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25264,28 +24961,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/sleep) -"pUb" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter1"; - name = "Fighter Bay 1"; - pixel_x = 5; - pixel_y = 26 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerheadpsb"; - name = "Starboard Personnel Door"; - pixel_x = -6; - pixel_y = 26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "pUL" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -25588,10 +25263,7 @@ /obj/item/storage/box/masks{ pixel_x = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "qfG" = ( @@ -25602,8 +25274,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) "qgp" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ @@ -25649,6 +25320,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/plating, /area/maintenance/medbay) +"qij" = ( +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "qiJ" = ( /obj/structure/grille, /obj/structure/foamedmetal, @@ -25902,12 +25579,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"qpx" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "qpE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -26330,11 +26001,8 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacetwo) "qCM" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -26505,11 +26173,7 @@ /area/shuttle/hammerhead/cockpit) "qJo" = ( /obj/structure/table/steel, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloorblack{ alpha = 255; dir = 4 @@ -26729,11 +26393,7 @@ /turf/simulated/floor/tiled/dark, /area/security/evidence_storage) "qQk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/air_alarm{ dir = 4; pixel_x = -24 @@ -26856,9 +26516,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 10 }, -/obj/machinery/power/apc{ - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -26911,19 +26569,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) -"qUM" = ( -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/voidcraft/vertical{ - name = "Control Room"; - req_one_access = list(1,38) - }, -/obj/effect/floor_decal/corner_techfloor_gray{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "qVn" = ( /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 @@ -27119,26 +26764,22 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) "rcg" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/railing{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /obj/structure/catwalk, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter2"; - name = "Fighter Bay 2"; - pixel_x = -6; - pixel_y = 26 +/obj/machinery/light/no_nightshift{ + dir = 1 }, /obj/machinery/button/remote/blast_door{ - id = "hammerfighter3"; - name = "Fighter Bay 3"; - pixel_x = 5; + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = -6; pixel_y = 26 }, -/obj/structure/handrail, /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "rcB" = ( @@ -27365,11 +27006,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27627,8 +27264,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -27733,10 +27369,7 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "rtk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/reinforced, /area/security/hammerhead_bay) @@ -27876,11 +27509,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; @@ -28195,8 +27824,7 @@ /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -28405,9 +28033,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "rRc" = ( @@ -29102,12 +28728,6 @@ "sse" = ( /turf/simulated/wall/prepainted/security, /area/security/security_processing) -"sss" = ( -/obj/structure/handrail, -/obj/structure/lattice, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "ssT" = ( /obj/effect/floor_decal/rust, /obj/machinery/light/small{ @@ -29420,16 +29040,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/heads/hor) -"sCV" = ( -/obj/machinery/power/smes/buildable{ - charge = 1.5e+007; - cur_coils = 3 - }, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "sDd" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/bed/chair{ @@ -29486,8 +29096,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -29751,9 +29360,6 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/pool, /area/crew_quarters/pool) -"sNY" = ( -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "sPc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -29769,33 +29375,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"sPt" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter4"; - name = "Fighter Bay 4"; - pixel_x = -5; - pixel_y = -26 - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter5"; - name = "Fighter Bay 5"; - pixel_x = 6; - pixel_y = -26 - }, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "sPP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -29848,11 +29427,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "sSX" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/medbay) @@ -30284,7 +29859,7 @@ /turf/simulated/floor/wood, /area/security/breakroom) "tlq" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "0-4" @@ -30457,10 +30032,7 @@ /area/medical/reception) "trg" = ( /obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/sign/department/armory{ pixel_y = -32 }, @@ -30572,11 +30144,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -30745,8 +30313,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -30824,20 +30391,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/medical/reception) -"tBx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 - }, -/obj/machinery/light/no_nightshift{ - dir = 4 - }, -/obj/item/radio/intercom/department/security{ - dir = 4; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "tBE" = ( /obj/structure/railing{ dir = 4 @@ -31084,28 +30637,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"tGD" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerfighter4"; - name = "Fighter Bay 4"; - pixel_x = 6; - pixel_y = -26 - }, -/obj/machinery/light/no_nightshift, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "hammerheadpport"; - name = "Port Personnel Door"; - pixel_x = -5; - pixel_y = -26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "tGY" = ( /obj/landmark/spawnpoint/job/warden, /obj/machinery/light_switch{ @@ -31277,7 +30808,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -31297,15 +30828,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/pool/emergency_closet) -"tSM" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter6"; - name = "Fighter Bay Exit 6" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "tSV" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -31359,6 +30881,27 @@ }, /turf/simulated/floor/tiled/steel, /area/holodeck_control) +"tUK" = ( +/obj/structure/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerfighterport"; + name = "Port Fighter Bay"; + pixel_x = -4; + pixel_y = 33 + }, +/obj/machinery/button/remote/blast_door{ + id = "hammerfighterstarboard"; + name = "Starboard Fighter Bay"; + pixel_x = 4; + pixel_y = 33 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/cockpit) "tUW" = ( /obj/machinery/light{ dir = 8 @@ -31603,11 +31146,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -31660,9 +31199,7 @@ /obj/structure/table/rack/shelf, /obj/random/maintenance/security, /obj/random/contraband, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/random/maintenance/research, /obj/item/clothing/accessory/holster/armpit, /turf/simulated/floor/plating, @@ -32080,11 +31617,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32095,13 +31628,8 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/power/apc/north_mount, +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -32233,7 +31761,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -32255,6 +31783,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "uFl" = ( @@ -32490,8 +32019,7 @@ /obj/item/target, /obj/item/target, /obj/item/target, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/air_alarm{ @@ -32635,8 +32163,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -32785,10 +32312,7 @@ /area/tether/surfacebase/reading_room) "uSr" = ( /obj/machinery/light/small, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -33643,8 +33167,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -33766,10 +33289,7 @@ "vtX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/crew_quarters/sleep) @@ -33997,7 +33517,7 @@ /turf/simulated/floor/plating, /area/shuttle/hammerhead/general) "vEJ" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -34043,11 +33563,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/dormitory) "vGZ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 }, @@ -34152,6 +33668,19 @@ /obj/machinery/vending/fitness, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/pool) +"vKi" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/voidcraft/vertical{ + name = "Control Room"; + req_one_access = list(1,38) + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/hammerhead/general) "vKj" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ @@ -34212,19 +33741,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) -"vMM" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/storage/toolbox/electrical{ - pixel_y = -4 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/fuel{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "vNQ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -34273,6 +33789,15 @@ /obj/random/tool, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"vQJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/fuel{ + dir = 5 + }, +/obj/machinery/computer/ship/engines{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "vQP" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -34389,15 +33914,6 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) -"vVo" = ( -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "hammerfighter2"; - name = "Fighter Bay Exit 2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/shuttle/hammerhead/general) "vVr" = ( /obj/effect/floor_decal/rust, /obj/item/tool/screwdriver, @@ -34456,9 +33972,7 @@ dir = 8; pixel_x = -24 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "vWW" = ( @@ -34552,11 +34066,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -34705,11 +34215,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -34810,9 +34316,8 @@ "wjQ" = ( /obj/structure/bed/chair/comfy/beige, /obj/landmark/spawnpoint/job/senior_researcher, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/floor/wood, /area/rnd/breakroom) @@ -34829,15 +34334,10 @@ /area/security/armory/red) "wjX" = ( /obj/structure/table/rack/shelf/steel, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/red, /area/security/evidence_storage) @@ -34881,11 +34381,7 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -35008,8 +34504,7 @@ "wpX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/vending/fitness, @@ -35175,8 +34670,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/corner/lightorange{ @@ -35251,8 +34745,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/outside2) "wAb" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -35357,8 +34850,7 @@ /turf/simulated/floor/tiled/steel, /area/assembly/robotics) "wCr" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -35385,6 +34877,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"wDF" = ( +/obj/item/radio/intercom/department/security{ + pixel_y = -24 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "wDR" = ( /obj/machinery/door/airlock/maintenance/medical{ name = "Medbay Auxillary Storage" @@ -35550,10 +35048,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "wLS" = ( @@ -36059,13 +35554,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"xfg" = ( -/obj/structure/handrail, -/obj/structure/lattice, -/obj/structure/lattice, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "xfy" = ( /obj/structure/closet/wardrobe/red, /obj/effect/floor_decal/industrial/outline/yellow, @@ -36091,10 +35579,7 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/resleeving) "xgG" = ( @@ -36248,8 +35733,7 @@ dir = 10 }, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -36349,7 +35833,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 6 }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -36652,25 +36136,6 @@ }, /turf/simulated/floor/tiled/steel, /area/assembly/robotics) -"xCl" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/machinery/button/remote/blast_door{ - id = "hammerfighter3"; - name = "Fighter Bay 3"; - pixel_x = -6; - pixel_y = 26 - }, -/turf/simulated/floor/plating, -/area/shuttle/hammerhead/general) "xCG" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -36747,7 +36212,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "xFv" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -36898,10 +36363,7 @@ department = "Reading Room" }, /obj/structure/table/glass, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "xIz" = ( @@ -37082,7 +36544,7 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "xNm" = ( @@ -37109,19 +36571,13 @@ }, /turf/simulated/floor, /area/maintenance/substation/research) -"xNR" = ( -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "xOj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/purple/bordercorner2, /obj/machinery/door/firedoor/glass{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -37413,11 +36869,7 @@ /obj/effect/floor_decal/corner/red{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -37481,6 +36933,19 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) +"xVE" = ( +/obj/machinery/power/smes/buildable{ + charge = 1.5e+007; + cur_coils = 3 + }, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/hammerhead/general) "xVY" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -37632,10 +37097,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/security_processing) "yaL" = ( @@ -37671,9 +37133,7 @@ /turf/simulated/open, /area/rift/trade_shop/loading) "ycW" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/railing{ dir = 4 }, @@ -37734,7 +37194,7 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "yfc" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/rust, /obj/structure/cable/green{ icon_state = "4-8" @@ -37834,11 +37294,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay) "yhs" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "yhO" = ( @@ -37886,57 +37342,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/medical/surgeryprep) -"yjG" = ( -/obj/structure/handrail{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter1"; - name = "Fighter Bay 1"; - pixel_x = 23; - pixel_y = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter2"; - name = "Fighter Bay 2"; - pixel_x = 32; - pixel_y = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter3"; - name = "Fighter Bay 3"; - pixel_x = 42; - pixel_y = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter4"; - name = "Fighter Bay 4"; - pixel_x = 23; - pixel_y = -7 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter5"; - name = "Fighter Bay 5"; - pixel_x = 32; - pixel_y = -7 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "hammerfighter6"; - name = "Fighter Bay 6"; - pixel_x = 42; - pixel_y = -7 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/hammerhead/cockpit) "yjX" = ( /obj/machinery/light/small{ dir = 4 @@ -38033,8 +37438,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -45552,11 +44956,11 @@ sUg cuM gbO cuM -xNR +qYi cuM gbO cuM -xNR +qYi cuM gbO cuM @@ -52629,12 +52033,12 @@ qly qly qly qly -oOw -oOw -oOw -oOw -oOw -oOw +qly +qly +qly +qly +qly +qly qly qly qly @@ -52821,14 +52225,12 @@ qly qly qly qly +qly +qly oOw oOw oOw oOw -gzZ -nNP -oOw -oOw oOw oOw qly @@ -52836,6 +52238,8 @@ qly qly qly qly +qly +qly hMX uAn nFd @@ -53012,22 +52416,22 @@ uAn qly qly qly -iCM -iCM +qly +qly +qly oOw oOw -sUa -seE oOw -uuN -wqC oOw -bpb -eqt +gzZ +nNP oOw oOw -iCM -iCM +oOw +oOw +qly +qly +qly qly qly qly @@ -53205,26 +52609,26 @@ pBj uAn qly qly +qly +qly iCM iCM -xjH -aKa -qpx -sQt -sYU oOw -ufs -sUJ +sUa +seE +oOw +uuN +wqC +oOw +bpb +eqt oOw -xaM -sQt -qpx -aKa -iqw iCM iCM qly qly +qly +qly uAn mYc mYc @@ -53399,24 +52803,24 @@ pBj uAn fqV qly +qly iCM -uuY -ehg -sQt -sQt -ffG -dhC -mhJ -fyj -jyv -wdn -dhC -pBz +iCM +xjH +aKa sQt +sYU +oOw +ufs +sUJ +oOw +xaM sQt -ehg -hhM +aKa +iqw iCM +iCM +qly qly sZb uAn @@ -53593,24 +52997,24 @@ dVV uAn qly qly -oOw -eXr -yjG -ujL -sQt +qly +iCM +uuY +ehg sQt -lPt -xEQ -xEQ -vEO -liE -qJl +ffG +dhC +mhJ +fyj +jyv +wdn +dhC +pBz sQt -cJj -ujL -yjG -hOS -oOw +ehg +hhM +iCM +qly qly qly uAn @@ -53787,26 +53191,26 @@ enB uAn qly qly +qly oOw -oOw -oOw -oOw -oUW -dbt -djJ +eXr +tUK ujL -jyv -vAW +sQt +qij +lCs +xEQ +vEO +liE +qJl +sQt ujL -djU -dbt -gyO -oOw -oOw -oOw +byu +hOS oOw qly qly +qly uAn dAE eTD @@ -53982,17 +53386,18 @@ kvr swv qly qly -qly -oOw -oOw -oOw -oOw +ilr oOw oOw -iag -mvg -oOw oOw +oUW +dbt +djJ +jyv +vAW +djU +dbt +gyO oOw oOw oOw @@ -54000,7 +53405,6 @@ oOw qly qly qly -qly uAn tZW tZW @@ -54178,18 +53582,18 @@ qly qly qly qly -qly -qly -eBF oOw oOw -lCY -qUM oOw oOw -qly -qly -qly +oOw +iag +mvg +oOw +oOw +oOw +oOw +oOw qly qly qly @@ -54374,12 +53778,11 @@ qly qly qly qly +eBF ilr ilr -ilr -aSz -bFP -ilr +fpW +vKi ilr ilr qly @@ -54388,6 +53791,7 @@ qly qly qly qly +qly sZb uAn oPZ @@ -54567,14 +53971,13 @@ eqc qly qly qly +qly ilr ilr -qnJ -nVS -nVS -qkS -xbD -kdK +ilr +aSz +bFP +ilr ilr ilr qly @@ -54582,6 +53985,7 @@ qly qly qly qly +qly hMX uAn uUy @@ -54761,16 +54165,16 @@ eqc qly qly qly -pQK -pxC -pxC -xbD -xbD -rLY +ilr +ilr +qnJ +nVS +nVS +qkS xbD -pxC -pxC -kJk +hFZ +ilr +ilr qly qly qly @@ -54954,18 +54358,18 @@ cnl aTs qly qly -iZI -ilr -pUb -nLz -mxh +qly +pQK +pxC +pxC +xbD xbD rLY -mFf -nLz -tGD -ilr -lrj +xbD +pxC +pxC +kJk +qly qly qly qly @@ -55148,18 +54552,18 @@ rrr cWw qly qly -vDu -oPv -fSv -gHJ -hsv -lKw -wJB -lXc -grT -fSv -njk -vDu +iZI +ilr +kNL +nLz +mxh +xbD +rLY +mFf +nLz +fdo +ilr +lrj qly qly qly @@ -55345,12 +54749,12 @@ qly vDu oPv fSv -fSv -jug -pxC -dzD -wcF -fSv +gHJ +hsv +lKw +wJB +lXc +grT fSv njk vDu @@ -55536,18 +54940,18 @@ rrr cWw qly qly -feI -ilr -amc -hKy -cDO +vDu +oPv +fSv +fSv +jug pxC dzD -kEU -hKy -sPt -ilr -xfg +wcF +fSv +fSv +njk +vDu qly qly qly @@ -55731,16 +55135,16 @@ cWw qly qly vDu -vVo +oPv fSv -gHJ +kwh hsv lKw uSS lXc grT -fSv -gbm +uRN +njk vDu qly qly @@ -55925,7 +55329,7 @@ cWw qly qly vDu -vVo +oPv fSv fSv jug @@ -55934,7 +55338,7 @@ dzD wcF fSv fSv -gbm +njk vDu qly qly @@ -56118,18 +55522,18 @@ cnl nSi qly qly -feI +cYC ilr rcg -hKy -cDO -pxC -dzD -kEU -hKy +mkP +tnu +pPV +kDT +ybB +mkP hnx ilr -sss +aJI qly qly qly @@ -56312,18 +55716,18 @@ cnl eqc qly qly -vDu -kWx -fSv -kwh -hsv -lKw -uSS -lXc -grT -uRN -tSM -vDu +bru +lhE +rda +pxC +trq +pPV +cVx +ojI +ieh +vIN +azT +vnt qly qly qly @@ -56502,26 +55906,26 @@ pBj pBj uAn qly +iFy +dFm qly -eqc qly qly -vDu -kWx -fSv -fSv -jug -pxC -dzD -wcF -fSv -fSv -tSM -vDu +lhE +qxx +xIV +jTU +jJU +fZv +jhd +vfd +jwp +azT qly qly qly -nxh +uht +rrx hMX uAn uAn @@ -56696,26 +56100,26 @@ pBj pBj uAn fqV -qly -eqc +qdY +fJu qly qly -cYC ilr -xCl -mkP -tnu -pPV -kDT -ybB -mkP -nxS ilr -aJI -qly +ijJ +bap +ilr +ayE +ceM +ilr +kMU +jNS +ilr +ilr qly qly -nxh +spg +mAS sZb uAn jux @@ -56890,26 +56294,26 @@ pBj pBj uAn swv -iFy -dFm -qly +pqq +kAt qly -bru -lhE -rda -pxC -trq -pPV -cVx -ojI -ieh -vIN -azT -vnt +ilr +ilr +jJS +slB +wDF +ilr +uhb +iXD +ilr +cya +lag +kCx +ilr +ilr qly qly -uht -rrx +nxh qly uAn pCP @@ -57084,26 +56488,26 @@ pBj pBj uAn qly -qdY -fJu -qly -qly +ecx qly -lhE -qxx -xIV -jTU -jJU -fZv -jhd -vfd -jwp -azT qly +ilr +mPW +fdm +ogH +vQJ +ilr +pUZ +oxe +ilr +xVE +frQ +dRQ +rsA +ilr qly qly -spg -mAS +nxh cbV uAn pCP @@ -57278,25 +56682,25 @@ pBj pBj uAn qly -buA -eqc +ecx qly ilr ilr +iRD +qNg +iRD +qNg ilr -ijJ -bap -ilr -ayE -ceM -ilr -kMU -jNS +tKD +qDr ilr +iRD +qNg +iRD +qNg ilr ilr qly -qly nxh qly uAn @@ -57472,22 +56876,22 @@ pBj pBj uAn qly -pqq -kAt +ecx +qly ilr ilr -hfg -ogw -slB -sNY +xlX +dym +xlX +dym ilr -uhb -iXD +dKZ +cEL ilr -cya -lag -kCx -bLw +xlX +dym +xlX +dym ilr ilr qly @@ -57669,20 +57073,20 @@ qly ecx qly ilr -mPW -fdm -eAU -ogH -vMM ilr -pUZ -oxe +qly +qly +qly +qly +qly +qly +eyy +qly +qly +qly +qly +qly ilr -sCV -frQ -tBx -fcW -rsA ilr qly nxh @@ -57861,24 +57265,24 @@ pBj uAn fqV ecx -ilr -ilr -iRD -qNg -ilr -iRD -qNg -ilr -tKD -qDr -ilr -iRD -qNg -ilr -iRD -qNg -ilr -ilr +qly +qly +qly +qly +qly +qly +qly +qly +qly +etT +qly +qly +qly +qly +qly +qly +qly +qly nxh sZb uAn @@ -58055,24 +57459,24 @@ pBj uAn swv ecx -ilr -ilr -xlX -dym -ilr -xlX -dym -ilr -dKZ -cEL -ilr -xlX -dym -ilr -xlX -dym -ilr -ilr +qly +qly +qly +qly +qly +qly +qly +qly +qly +etT +qly +qly +qly +qly +qly +qly +qly +qly nxh hMX uAn @@ -58249,8 +57653,6 @@ pBj uAn qly ecx -ilr -ilr qly qly qly @@ -58258,15 +57660,17 @@ qly qly qly qly -eyy +qly +qly +etT +qly +qly qly qly qly qly qly qly -ilr -ilr nxh qly uAn diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 0742ee01ce..fa8c16b12b 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -246,11 +246,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -698,10 +694,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -819,11 +812,7 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside3) "acI" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1097,10 +1086,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "adB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/barrestroom) "adC" = ( @@ -1435,10 +1421,7 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -1684,18 +1667,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "afv" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "afw" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "afx" = ( @@ -2007,10 +1986,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "agu" = ( @@ -2137,14 +2113,12 @@ /obj/machinery/computer/card, /obj/machinery/button/windowtint{ id = "hop_office"; - layer = 3.3; pixel_x = 8; pixel_y = 26 }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_office_shutters"; - layer = 3.3; name = "Office Shutters"; pixel_x = -8; pixel_y = 26 @@ -2218,8 +2192,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "ahc" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -2321,11 +2294,7 @@ /turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "ahr" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -2363,10 +2332,7 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "ahw" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/air_alarm{ dir = 8; pixel_x = 24 @@ -2438,11 +2404,8 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cockpit) "ahF" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "2-8" @@ -2678,11 +2641,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/exploration/meeting) @@ -2769,8 +2728,7 @@ /obj/item/folder/blue, /obj/item/clothing/glasses/omnihud, /obj/item/pen, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet/blue, @@ -2859,11 +2817,7 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 24 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -3345,11 +3299,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/exploration) "ajX" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3420,11 +3370,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -3628,8 +3574,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -3751,11 +3696,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "akU" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -4141,10 +4082,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) "ama" = ( @@ -4240,10 +4178,7 @@ /turf/simulated/floor/tiled/techfloor/grid/lythios43c, /area/shuttle/emt/cockpit) "ami" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -4688,11 +4623,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -5094,7 +5025,7 @@ /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "civvie_docker"; pixel_x = -24; @@ -5917,11 +5848,7 @@ pixel_y = 30 }, /obj/structure/bed/chair/shuttle, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -5979,7 +5906,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "aqW" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -6088,11 +6015,7 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/civvie/general) "arm" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -6296,8 +6219,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "arK" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel_grid, @@ -6772,8 +6694,7 @@ "ath" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor/corner2, @@ -6803,8 +6724,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -7061,11 +6981,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -7366,10 +7282,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/white, @@ -7445,9 +7358,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "auU" = ( @@ -8167,10 +8078,7 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "awB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/landmark/free_ai_shell, /obj/effect/floor_decal/techfloor{ dir = 6 @@ -8456,8 +8364,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/steel, @@ -8474,11 +8381,8 @@ pixel_x = 32 }, /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -8522,10 +8426,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/power/apc/high{ - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/high, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "axq" = ( @@ -9240,10 +9141,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "azq" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -9535,8 +9433,7 @@ dir = 4; pixel_x = -30 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -9772,8 +9669,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -10056,11 +9952,7 @@ /obj/structure/cable/cyan{ icon_state = "2-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -10642,8 +10534,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/steel, @@ -10759,11 +10650,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11356,11 +11243,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel, /area/exploration) "aFL" = ( @@ -11996,11 +11879,7 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -12119,8 +11998,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -12207,11 +12085,7 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "aIf" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -12607,8 +12481,7 @@ /area/rift/trade_shop/landing_pad) "aJj" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12712,11 +12585,7 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/captain) "aJr" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -12804,8 +12673,7 @@ /obj/effect/floor_decal/corner/lime/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ @@ -13265,7 +13133,6 @@ /area/shuttle/excursion/cargo) "aKM" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_y = -28 }, @@ -13557,11 +13424,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) "aLJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "aLL" = ( @@ -13575,7 +13438,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13629,8 +13492,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -13697,10 +13559,7 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "aMh" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -14968,10 +14827,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -15874,9 +15730,7 @@ /area/bridge/bridge_hallway) "aSj" = ( /obj/effect/floor_decal/spline/plain, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/exploration/meeting) "aSk" = ( @@ -16444,11 +16298,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "aTL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) "aTN" = ( @@ -16960,8 +16810,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/steel, @@ -17400,10 +17249,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "aWB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -17481,11 +17327,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -17914,8 +17756,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/steel, @@ -18130,11 +17971,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aYG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18482,9 +18319,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -18509,11 +18344,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18619,7 +18450,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18919,7 +18750,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19069,11 +18900,7 @@ on = 1; scrub_id = "civ_airlock_two_scrubber" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/railing{ dir = 8 }, @@ -19814,7 +19641,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -19838,8 +19665,7 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -28 }, /obj/structure/cable/green{ @@ -19849,11 +19675,7 @@ /area/crew_quarters/heads/blueshield) "eEi" = ( /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20185,7 +20007,7 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) "flF" = ( -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20222,7 +20044,7 @@ }, /obj/item/packageWrap, /obj/item/packageWrap, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/hydroponics) @@ -20656,7 +20478,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20757,7 +20579,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20835,9 +20657,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/firedoor/glass{ dir = 8 }, @@ -20986,6 +20806,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "hDa" = ( @@ -21252,11 +21075,13 @@ /turf/simulated/floor/plating, /area/exploration/pathfinder_office) "iio" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal/mait{ dir = 4; name = "Maintenance Access" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "ikZ" = ( @@ -21539,9 +21364,7 @@ /area/crew_quarters/bar) "jew" = ( /obj/structure/table/bench/standard, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) "jil" = ( @@ -22098,7 +21921,7 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 1 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -22161,9 +21984,7 @@ }, /obj/effect/floor_decal/industrial/warning, /obj/structure/railing, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/ladder{ pixel_y = 10 }, @@ -22379,10 +22200,7 @@ /turf/simulated/wall/rshull, /area/shuttle/excursion/cargo) "lzf" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -22612,7 +22430,7 @@ /turf/simulated/floor/tiled/steel, /area/crew_quarters/heads/hop) "lYx" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/machinery/light{ dir = 1 }, @@ -23392,9 +23210,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) "orx" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) "oti" = ( @@ -23843,11 +23659,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -24193,7 +24005,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -24451,6 +24263,10 @@ /obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) +"riD" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/commandmaint) "riL" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -24652,11 +24468,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ frequency = 1379; scrub_id = "civ_airlock_scrubber" @@ -24753,7 +24565,7 @@ /obj/structure/railing, /obj/structure/foodcart, /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25328,11 +25140,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/standard, /obj/item/storage/laundry_basket, /obj/structure/cable/green, @@ -25430,8 +25238,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/industrial/outline, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -25731,11 +25538,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "0-8" @@ -25816,7 +25619,7 @@ /obj/structure/sink/kitchen{ pixel_y = 26 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26412,11 +26215,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -26450,11 +26249,7 @@ dir = 9 }, /obj/machinery/light/small, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -26464,7 +26259,7 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "xbb" = ( @@ -26487,8 +26282,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/cable/green{ @@ -26540,7 +26334,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26676,10 +26470,7 @@ /area/crew_quarters/bar) "xHc" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -26803,7 +26594,7 @@ /area/rift/stairwell/primary/surfacethree) "xYy" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -26815,7 +26606,7 @@ /turf/simulated/floor/tiled/steel, /area/exploration) "yaE" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26934,9 +26725,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "yku" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -52842,7 +52631,7 @@ aaA aaA aaA aaA -aaA +riD aaA aaA aAN diff --git a/maps/rift/levels/rift-07-west_base.dmm b/maps/rift/levels/rift-07-west_base.dmm index 2a72adcd64..141ed1240c 100644 --- a/maps/rift/levels/rift-07-west_base.dmm +++ b/maps/rift/levels/rift-07-west_base.dmm @@ -683,10 +683,9 @@ "Jt" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 diff --git a/maps/rift/levels/rift-08-west_deep.dmm b/maps/rift/levels/rift-08-west_deep.dmm index 83a4421b7d..751b87cf5d 100644 --- a/maps/rift/levels/rift-08-west_deep.dmm +++ b/maps/rift/levels/rift-08-west_deep.dmm @@ -144,8 +144,9 @@ /turf/simulated/floor/plating, /area/rnd/outpost/maintenance) "bh" = ( -/turf/simulated/floor/sky/depths/west/lythios43c, -/area/rift/surfacebase/outside/west_deep) +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "bi" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/gateway) @@ -208,11 +209,7 @@ /area/outpost/mining_main/refinery) "bR" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -316,6 +313,15 @@ /obj/spawner/window/reinforced/full, /turf/simulated/floor, /area/turbolift/rwest_mining/deep) +"cL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/outpost/mining_main/outpost/maintenance) "cP" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -458,6 +464,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/blue, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) +"eM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/outpost/mining_main/outpost/maintenance/north) "eN" = ( /obj/effect/floor_decal/industrial/halfstair, /obj/structure/railing{ @@ -659,7 +673,7 @@ /obj/structure/cable/green{ icon_state = "0-5" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/south) "hc" = ( @@ -705,8 +719,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -1220,7 +1233,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /turf/simulated/floor/tiled, @@ -1268,7 +1280,7 @@ /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/outpost/near_gateway) "lt" = ( -/obj/structure/closet/emcloset, +/obj/structure/table/steel_reinforced, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "lx" = ( @@ -1387,7 +1399,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/janitorial) "mF" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -1711,6 +1723,18 @@ /obj/machinery/camera/network/mining{ dir = 4 }, +/obj/structure/closet/walllocker{ + dir = 8; + pixel_x = -28 + }, +/obj/item/clothing/head/helmet/space/void/mining, +/obj/item/clothing/suit/space/void/mining, +/obj/item/clothing/shoes/magboots, +/obj/item/pickaxe/silver, +/obj/item/pickaxe/silver, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "pf" = ( @@ -1721,10 +1745,9 @@ /obj/effect/floor_decal/corner/white/full{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/tiled/dark, /area/rift/facility/interior/temple) @@ -1817,6 +1840,11 @@ /obj/machinery/computer/shuttle_control/belter{ dir = 1 }, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the belter shuttle systems, to help miners find where they left their shuttle."; + gps_tag = "BELTER"; + name = "belter beacon" + }, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "pQ" = ( @@ -2108,6 +2136,12 @@ name = "glacier wall" }, /area/rift/surfacebase/outside/west_deep) +"sT" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/outpost/mining_main/refinery) "sW" = ( /obj/structure/table/standard, /obj/machinery/recharger, @@ -2709,10 +2743,9 @@ /area/outpost/mining_main/outpost/airlock/three) "yG" = ( /obj/structure/bed/chair, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3462,7 +3495,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/monotile, /area/gateway) "EQ" = ( @@ -3572,9 +3605,12 @@ /area/gateway) "FP" = ( /obj/effect/mist, -/turf/simulated/floor/water, +/turf/unsimulated/floor/lava/geothermal, /area/space) "FW" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/gateway/prep_room) "FX" = ( @@ -3899,7 +3935,7 @@ dir = 8 }, /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/near_gateway) "Jl" = ( @@ -3921,10 +3957,10 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) "Jt" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) "Jv" = ( @@ -4026,7 +4062,7 @@ /obj/machinery/button/remote/blast_door{ id = "belter_blast"; name = "Shuttle Blast Doors"; - pixel_x = -25; + pixel_x = -23; pixel_y = -25 }, /turf/simulated/shuttle/floor/voidcraft, @@ -4102,7 +4138,7 @@ /obj/structure/cable/green{ icon_state = "0-6" }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/north) "La" = ( @@ -4196,10 +4232,9 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance/south) "Mc" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4216,7 +4251,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4272,12 +4307,12 @@ name = "Material Processing"; req_one_access = list(48) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/refinery) "MD" = ( @@ -4315,7 +4350,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -4333,7 +4368,7 @@ /turf/simulated/floor/tiled, /area/gateway) "Ne" = ( -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, /area/rnd/outpost/underground) "Nf" = ( @@ -4356,8 +4391,8 @@ dir = 4; name = "Gateway Prep" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/gateway/prep_room) @@ -4570,7 +4605,7 @@ /obj/structure/cable/green{ icon_state = "0-6" }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/belterdock) "Pz" = ( @@ -4625,6 +4660,13 @@ /obj/machinery/light/small, /turf/simulated/floor/outdoors/snow/lythios43c/indoors, /area/rift/surfacebase/outside/west_deep) +"Qw" = ( +/obj/structure/sign/warning/lava{ + name = "\improper SUPERHEATED GAS"; + pixel_x = -32 + }, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, +/area/rift/surfacebase/outside/west_deep/submap_seedzone) "Qz" = ( /obj/structure/inflatable, /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, @@ -4697,7 +4739,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4720,7 +4761,6 @@ pixel_y = 30 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -5046,10 +5086,9 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/prison) "UD" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/janitorial) @@ -5236,7 +5275,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/door/firedoor/glass, @@ -5301,14 +5339,11 @@ /obj/machinery/door/airlock/multi_tile/metal/mait{ name = "Maintenance Access" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance) "WM" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/substation) @@ -5320,10 +5355,7 @@ /turf/simulated/mineral/icerock/lythios43c, /area/rift/surfacebase/outside/west_deep/submap_seedzone) "WX" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -5464,7 +5496,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -5479,8 +5510,9 @@ /turf/simulated/floor/reinforced, /area/gateway) "Yw" = ( -/turf/simulated/floor/sky/depths/west/lythios43c, -/area/rift/surfacebase/outside/west_deep) +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/techfloor, +/area/quartermaster/belterdock) "YA" = ( /obj/machinery/light/small{ dir = 1 @@ -5615,6 +5647,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/outpost/recreation) "ZQ" = ( @@ -5639,8 +5674,8 @@ /obj/machinery/door/airlock/multi_tile/glass{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/outpost/mining_main/outpost/recreation) @@ -30593,7 +30628,7 @@ WW WW WW WW -Wv +Qw Wv WW Vs @@ -34683,7 +34718,7 @@ vA JM KF KF -KF +Ne KF KF Lm @@ -35229,7 +35264,7 @@ uJ uJ uJ uJ -aV +sT Mp uJ Nw @@ -36205,7 +36240,7 @@ fa bM Hy ox -bM +eM NV Du Nw @@ -36972,7 +37007,7 @@ dV rn Pq ww -Cl +Yw BB XN nK @@ -37339,10 +37374,10 @@ pU pU pU oZ -bh -bh -bh -bh +il +il +il +il iI fM QJ @@ -37528,15 +37563,15 @@ XQ dV dV dV -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il iI fM QJ @@ -37719,18 +37754,18 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il iI fM QJ @@ -37906,25 +37941,25 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il iI fM QJ @@ -38090,35 +38125,35 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il iI fM QJ @@ -38275,44 +38310,44 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn rn RO @@ -38344,7 +38379,7 @@ ti mI kQ nG -nG +cL sI Dd XP @@ -38467,46 +38502,46 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn Qf Ij @@ -38521,10 +38556,10 @@ Ij uu kk rn -bh -bh -bh -bh +il +il +il +il SP VH Im @@ -38640,67 +38675,67 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn Ij LK @@ -38715,10 +38750,10 @@ tr gc Fu rn -bh -bh -bh -bh +il +il +il +il SP uo DO @@ -38830,71 +38865,71 @@ sN "} (172,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij fp @@ -38909,10 +38944,10 @@ Lr fp uu jB -bh -bh -bh -bh +il +il +il +il St SP SP @@ -39024,71 +39059,71 @@ sN "} (173,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39103,31 +39138,31 @@ SI Ij uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -XQ -XQ -XQ -XQ -XQ -XQ -ky -ky -ky +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +XQ +XQ +XQ +XQ +XQ +XQ +ky +ky +ky qT ky ky @@ -39218,71 +39253,71 @@ sN "} (174,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39292,32 +39327,32 @@ Fm oG pe MO -lt +bh SI SI uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky ky ky @@ -39365,14 +39400,14 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il XQ XQ XQ @@ -39412,71 +39447,71 @@ sN "} (175,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39491,40 +39526,40 @@ pO zc uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky ky ky @@ -39556,20 +39591,20 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ @@ -39594,83 +39629,83 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il pT "} (176,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39685,41 +39720,41 @@ SI SI uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky ky ky @@ -39747,26 +39782,26 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ @@ -39783,88 +39818,88 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (177,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il jB Ij uN @@ -39879,46 +39914,46 @@ SI Ij uu jB -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il ky qT ky @@ -39938,127 +39973,127 @@ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(178,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(178,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn Ij Ij @@ -40073,186 +40108,186 @@ cD Te uu rn -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il XQ XQ XQ XQ XQ XQ -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (179,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il rn pE kF @@ -40267,2638 +40302,2638 @@ up cA es rn -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (180,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (181,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(182,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(182,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (183,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (184,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (185,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(186,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(186,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (187,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (188,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (189,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -pT -"} -(190,1,1) = {" -pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +pT +"} +(190,1,1) = {" +pT +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (191,1,1) = {" pT -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh -bh +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il pT "} (192,1,1) = {" pT -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw -Yw +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il il pT "} diff --git a/maps/rift/levels/rift-09-west_caves.dmm b/maps/rift/levels/rift-09-west_caves.dmm index 40298ba1ab..d633529dc0 100644 --- a/maps/rift/levels/rift-09-west_caves.dmm +++ b/maps/rift/levels/rift-09-west_caves.dmm @@ -172,11 +172,7 @@ /obj/structure/cable/white{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/lythios43c/indoors, /area/rift/geothermal) "co" = ( @@ -267,7 +263,7 @@ /turf/simulated/open/lythios43c, /area/rift/facility/interior/medical) "dg" = ( -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -358,8 +354,8 @@ req_access = list(); req_one_access = list(19,43,67) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/rnd/outpost/underground) @@ -648,7 +644,7 @@ /turf/simulated/floor/tiled/steel/lythios43c, /area/rift/facility/interior/medical) "ho" = ( -/obj/machinery/power/apc/direction_bump/east, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -891,6 +887,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/outpost/underground) "kt" = ( @@ -1133,6 +1132,9 @@ /obj/structure/cable/green{ icon_state = "6-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/outpost/underground) "nG" = ( @@ -1287,7 +1289,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/medical) "pl" = ( -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost/underground) "pt" = ( @@ -1408,8 +1410,7 @@ /area/rift/facility/interior/workroom) "qF" = ( /obj/random/obstruction, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1 +/obj/machinery/power/apc/alarms_hidden/north_mount{ }, /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -2143,10 +2144,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -2222,10 +2220,9 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/outpost) "As" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2717,8 +2714,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/storage) "EU" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/underground) @@ -3397,7 +3394,7 @@ "NE" = ( /obj/machinery/space_heater, /obj/structure/railing, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-6" }, @@ -3773,10 +3770,9 @@ /turf/simulated/floor/outdoors/snow/lythios43c/indoors, /area/rift/surfacebase/outside/west_caves) "RG" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -3920,7 +3916,7 @@ /turf/simulated/wall, /area/rift/facility/interior/medical) "Tg" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/outpost/mining_main/outpost/maintenance) @@ -4028,7 +4024,7 @@ /area/rift/surfacebase/outside/west_caves) "UH" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/outpost/mining_main/outpost/washrooms) "UN" = ( @@ -4463,6 +4459,12 @@ /obj/random/trash_pile, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/exterior/bunker/lower) +"Yy" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/outside/west_caves/submap_seedzone) "YB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4476,7 +4478,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/machinery/power/apc/direction_bump/west, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4510,7 +4512,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/rift/surfacebase/outside/west_caves) "YZ" = ( -/obj/machinery/power/apc/direction_bump/south, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/outpost/storage) @@ -8620,7 +8622,7 @@ Sn Sn Sn Sn -Sn +Yy Sn Sn Sn @@ -33612,7 +33614,7 @@ be Iq qM qM -oI +pl oI Gr uL @@ -33621,7 +33623,7 @@ Sc oR hJ oI -oI +pl oI mW Iq diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm index d3c1182a4b..11eacbe0d0 100644 --- a/maps/rift/levels/rift-10-west_plains.dmm +++ b/maps/rift/levels/rift-10-west_plains.dmm @@ -391,11 +391,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/extinguisher_cabinet{ dir = 1; @@ -511,8 +508,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1105,10 +1101,9 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "fj" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1167,11 +1162,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost) "fx" = ( @@ -1421,10 +1412,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab/airlock) "gG" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -1654,8 +1642,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/outside/west) "hz" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -2210,11 +2197,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "jU" = ( @@ -2229,10 +2212,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/outside/west) "jZ" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "ka" = ( @@ -2443,11 +2423,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/outpost/airlock/one) "kX" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -2503,8 +2479,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/surface) "lq" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3023,11 +2998,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "nK" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3113,8 +3084,7 @@ /area/outpost/mining_main/outpost/airlock/one) "ok" = ( /obj/structure/closet/firecloset, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled, @@ -3258,11 +3228,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "pi" = ( @@ -3525,11 +3491,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -3642,11 +3604,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/purple/full{ dir = 4 @@ -3800,10 +3758,7 @@ /turf/simulated/floor/reinforced/lythios43c, /area/rift/facility/exterior) "rx" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -3825,10 +3780,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "rF" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/bed/chair/wood{ dir = 4 @@ -3987,11 +3939,7 @@ /turf/simulated/floor/plating/lythios43c, /area/rift/facility/exterior) "st" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4611,10 +4559,9 @@ /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/mineshaft) "uU" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/facility/interior/surface) @@ -4782,11 +4729,8 @@ /turf/simulated/floor/lythios43c, /area/rift/facility/interior/surface) "vL" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -4837,9 +4781,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost/eva) "vW" = ( @@ -5065,11 +5007,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "wV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5363,8 +5301,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "yg" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/steel_dirty, @@ -5540,9 +5477,7 @@ dir = 4; pixel_x = -22 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "yZ" = ( @@ -5814,10 +5749,7 @@ /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/checkpoint/south) "Ao" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/light_switch{ dir = 8; @@ -5870,7 +5802,7 @@ dir = 1 }, /obj/machinery/door/firedoor{ - dir = 1; + dir = 4; req_one_access = list(18,47) }, /turf/simulated/floor/tiled, @@ -5891,9 +5823,7 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "AG" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "AL" = ( @@ -6081,8 +6011,7 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) "BS" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -6497,11 +6426,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1452; @@ -6511,10 +6436,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab/airlock) "DU" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; chargelevel = 0; - dir = 1 }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) @@ -6645,11 +6569,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "EV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6750,11 +6670,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor, /area/rnd/outpost/atmos) @@ -6968,11 +6885,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/purple{ dir = 6 }, @@ -7268,11 +7181,7 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "HG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7647,8 +7556,7 @@ /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/item/melee/umbrella/random, @@ -8386,8 +8294,8 @@ /area/rnd/outpost/anomaly_lab) "Na" = ( /obj/machinery/door/firedoor{ - dir = 8; - req_one_access = list(18,47) + req_one_access = list(18,47); + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -8399,10 +8307,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/portables_connector{ dir = 1 }, @@ -9508,8 +9413,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/corner/purple{ @@ -9529,11 +9433,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -9664,7 +9564,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -9878,11 +9777,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rift/exterior/checkpoint/south) "TU" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9989,6 +9884,12 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) +"Ui" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/outside/west) "Uj" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, @@ -10060,7 +9961,7 @@ dir = 4 }, /obj/machinery/door/firedoor{ - dir = 2; + dir = 4; req_one_access = list(18,47) }, /turf/simulated/floor/tiled, @@ -10430,10 +10331,7 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "WS" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -10851,9 +10749,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "YM" = ( @@ -10928,7 +10824,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/power/apc/direction_bump/north, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11049,11 +10945,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/exterior/mineshaft) "ZN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -16903,7 +16795,7 @@ PP PP PP PP -PP +Ui PP PP PP diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index 885319f623..faec5a90a2 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -306,8 +306,8 @@ /area/holodeck/source_courtroom) "bf" = ( /obj/machinery/door/window/holowindoor{ - dir = 4; - name = "Red Team" + name = "Red Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) @@ -767,8 +767,8 @@ "cB" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; - dir = 4; - icon_state = "right" + icon_state = "right"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) @@ -789,7 +789,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Green Team" + name = "Green Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_emptycourt) @@ -1256,8 +1257,8 @@ /area/holodeck/source_meetinghall) "eg" = ( /obj/machinery/door/window/holowindoor{ - dir = 4; - name = "Red Team" + name = "Red Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) @@ -1272,8 +1273,8 @@ /area/holodeck/source_beach) "ej" = ( /obj/machinery/door/window/holowindoor{ - dir = 4; - name = "Red Team" + name = "Red Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) @@ -1882,7 +1883,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Green Team" + name = "Green Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_basketball) @@ -1902,7 +1904,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Green Team" + name = "Green Team"; + dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_thunderdomecourt) @@ -5397,7 +5400,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) "qn" = ( @@ -6195,7 +6198,7 @@ /area/centcom/simulated/medical) "sV" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -8413,7 +8416,7 @@ pixel_y = -28 }, /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/cockpit) "KE" = ( @@ -8850,6 +8853,10 @@ /obj/structure/table/reinforced, /turf/unsimulated/floor/dark, /area/centcom/specops) +"OM" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) "OY" = ( /obj/structure/bed/chair/backed_grey, /turf/simulated/floor/reinforced, @@ -8974,7 +8981,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "QJ" = ( @@ -9538,7 +9545,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/plating, /area/centcom/specops) "Wt" = ( @@ -9853,7 +9860,7 @@ icon_state = "1-8" }, /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/centcom/specops/dock) "Zo" = ( @@ -9928,7 +9935,6 @@ /area/centcom/specops) "ZN" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_y = 30 }, @@ -21656,7 +21662,7 @@ nU pg nU nU -nU +OM qR nU nU diff --git a/maps/sectors/debrisfield_140/levels/debrisfield.dmm b/maps/sectors/debrisfield_140/levels/debrisfield.dmm index ed702d1a0a..b3cbde122e 100644 --- a/maps/sectors/debrisfield_140/levels/debrisfield.dmm +++ b/maps/sectors/debrisfield_140/levels/debrisfield.dmm @@ -139,9 +139,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/space/debrisfield/explored) "G" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 30 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, diff --git a/maps/sectors/debrisfield_192/levels/debrisfield.dmm b/maps/sectors/debrisfield_192/levels/debrisfield.dmm index 4098ebe5a8..507b0c14b1 100644 --- a/maps/sectors/debrisfield_192/levels/debrisfield.dmm +++ b/maps/sectors/debrisfield_192/levels/debrisfield.dmm @@ -110,9 +110,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/space/debrisfield/explored) "Bk" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 30 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, diff --git a/maps/sectors/frozen_140/levels/frozen_140.dmm b/maps/sectors/frozen_140/levels/frozen_140.dmm index d3ff1f11f4..c598c1ec59 100644 --- a/maps/sectors/frozen_140/levels/frozen_140.dmm +++ b/maps/sectors/frozen_140/levels/frozen_140.dmm @@ -564,7 +564,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "frozen"; - layer = 3.3; name = "Frozen Dock Controller"; pixel_y = 30 }, @@ -807,8 +806,7 @@ /area/class_p/facility) "Lq" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/power/apc/east_mount{ pixel_x = 32; req_access = null; start_charge = 0 diff --git a/maps/sectors/frozen_192/levels/frozen_192.dmm b/maps/sectors/frozen_192/levels/frozen_192.dmm index 713766fd50..19aac97b65 100644 --- a/maps/sectors/frozen_192/levels/frozen_192.dmm +++ b/maps/sectors/frozen_192/levels/frozen_192.dmm @@ -563,7 +563,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "frozen"; - layer = 3.3; name = "Frozen Dock Controller"; pixel_y = 30 }, @@ -869,8 +868,7 @@ /area/class_p/unexplored) "Sj" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/power/apc/east_mount{ pixel_x = 32; req_access = null; start_charge = 0 diff --git a/maps/sectors/gaia_140/levels/gaia_140.dmm b/maps/sectors/gaia_140/levels/gaia_140.dmm index c097bf844a..d6a195307c 100644 --- a/maps/sectors/gaia_140/levels/gaia_140.dmm +++ b/maps/sectors/gaia_140/levels/gaia_140.dmm @@ -374,7 +374,7 @@ /turf/simulated/floor/tiled/dark, /area/class_m/inside) "iO" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /obj/machinery/light{ dir = 8 }, @@ -628,7 +628,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "gaia_1"; - layer = 3.3; name = "Gaia Dock Controller"; pixel_y = 30 }, @@ -730,7 +729,7 @@ /turf/simulated/floor/outdoors/dirt/classm, /area/class_m/outside) "qX" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/class_m/inside) "qY" = ( @@ -741,7 +740,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "gaia_2"; - layer = 3.3; name = "Gaia Dock Controller"; pixel_y = 30 }, diff --git a/maps/sectors/gaia_192/levels/gaia_192.dmm b/maps/sectors/gaia_192/levels/gaia_192.dmm index 14f20e7084..03319d0657 100644 --- a/maps/sectors/gaia_192/levels/gaia_192.dmm +++ b/maps/sectors/gaia_192/levels/gaia_192.dmm @@ -146,7 +146,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "aV" = ( /obj/structure/fence, @@ -161,6 +161,10 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/outside) +"aX" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside/beach) "aZ" = ( /obj/structure/table/hardwoodtable, /turf/simulated/floor/concrete/rng/classm/outdoors, @@ -490,13 +494,14 @@ /turf/simulated/floor/concrete/tile/indoors, /area/class_m/inside/hotspringcaves) "cI" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "cJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -544,6 +549,13 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/outside) +"cP" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "cR" = ( /obj/effect/floor_decal/corner/blue/border, /obj/machinery/sleeper{ @@ -605,10 +617,20 @@ }, /turf/simulated/floor/tiled/monowhite, /area/class_m/inside/garage) +"dq" = ( +/obj/effect/floor_decal/river_beach_edge, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "dw" = ( /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) +"dy" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "dA" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -735,7 +757,7 @@ /area/class_m/outside) "es" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) "ew" = ( /mob/living/simple_mob/animal/passive/fish/javelin, @@ -769,9 +791,10 @@ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 8 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "eK" = ( /obj/effect/mist, @@ -984,6 +1007,10 @@ /mob/living/simple_mob/animal/passive/fish/salmon, /turf/simulated/floor/water/deep/classm, /area/class_m/outside) +"fM" = ( +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "fO" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 @@ -996,7 +1023,7 @@ /area/class_m/inside/bathroom) "fP" = ( /mob/living/simple_mob/animal/passive/fish/perch, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/deep/classm, /area/class_m/outside) "fU" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -1020,10 +1047,6 @@ "gd" = ( /turf/simulated/floor/water/beach, /area/class_m/outside/island2) -"ge" = ( -/obj/structure/catwalk, -/turf/simulated/floor/water/classm, -/area/class_m/outside) "gi" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -1212,6 +1235,9 @@ /obj/structure/fence, /turf/simulated/floor/outdoors/dirt/classm/outdoors, /area/class_m/outside) +"hr" = ( +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beachmiddle) "hs" = ( /turf/simulated/floor/water/beach{ dir = 1 @@ -1270,6 +1296,12 @@ }, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"hM" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 5 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "hQ" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -1298,9 +1330,9 @@ /area/class_m/outside/island2) "ia" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "ic" = ( /obj/machinery/vending/wallmed1{ @@ -1337,9 +1369,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "ii" = ( /obj/structure/railing/grey, @@ -1360,13 +1393,14 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside/sauna) "il" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "im" = ( /obj/machinery/holoposter{ @@ -1385,9 +1419,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "iq" = ( /obj/structure/table/bench/wooden, @@ -1456,6 +1491,15 @@ }, /turf/simulated/floor/tiled/monotile/classm, /area/class_m/inside/main) +"iH" = ( +/obj/structure/flora/ausbushes/reedbush, +/obj/structure/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/water/deep/classm, +/area/class_m/outside) "iM" = ( /obj/structure/railing/grey{ dir = 8 @@ -1466,9 +1510,10 @@ /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside/beachmiddle) "iO" = ( -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "iP" = ( /obj/structure/flora/tree/palm, @@ -1488,8 +1533,12 @@ /area/class_m/outside/beachmiddle) "iS" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) +"iT" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "iW" = ( /turf/simulated/floor/water/beach/corner{ dir = 4 @@ -1675,11 +1724,12 @@ /turf/simulated/floor/tiled/white, /area/class_m/outside) "jI" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 5 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "jJ" = ( /obj/structure/table/woodentable, @@ -1731,6 +1781,13 @@ /mob/living/simple_mob/animal/passive/bird/ringneck_dove, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"jS" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "jV" = ( /obj/effect/floor_decal/corner/blue/border{ dir = 5 @@ -1747,9 +1804,9 @@ /turf/simulated/floor/wood/classm/outdoors, /area/class_m/outside/docks) "jY" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "jZ" = ( /turf/simulated/floor/tiled/white, @@ -1782,7 +1839,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "kj" = ( /obj/structure/flora/ausbushes/ywflowers, @@ -1795,6 +1852,10 @@ }, /turf/simulated/wall/classm, /area/class_m/outside) +"kl" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "ko" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 4 @@ -1809,7 +1870,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "kr" = ( /obj/machinery/button/remote/airlock{ @@ -2010,10 +2071,11 @@ /turf/simulated/floor/water/deep/classm, /area/class_m/outside) "le" = ( -/obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 8 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "lf" = ( /obj/machinery/door/window/northright{ @@ -2092,7 +2154,7 @@ /area/class_m/outside) "lq" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "lt" = ( /obj/effect/floor_decal/corner/blue/border, @@ -2230,7 +2292,7 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "mm" = ( /obj/structure/flora/ausbushes/fernybush, @@ -2655,9 +2717,10 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 5 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "oI" = ( /obj/item/stack/material/log{ @@ -2682,6 +2745,10 @@ /obj/structure/salvageable/server, /turf/simulated/floor/tiled/steel_dirty, /area/class_m/inside) +"oM" = ( +/obj/effect/floor_decal/river_beach_edge, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "oO" = ( /obj/structure/bed/double/padded, /obj/item/bedsheet/rddouble, @@ -2726,6 +2793,15 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside/beachmiddle) +"pa" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beachmiddle) "pd" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood/classm, @@ -2736,7 +2812,7 @@ /area/class_m/outside) "pg" = ( /mob/living/simple_mob/animal/passive/fish/trout, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "pk" = ( /obj/structure/flora/tree/palm, @@ -2793,6 +2869,19 @@ /obj/structure/railing/grey, /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) +"pz" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) +"pB" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 6 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "pE" = ( /obj/structure/railing/grey{ dir = 8 @@ -2899,9 +2988,10 @@ /area/class_m/outside/docks) "qi" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 6 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "qj" = ( /obj/structure/flora/ausbushes/genericbush, @@ -2965,9 +3055,10 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "qy" = ( /obj/vehicle/ridden/gokart/random{ @@ -3461,9 +3552,10 @@ /area/class_m/outside/beach) "sY" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "sZ" = ( /obj/machinery/light/flamp/noshade{ @@ -3495,9 +3587,13 @@ }, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"tl" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/deep/classm, +/area/class_m/outside) "tm" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "tn" = ( /obj/structure/table/rack, @@ -3562,9 +3658,10 @@ dir = 1; nightshift_allowed = 0 }, -/turf/simulated/floor/water/beach/corner{ - dir = 1 +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "ty" = ( /obj/machinery/light/flamp/noshade{ @@ -3587,9 +3684,10 @@ /area/class_m/inside) "tE" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "tF" = ( /turf/simulated/floor/outdoors/grass/classm, @@ -3604,7 +3702,7 @@ /area/class_m/inside/dorms) "tJ" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "tL" = ( /obj/effect/map_effect/interval/effect_emitter/steam, @@ -3714,7 +3812,7 @@ /area/class_m/outside) "ui" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "uq" = ( /obj/structure/closet/crate/trashcart, @@ -3775,6 +3873,9 @@ "uP" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/class_m/outside) +"uQ" = ( +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "uR" = ( /obj/structure/railing{ dir = 1 @@ -3802,6 +3903,10 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"uZ" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "vb" = ( /obj/item/clothing/head/cone, /turf/simulated/floor/tiled/monowhite, @@ -3809,6 +3914,10 @@ "vd" = ( /turf/simulated/floor/carpet/purcarpet, /area/class_m/inside/dorms) +"ve" = ( +/mob/living/simple_mob/animal/passive/fish/salmon, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "vg" = ( /obj/structure/catwalk, /obj/structure/railing, @@ -3935,9 +4044,9 @@ /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) "vU" = ( +/obj/structure/flora/ausbushes/reedbush, /obj/structure/catwalk, -/obj/structure/railing, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "vX" = ( /obj/machinery/light/flamp/noshade{ @@ -4000,13 +4109,13 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "wo" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/deep/classm, /area/class_m/outside) "wq" = ( /obj/effect/floor_decal/corner/blue/border{ @@ -4124,6 +4233,10 @@ dir = 4 }, /area/class_m/inside) +"wR" = ( +/obj/effect/floor_decal/river_beach_corner_edge, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beach) "wT" = ( /obj/structure/table/bench/marble, /obj/effect/mist, @@ -4195,7 +4308,7 @@ /area/class_m/inside/garage) "xp" = ( /obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside/beach) "xr" = ( /obj/machinery/light{ @@ -4320,6 +4433,10 @@ /obj/machinery/bodyscanner, /turf/simulated/floor/tiled/white, /area/class_m/outside) +"yd" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "ye" = ( /obj/structure/fence{ name = "vollyball net"; @@ -4336,8 +4453,12 @@ /area/class_m/outside/beachmiddle) "ym" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) +"yn" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "yr" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -4369,9 +4490,10 @@ /area/class_m/inside/cabin) "yv" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "yw" = ( /obj/structure/railing/grey{ @@ -4610,13 +4732,14 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside) "zE" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "zG" = ( /obj/structure/bed/chair/sofa/black/corner{ @@ -4684,11 +4807,11 @@ /turf/simulated/wall/classm, /area/class_m/inside/bathroom) "zU" = ( -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/deep/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "zV" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -4791,6 +4914,13 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside/beachmiddle) +"Ay" = ( +/obj/machinery/light/spot{ + dir = 1; + nightshift_allowed = 0 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Az" = ( /obj/machinery/vending/fishing, /obj/effect/floor_decal/spline/plain{ @@ -4816,7 +4946,7 @@ "AE" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/catwalk, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "AG" = ( /obj/machinery/light/flamp/noshade{ @@ -4884,7 +5014,7 @@ /obj/machinery/light/spot{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Bb" = ( /obj/structure/table/marble, @@ -4920,6 +5050,16 @@ "Bi" = ( /turf/simulated/floor/water/beach, /area/class_m/outside/beachmiddle) +"Bk" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Bm" = ( /obj/structure/railing/grey{ dir = 4 @@ -4952,6 +5092,10 @@ }, /turf/simulated/floor/water/deep/classm, /area/class_m/outside) +"Br" = ( +/obj/effect/floor_decal/river_beach_corner_edge, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "Bu" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/outdoors/grass/classm, @@ -5002,6 +5146,9 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"BF" = ( +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside/beachmiddle) "BG" = ( /obj/structure/table/woodentable, /turf/simulated/floor/outdoors/beach/sand/desert/classm{ @@ -5108,9 +5255,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 1 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Cm" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -5150,9 +5298,10 @@ /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 4 }, +/turf/simulated/floor/water/river/west/outdoors, /area/class_m/outside) "Cx" = ( /obj/machinery/light/spot{ @@ -5222,7 +5371,8 @@ /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "CV" = ( /obj/machinery/light/flamp/noshade{ @@ -5244,9 +5394,10 @@ /area/class_m/outside) "CZ" = ( /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 9 }, +/turf/simulated/floor/water/river/west/outdoors, /area/class_m/outside) "Da" = ( /obj/structure/flora/ausbushes/sparsegrass, @@ -5311,6 +5462,12 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/main) +"Dy" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beachmiddle) "Dz" = ( /obj/structure/flora/ausbushes/genericbush, /obj/structure/railing/grey{ @@ -5323,9 +5480,10 @@ dir = 4 }, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "DC" = ( /obj/machinery/door/airlock{ @@ -5342,6 +5500,11 @@ /obj/machinery/gear_painter, /turf/simulated/floor/wood/classm, /area/class_m/inside) +"DG" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "DI" = ( /obj/machinery/tele_projector{ dir = 4 @@ -5486,11 +5649,12 @@ /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) "Ew" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 8 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Ey" = ( /turf/simulated/floor/tiled/classm, @@ -5504,7 +5668,13 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) +"EA" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 9 + }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "EE" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -5562,7 +5732,7 @@ /area/class_m/inside) "EU" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) "EW" = ( /obj/effect/floor_decal/spline/plain{ @@ -5573,7 +5743,7 @@ dir = 1; nightshift_allowed = 0 }, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "EX" = ( /obj/machinery/vending/wallmed1{ @@ -5600,6 +5770,12 @@ }, /turf/simulated/floor/tiled/classm/outdoors, /area/class_m/outside/beachmiddle) +"Fj" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 6 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beach) "Fk" = ( /obj/machinery/appliance/cooker/oven, /obj/machinery/light/spot{ @@ -5610,7 +5786,7 @@ /area/class_m/inside/main) "Fs" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) "Fx" = ( /obj/item/stool/padded, @@ -5648,6 +5824,9 @@ }, /turf/simulated/floor/tiled/monotile/classm, /area/class_m/inside/main) +"FI" = ( +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside/beach) "FJ" = ( /obj/machinery/light_switch{ dir = 4; @@ -5731,9 +5910,10 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Gl" = ( /obj/machinery/vending/fishing, @@ -5983,7 +6163,7 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside/dorms) "HI" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /obj/machinery/light/spot{ dir = 8; nightshift_allowed = 0 @@ -5999,7 +6179,7 @@ "HN" = ( /obj/structure/flora/ausbushes/reedbush, /obj/structure/catwalk, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "HQ" = ( /obj/structure/railing{ @@ -6140,7 +6320,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/stalkybush, /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "IG" = ( /obj/structure/bed/chair/comfy/black{ @@ -6229,8 +6409,14 @@ /area/class_m/inside/dorms) "Je" = ( /obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/deep/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) +"Jg" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 10 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Ji" = ( /obj/structure/table/bench/marble, /obj/effect/mist, @@ -6299,6 +6485,10 @@ dir = 8 }, /area/class_m/outside/island) +"Js" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/water/deep/classm, +/area/class_m/outside) "Jt" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, @@ -6352,6 +6542,12 @@ name = "beach" }, /area/class_m/outside/beachmiddle) +"JU" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 1 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "JV" = ( /obj/structure/catwalk, /obj/structure/railing, @@ -6372,6 +6568,13 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/dorms) +"JZ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Ka" = ( /obj/structure/railing/grey{ dir = 1 @@ -6435,6 +6638,9 @@ /obj/structure/flora/tree/jungle_small, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"Ku" = ( +/turf/simulated/floor/water/river/deep/west/outdoors, +/area/class_m/outside) "Kw" = ( /obj/item/stool/padded, /turf/simulated/floor/concrete/tile/classm/outdoors{ @@ -6478,11 +6684,12 @@ /turf/simulated/floor/tiled/white, /area/class_m/outside) "Kz" = ( -/obj/structure/catwalk, /obj/structure/railing, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 8 }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "KC" = ( /obj/machinery/door/airlock{ @@ -6493,9 +6700,10 @@ /area/class_m/inside/dorms) "KE" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach/corner{ +/obj/effect/floor_decal/river_beach_corner_edge{ dir = 8 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "KF" = ( /obj/machinery/door/airlock{ @@ -6635,6 +6843,12 @@ outdoors = 1 }, /area/class_m/outside) +"Ll" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Lo" = ( /obj/item/stool/padded, /obj/item/stool/padded, @@ -6682,7 +6896,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "gaia_1"; - layer = 3.3; name = "Gaia Dock Controller"; pixel_y = 30 }, @@ -6758,6 +6971,9 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/main) +"LT" = ( +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "LU" = ( /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 @@ -6796,24 +7012,20 @@ /turf/simulated/floor/tiled/classm/outdoors, /area/class_m/outside) "Ma" = ( -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 4 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beach) +"Mb" = ( +/obj/structure/railing, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Mc" = ( /obj/structure/flora/rock, /turf/simulated/floor/outdoors/dirt/classm/outdoors, /area/class_m/outside) -"Me" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/water/classm, -/area/class_m/outside) "Mg" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/water/deep/classm, @@ -6894,6 +7106,16 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/inside/bathroom) +"MI" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) +"MJ" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "MQ" = ( /mob/living/simple_mob/animal/passive/fish/solarfish, /turf/simulated/floor/water/classm, @@ -6928,13 +7150,6 @@ /obj/structure/kitchenspike, /turf/simulated/floor/tiled/freezer, /area/class_m/inside/main) -"MX" = ( -/obj/structure/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/water/classm, -/area/class_m/outside) "Na" = ( /obj/structure/flora/tree/jungle, /mob/living/simple_mob/animal/passive/bird/black_bird, @@ -6987,6 +7202,10 @@ dir = 1 }, /area/class_m/outside/island) +"Np" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "Nt" = ( /obj/structure/railing/grey{ dir = 4 @@ -7041,6 +7260,10 @@ "NJ" = ( /turf/simulated/floor/concrete/classm/outdoors, /area/class_m/outside/beachmiddle) +"NL" = ( +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "NM" = ( /obj/machinery/computer/security/telescreen{ pixel_y = 45 @@ -7492,6 +7715,9 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass, /area/class_m/outside) +"OR" = ( +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside/beach) "OU" = ( /obj/structure/flora/ausbushes/sparsegrass, /mob/living/simple_mob/animal/passive/bird/european_robin, @@ -7628,9 +7854,18 @@ }, /turf/simulated/floor/concrete/tile/classm/outdoors, /area/class_m/outside) +"PM" = ( +/obj/effect/floor_decal/river_beach_corner_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "PN" = ( /turf/simulated/floor/water/deep/classm, /area/class_m/outside/docks) +"PP" = ( +/turf/simulated/floor/water/river/deep/south/outdoors, +/area/class_m/outside) "PQ" = ( /obj/structure/bed/chair{ dir = 4; @@ -7653,6 +7888,12 @@ /obj/structure/railing, /turf/simulated/floor/tiled/classm/outdoors, /area/class_m/outside) +"PV" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 6 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "PZ" = ( /obj/effect/overlay/coconut, /turf/simulated/floor/outdoors/beach/sand/desert/classm{ @@ -7691,9 +7932,16 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) +"Qo" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/west/outdoors, /area/class_m/outside) "Qp" = ( /turf/simulated/floor/concrete/tile/classm/outdoors{ @@ -7787,9 +8035,10 @@ /area/class_m/inside/main) "QX" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 9 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Rb" = ( /obj/machinery/appliance/mixer/candy, @@ -7827,7 +8076,7 @@ "Rh" = ( /obj/structure/flora/ausbushes/stalkybush, /obj/structure/catwalk, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Rm" = ( /obj/structure/table/marble, @@ -7958,6 +8207,10 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/sauna) +"RX" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "RY" = ( /obj/structure/flora/tree/jungle, /turf/simulated/floor/outdoors/grass, @@ -7983,9 +8236,10 @@ /turf/simulated/floor/wood/classm, /area/class_m/inside/main) "Se" = ( -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 9 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside/beachmiddle) "Sg" = ( /turf/simulated/floor/concrete/tile/classm/outdoors{ @@ -8010,7 +8264,7 @@ /turf/simulated/floor/outdoors/grass, /area/class_m/outside) "Sl" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/class_m/inside/main) "Sn" = ( @@ -8052,6 +8306,13 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"Sy" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "Sz" = ( /obj/machinery/shower{ dir = 1 @@ -8065,6 +8326,12 @@ }, /turf/simulated/floor/tiled/white, /area/class_m/inside/bathroom) +"SD" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 8 + }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "SE" = ( /obj/structure/flora/rock, /turf/simulated/floor/outdoors/beach/sand/desert/classm{ @@ -8297,14 +8564,6 @@ }, /turf/simulated/floor/concrete/tile/classm/outdoors, /area/class_m/outside) -"TS" = ( -/obj/structure/fence{ - dir = 4 - }, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/simulated/floor/outdoors/grass/classm, -/area/class_m/outside) "TT" = ( /obj/structure/railing{ dir = 4 @@ -8690,16 +8949,22 @@ }, /turf/simulated/floor/wood/classm, /area/class_m/inside/main) +"WD" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 9 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "WE" = ( /turf/simulated/floor/concrete/indoors, /area/class_m/inside/hotspringcaves) "WJ" = ( /obj/structure/flora/ausbushes/stalkybush, -/obj/structure/catwalk, /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "WN" = ( /turf/simulated/floor/concrete/rng/classm/outdoors, @@ -8736,9 +9001,14 @@ /area/class_m/outside) "WU" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 5 }, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) +"WZ" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Xa" = ( /obj/structure/fence/corner{ @@ -8751,6 +9021,10 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/classm, /area/class_m/outside) +"Xc" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) "Xd" = ( /obj/structure/fence/door, /turf/simulated/floor/concrete/tile/classm/outdoors, @@ -8760,9 +9034,11 @@ icon_state = "concrete17" }, /area/class_m/outside/beachmiddle) -"Xh" = ( -/obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/deep/classm, +"Xi" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 4 + }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "Xm" = ( /obj/machinery/light/flamp/noshade{ @@ -8793,7 +9069,7 @@ "Xs" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/stalkybush, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "Xt" = ( /turf/simulated/floor/water/beach{ @@ -8879,7 +9155,8 @@ /obj/machinery/light/flamp/noshade{ nightshift_allowed = 0 }, -/turf/simulated/floor/water/classm, +/obj/structure/catwalk, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "Yb" = ( /obj/structure/fence, @@ -8949,9 +9226,10 @@ /area/class_m/outside) "Yy" = ( /obj/structure/catwalk, -/turf/simulated/floor/water/beach{ +/obj/effect/floor_decal/river_beach_edge{ dir = 10 }, +/turf/simulated/floor/water/river/south/outdoors, /area/class_m/outside) "YE" = ( /obj/machinery/door/airlock/glass{ @@ -9016,6 +9294,10 @@ }, /turf/simulated/floor/concrete/rng/classm/outdoors, /area/class_m/outside) +"YS" = ( +/obj/effect/floor_decal/river_beach_corner_edge, +/turf/simulated/floor/water/river/south/outdoors, +/area/class_m/outside) "YT" = ( /obj/structure/table/marble, /turf/simulated/floor/wood/classm, @@ -9051,7 +9333,7 @@ /area/class_m/outside/island) "Zb" = ( /obj/structure/flora/ausbushes, -/turf/simulated/floor/water/classm, +/turf/simulated/floor/water/river/deep/south/outdoors, /area/class_m/outside) "Zc" = ( /obj/structure/window/reinforced/full, @@ -9176,6 +9458,12 @@ /mob/living/simple_mob/animal/passive/fish/koi, /turf/simulated/floor/water/deep/classm, /area/class_m/outside) +"ZX" = ( +/obj/effect/floor_decal/river_beach_edge{ + dir = 1 + }, +/turf/simulated/floor/water/river/west/outdoors, +/area/class_m/outside) (1,1,1) = {" If @@ -16875,7 +17163,7 @@ nB nB nB nB -Od +wR Ma ka Sa @@ -17066,11 +17354,11 @@ nB nB nB nB -Od +wR Ma Ma -ka -Sa +Fj +OR Sa Sa Sa @@ -17258,13 +17546,13 @@ Lp nB qY nB -Od +wR Ma -ka -Sa -Sa +Fj +OR +OR EU -Sa +OR Sa Bg Bg @@ -17451,14 +17739,14 @@ Lp Lp nB nB -Od -ka -Sa +wR +Fj +OR iS -Sa +OR Fs -Bg -Bg +OR +OR Bg Bg Bg @@ -17644,15 +17932,15 @@ Lp Lp Lp nB -Od -ka -Sa -Sa -Sa -Bg -Bg -Bg -LE +wR +Fj +OR +OR +OR +OR +OR +OR +Fs Bg Bg Bg @@ -17837,16 +18125,16 @@ Lp Lp QL Lp -Od -ka +wR +Fj iS -Sa -Bg -Bg -Bg -Bg -Bg -Bg +OR +OR +OR +OR +OR +FI +FI Bg Bg Bg @@ -18030,17 +18318,17 @@ Lp Lp Lp Lp -SQ -ka -Sa +YS +Fj +OR Fs -Bg -Bg -Bg +OR +OR +OR xp -Bg -Bg -Bg +FI +FI +FI Bg LE Bg @@ -18223,18 +18511,18 @@ Lp Lp oJ Lp -SQ -xT +YS +pB es -Sa -Bg -Bg -Bg -Bg -dO -dO -dO -dO +OR +OR +OR +FI +FI +BF +hr +hr +hr dO dO dO @@ -18417,18 +18705,18 @@ Lp Lp Lp Lp -Tl -hi -Sa -Bg -LE -Bg -dO -dO +dq +RX +OR +OR +aX +FI +BF +hr lq -dO +hr tJ -dO +hr dO dO dO @@ -18610,19 +18898,19 @@ Lp Lp Lp Lp -SQ -xT -VF -Bg -Bg -dO -dO +YS +pB +LT +OR +FI +BF +hr ym Je -dO -gG -gG -gG +hr +hr +hr +hr gG gG gG @@ -18803,20 +19091,20 @@ Lp Lp oJ Lp -SQ -xT -dD -Xw -Bg -dO -dO -dO -dO -dO -gG -gG +YS +pB +tm +LT +FI +BF +hr +hr +hr +hr +hr +hr Se -Hs +Dy Hs Hs Pi @@ -18996,19 +19284,19 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -dO -dO -dO -dO -gG -gG +YS +pB +LT +LT +PP +BF +hr +hr +hr +hr +hr Se -Hs +Dy iO jC jC @@ -19076,14 +19364,14 @@ gp Lp sk Lp -SQ -Sp -Sp -Sp -Sp -Sp -Sp -vZ +YS +Xi +Xi +Xi +Xi +Xi +Xi +PM Lp QL Lp @@ -19151,17 +19439,17 @@ Lp Lp Lp Lp -SQ -Sp -Sp -Sp -Sp -Sp -Sp +YS +Xi +Xi +Xi +Xi +Xi +Xi il -sY -sY -sY +Sy +Sy +Sy Ew fZ hQ @@ -19188,20 +19476,20 @@ Lp Gq QL Lp -SQ -Sp -xT -VF -Xw -Xw -Xw -dO -dO +YS +Xi +pB +LT +LT +PP +PP +hr +hr lq -gG +hr Se -Hs -iO +Dy +pa jC jC jC @@ -19267,19 +19555,19 @@ Bg "} (53,1,1) = {" gp -SQ -Sp -Sp -xT -LO -VF -VF -VF -VF -VF -Xt -Sp -vZ +YS +Xi +Xi +pB +NL +PP +PP +PP +PP +PP +hM +Xi +PM Lp cx rj @@ -19343,19 +19631,19 @@ Lp oJ QL Lp -SQ -Sp -xT -VF -VF -VF -dD -VF -VF +YS +Xi +pB +LT +LT +LT +tm +LT +LT WJ -ge +fM AE -ge +fM jI tE hQ @@ -19381,17 +19669,17 @@ Lp Lp Lp Lp -SQ -xT -VF -Ve -Xw -Xw -Xw +YS +pB +LT +WZ +LT +PP +PP tm -dO -dO -gG +hr +hr +hr Se iO jC @@ -19462,18 +19750,18 @@ Bg (54,1,1) = {" DA qi -LO -VF -Ve -VF -VF -VF +NL +PP +MI +PP +PP +PP pg -VF -VF -VF -Ve -Xt +PP +PP +PP +MI +hM ig Gk KE @@ -19536,28 +19824,28 @@ Lp Lp Lp Lp -SQ -xT -VF -dD -VF -VF -hi -VF -Xw -Xw +YS +pB +LT +tm +LT +LT +RX +LT +LT +LT zU -ui -ui +fM +fM Rh -jY -VF +Mb +LT hQ XG gj -Sp -Sp -vZ +Xi +Xi +PM Lp Lp Lp @@ -19572,19 +19860,19 @@ Lp Lp Lp Lp -SQ -Sp -Sp -xT -fU -VF -Xw -Xw -Xw -Xw -Xw -gG -gG +YS +Xi +Xi +pB +uZ +LT +LT +PP +PP +LT +LT +hr +hr Se iO jC @@ -19656,20 +19944,20 @@ Bg (55,1,1) = {" aU Xs -VF -VF -VF -VF -VF -VF -Ve -VF -VF -VF -VF +PP +PP +PP +PP +PP +PP +MI +PP +PP +PP +PP XZ -Me -ge +Bk +ui WU sY KE @@ -19729,55 +20017,55 @@ Lp Lp Lp Lp -SQ -xT -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -zU -ui +YS +pB +LT +LT +LT +LT +LT +PP +PP +PP +PP +JZ ui -ui -vU -VF +fM +fM +Mb +LT hQ XG gj -VF -VF -Xt -Sp -Sp -Sp -vZ +LT +LT +hM +Xi +Xi +Xi +PM Lp Lp Lp Lp Gq Lp -SQ -Sp -Sp -Sp -xT -VF -VF -dD -Xh -Xw +YS +Xi +Xi +Xi +pB +LT +LT tm -Xw -Xw -Xw -VF -gG +WZ +PP +Np +PP +LT +LT +LT +hr Se iO jC @@ -19850,22 +20138,22 @@ Bg (56,1,1) = {" kp Zb -VF -fU -VF -hi -VF -VF -VF -VF -VF -VF +PP +yn +PP +iT +PP +PP +PP +PP +PP +PP kh -Me -ge -ge -HN -ge +Bk +ui +ui +vU +ui WU sY KE @@ -19921,56 +20209,56 @@ Lp Lp Lp Lp -SQ -Sp -xT -dD -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -zU +YS +Xi +pB +tm +LT +LT +PP +PP +PP +PP +PP +PP +PP +JZ ui ui ui -vU -Xw +Mb +LT hQ XG gj -VF -VF -VF -dD -VF -VF -Xt -Sp -Sp -Sp -Sp -Sp -Sp -xT -dD -VF -VF -VF -hi -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -hi +LT +LT +LT +tm +LT +LT +hM +Xi +Xi +Xi +Xi +Xi +Xi +pB +tm +LT +LT +LT +RX +LT +LT +PP +PP +PP +LT +LT +LT +RX Se iO jC @@ -20043,25 +20331,25 @@ Bg "} (57,1,1) = {" aU -hi -Ve -VF +iT +MI +PP Zb -Jp -Xp -Xp -Xp -Xp -Xp +EA +SD +SD +SD +SD +SD ip Ez -ge -ge -ge -ge -ge -ge -ge +ui +ui +ui +ui +ui +ui +fM oG nv Sp @@ -20114,57 +20402,57 @@ Lp Lp oJ Lp -SQ -xT -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw +YS +pB +LT +LT +LT +PP +PP +PP +PP +LT +LT +LT +LT AY zU +fM +fM ui -ui -ui -vU +jY EW hQ XG gj -jE -Xw -VF -VF -VF -dD -VF -hi -VF -VF -VF -Ve -VF -VF -VF -Xw -Xh -Xw -Xw -Xw -Xw -Xw -Xw -Xw -dD -VF -Ve -Jp +Ay +LT +LT +LT +LT +tm +LT +RX +LT +LT +LT +WZ +LT +LT +LT +LT +WZ +LT +LT +LT +PP +PP +LT +LT +tm +LT +WZ +EA iO jC jC @@ -20238,10 +20526,10 @@ Bg (58,1,1) = {" IF QX -Xp -Xp -Xp -vk +SD +SD +SD +dy Lp SE Lp @@ -20249,15 +20537,15 @@ Gq cx qw Yy -Rh -ge -ge -ge -ge -ge -ml +DG +ui +ui +ui +ui +ui +iH wo -VF +Xw hi Xt Sp @@ -20306,59 +20594,59 @@ Lp Lp Lp Lp -SQ -Sp -xT -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -dD -MX -ge -ui -ui -vU -Xw +YS +Xi +pB +LT +LT +LT +PP +PP +PP +LT +LT +LT +LT +LT +LT +tm +zU +fM +fM +fM +jY +PP hQ XG gj -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Ve -VF -VF +PP +PP +PP +PP +LT +LT +LT +LT +WZ +LT +LT tm -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw +LT +LT +LT +PP +PP +PP +PP +PP +PP tm -VF -VF -Jp -Xp -Xp -vk +LT +LT +EA +SD +SD +dy jC jC jC @@ -20431,7 +20719,7 @@ Bg "} (59,1,1) = {" eJ -vk +dy Lp SE Lp @@ -20443,16 +20731,16 @@ cx Cv Vz yv -le +pz Yy -ge -ge -ge +ui +ui +ui wl wo -VF -VF -VF +Xw +Xw +Xw Ve VF Xt @@ -20499,57 +20787,57 @@ tF Lp Lp Lp -SQ -xT -VF -dD -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Ve -VF -VF -Jp -Xp +YS +pB +LT +tm +LT +LT +PP +PP +LT +LT +LT +LT +WZ +LT +LT +EA +SD cI HN -ge -ge +fM +fM ia -Xw +LT hQ XG gj -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw +LT +LT +LT +PP +PP +PP +PP +LT +LT +LT +LT +LT +PP +PP +PP +PP +PP tm -Xw -Ve -hi -VF -Jp -Xp -vk +LT +WZ +RX +LT +EA +SD +dy Lp Lp Lp @@ -20640,14 +20928,14 @@ Vz Vz yv Yy -ge +ui ml CU -VF -VF -VF -VF -VF +Xw +Xw +Xw +Xw +Xw VF VF Xt @@ -20693,55 +20981,55 @@ Lp Lp Lp Lp -Tl -hi -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -dD -VF -Jp -Xp -Xp -vk +dq +RX +LT +LT +LT +PP +PP +LT +LT +LT +tm +LT +EA +SD +SD +dy Lp zE le le -Yy -jY -VF +jS +Mb +LT hQ XG gj -Xw -Xw -Xw -Xw -Xw -Xw +LT +LT +LT +LT +LT +LT +Np +PP +PP +PP +PP +PP +PP +LT +LT +LT +LT +LT tm -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -dD -Jp -Xp -Xp -vk +EA +SD +SD +dy Lp Lp Lp @@ -20835,13 +21123,13 @@ Vz Vz yv Ql -wo -VF -VF -VF -VF -VF -VF +Ll +PP +Xw +Xw +Xw +Xw +Xw VF hi VF @@ -20886,20 +21174,20 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -Ve -Jp -Xp -vk +Br +PV +LT +LT +LT +PP +PP +PP +LT +LT +WZ +EA +SD +dy Lp Lp Lp @@ -20907,32 +21195,32 @@ Lp nn Vz Vz -yv +cP Kz -Xp +SD hQ XG gj -VF -dD -hi -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -Ve -Jp -Xp -vk +LT +tm +RX +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +WZ +EA +SD +dy Lp Lp Lp @@ -21029,14 +21317,14 @@ DE Vz FQ Cj -RE -VF -VF -VF -Ve +LT +PP +Xw +Xw +tl +Xw +Xw Xw -VF -VF VF VF Xt @@ -21079,19 +21367,19 @@ tF Gq Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -Jp -Xp -vk +Br +PV +uQ +uQ +LT +PP +PP +PP +LT +LT +EA +SD +dy Lp Lp Lp @@ -21107,24 +21395,24 @@ Lp hQ XG gj -RE -Ve -VF -VF -VF -VF -Xw -Xh -Xw -VF -Ve -hi -VF -Jp -Xp -Xp -Xp -vk +LT +WZ +LT +LT +LT +LT +LT +WZ +LT +LT +WZ +RX +LT +EA +SD +SD +SD +dy Lp Gq Lp @@ -21224,10 +21512,10 @@ aF Yo SE Tl -hi -fU -VF -VF +iT +Js +Xw +Xw Xw fG Xw @@ -21273,17 +21561,17 @@ Lp Lp Lp Lp -Tl -Ve -VF -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +oM +yd +uQ +uQ +Ku +PP +PP +LT +LT +EA +dy Lp Lp Lp @@ -21302,19 +21590,19 @@ hQ XG gj tx -Xp -Xp -RE -dD -VF -VF -VF -VF -dD -Jp -Xp -Xp -vk +SD +SD +Jg +tm +LT +LT +LT +LT +tm +EA +SD +SD +dy Lp Lp Lp @@ -21419,8 +21707,8 @@ Gq Lp pJ RE -VF -VF +Xw +Xw Xw Xw Xw @@ -21466,17 +21754,17 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -dD -Jp -vk +Br +PV +uQ +uQ +Ku +Ku +Ku +LT +tm +EA +dy Lp Lp Lp @@ -21498,14 +21786,14 @@ OD Lp Lp Lp -pJ -Xp -Xp -Xp -Xp -Xp -Xp -vk +JU +SD +SD +SD +SD +SD +SD +dy Lp Lp QL @@ -21613,8 +21901,8 @@ Lp Lp Lp Tl -VF -VF +Xw +Xw Xw Xw Xw @@ -21660,16 +21948,16 @@ Lp Lp oJ Lp -Tl -dD -VF -Xw -Xw -Xw -VF -VF -Jp -vk +oM +Xc +uQ +Ku +Ku +Ku +uQ +uQ +EA +dy Gq Lp Lp @@ -21807,7 +22095,7 @@ Lp Gq Lp Tl -VF +Xw fP Xw Xw @@ -21853,16 +22141,16 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -hi -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +kl +ZX Lp Lp Lp @@ -22002,7 +22290,7 @@ Lp Lp Tl fU -VF +Xw Xw Xw Xw @@ -22046,17 +22334,17 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -22196,7 +22484,7 @@ Lp QL Tl VF -VF +Xw Xw Xw Xw @@ -22239,17 +22527,17 @@ tF Lp Lp Lp -SQ -xT -VF -hi -Xw -Xw -Xw -VF -VF +Br +PV +uQ +kl +Ku +Ku +Ku +uQ +uQ CZ -vk +MJ Lp Lp Lp @@ -22390,7 +22678,7 @@ Lp Lp Tl VF -VF +Xw Xw Xw Xw @@ -22433,16 +22721,16 @@ Lp Lp Lp Lp -Tl -VF -VF -Xw -Xw -Xw -VF -VF -Jp -vk +oM +uQ +uQ +Ku +Ku +Ku +uQ +uQ +WD +MJ Lp Lp Lp @@ -22627,15 +22915,15 @@ Lp Lp Lp Lp -Tl -VF -Xw -Xw -Xw -Xw -VF -Jp -vk +oM +uQ +uQ +Ku +Ku +uQ +uQ +WD +MJ Lp Lp QL @@ -22820,15 +23108,15 @@ Lp Lp Lp Lp -SQ -xT -Ve -Xw -Xw -Xw -VF +Br +PV +yd +Ku +Ku +uQ +uQ CZ -vk +MJ Lp Lp Lp @@ -23013,15 +23301,15 @@ lS Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -dD -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +Xc +ZX Lp Lp Lp @@ -23207,15 +23495,15 @@ Lp Lp Gq Lp -Tl -VF -VF -Xw -Xw -Xw -Xw -Jp -vk +oM +uQ +uQ +Ku +Ku +uQ +uQ +WD +MJ Gq Lp Lp @@ -23401,14 +23689,14 @@ Lp Lp Lp Lp -Tl -VF -Xw -Xw -Xw -Xw -VF -hs +oM +uQ +uQ +Ku +Ku +uQ +uQ +ZX Lp Lp Lp @@ -23594,15 +23882,15 @@ Lp Lp Lp Lp -SQ -xT -hi -Xw -Xw -Xw -Xw -Jp -vk +Br +PV +kl +Ku +Ku +Ku +uQ +WD +MJ Lp Lp Lp @@ -23787,15 +24075,15 @@ Lp Lp Lp QL -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +ZX Lp Lp Lp @@ -23981,15 +24269,15 @@ Lp Lp Lp Lp -Tl -dD -VF -Xw -Xw -Xw -VF -Jp -vk +oM +Xc +uQ +Ku +Ku +uQ +uQ +WD +MJ Lp Lp Lp @@ -24174,15 +24462,15 @@ Lp Gq Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -dD -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +Xc +ZX Lp Lp Lp @@ -24368,15 +24656,15 @@ Lp Lp Lp Lp -Tl -VF -Ve -Xw -Xw -Xw -Xw -Ve -hs +oM +uQ +yd +Ku +Ku +Ku +uQ +yd +ZX Lp Lp Lp @@ -24561,16 +24849,16 @@ Lp Lp Lp Lp -SQ -xT -VF -Xw -Xw -Xw -Xw -VF -VF -hs +Br +PV +uQ +uQ +Ku +Ku +uQ +uQ +uQ +ZX Lp Lp Gq @@ -24754,17 +25042,17 @@ Lp Lp Lp Lp -SQ -xT -VF -VF -Xw -Xw -Xw -Xh -VF -Jp -vk +Br +PV +uQ +uQ +Ku +Ku +Ku +yd +uQ +WD +MJ Lp Lp Lp @@ -24948,16 +25236,16 @@ Lp Lp Lp Lp -Tl -VF -VF -Xw -Xw -Xw -Xw -VF -VF -hs +oM +uQ +uQ +uQ +Ku +Ku +uQ +uQ +uQ +ZX Lp Lp Lp @@ -25141,17 +25429,17 @@ Lp Lp Gq Lp -SQ -xT -hi -VF -Xw -Xw -Xw -Xw -VF -Jp -vk +Br +PV +kl +uQ +Ku +Ku +Ku +uQ +uQ +WD +MJ Lp Lp Lp @@ -25334,17 +25622,17 @@ Wb Wb Lp Lp -SQ -xT -dD -VF -Xw -Xw -Xw -Xw -VF -hi -hs +Br +PV +Xc +uQ +uQ +Ku +Ku +uQ +uQ +kl +ZX Lp Lp QL @@ -25528,17 +25816,17 @@ WN WN eq qp -Tl -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -dD -hs +oM +uQ +uQ +uQ +Ku +Ku +Ku +uQ +uQ +Xc +ZX Lp Lp Lp @@ -25722,17 +26010,17 @@ WN WN WN eq -xT -VF -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +PV +uQ +uQ +uQ +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -25917,15 +26205,15 @@ WN WN WN eq -VF -Xw -Xw -Xw -Xw -Xw -Ve -VF -hs +uQ +uQ +Ku +Ku +Ku +uQ +yd +uQ +ZX Lp Gq Lp @@ -26112,14 +26400,14 @@ WN WN WN eq -Xw -Xw -Xw -Xw -Xw -VF -VF -hs +Ku +Ku +Ku +uQ +uQ +uQ +uQ +ZX Lp Lp Lp @@ -26307,13 +26595,13 @@ WN WN WN eq -Xw -Xw -Xw -VF -VF -Jp -vk +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -26502,11 +26790,11 @@ WN WN WN eq -Xw -Xw -VF -VF -hs +uQ +uQ +uQ +uQ +ZX Lp Lp Lp @@ -26688,8 +26976,8 @@ Lp Lp Lp Lp -SQ -xT +Br +PV Re WN WN @@ -26697,10 +26985,10 @@ WN WN WN eq -VF -hi -Jp -vk +uQ +kl +WD +MJ Lp Lp Lp @@ -26881,10 +27169,10 @@ Lp Lp Gq Lp -SQ -xT -Ve -VF +Br +PV +yd +uQ Re WN WN @@ -26892,8 +27180,8 @@ WN WN WN eq -VF -hs +uQ +ZX Lp Lp Lp @@ -27074,12 +27362,12 @@ Lp Lp Lp Lp -SQ -xT -dD -VF -VF -Xw +Br +PV +Xc +uQ +uQ +uQ Re WN WN @@ -27268,13 +27556,13 @@ Lp Lp Lp Lp -Tl -VF -VF -VF -Xw -Xw -Xw +oM +uQ +uQ +uQ +uQ +uQ +Ku Re WN WN @@ -27461,15 +27749,15 @@ Lp Lp Lp Lp -SQ -xT -dD -VF -Xw -Xw -Xw -Xw -Xw +Br +PV +Xc +uQ +uQ +uQ +Ku +Ku +Ku Re WN WN @@ -27653,18 +27941,18 @@ Lp Gq Lp Lp -SQ -Sp -xT -VF -hi -Xw -Xw -Xw -Xw -Xw -VF -dD +Br +Qo +PV +uQ +kl +uQ +uQ +Ku +Ku +Ku +Ku +Xc Re WN WN @@ -27846,20 +28134,20 @@ Lp Lp Lp Lp -SQ -xT -dD -hi -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -VF -VF +Br +PV +Xc +kl +uQ +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +uQ Re WN WN @@ -28040,20 +28328,20 @@ Lp Lp Lp Lp -Tl -VF -VF -Ve -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp +oM +uQ +uQ +yd +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +uQ +WD Cw Re WN @@ -28234,20 +28522,20 @@ Lp Lp Lp Lp -Tl -Ve -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -hi -Jp -vk +oM +yd +uQ +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +kl +WD +MJ sk Lp Wb @@ -28427,20 +28715,20 @@ Lp Lp Lp Lp -SQ -xT -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +Br +PV +uQ +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -28620,20 +28908,20 @@ Lp Lp Lp Gq -SQ -xT -hi -VF -VF -Xw -Xw -Xw -Xw -Xw -VF -Ve -Jp -vk +YS +PV +kl +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +yd +WD +MJ Lp Lp Lp @@ -28812,21 +29100,21 @@ Lp Lp Lp Lp -SQ -Sp -xT -dD -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -dD -VF -hs +YS +Xi +pB +tm +uQ +uQ +Ku +Ku +Ku +Ku +uQ +uQ +Xc +uQ +ZX Lp Lp Lp @@ -28999,28 +29287,28 @@ Xw Xw Xw VF -VF -Xt -Sp -Sp -Sp -Sp -Sp -xT -dD -VF -hi -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +LT +hM +Xi +Xi +Xi +Xi +Xi +pB +tm +LT +RX +LT +Ku +Ku +Ku +Ku +uQ +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -29193,27 +29481,27 @@ Xw Xw Xw Xw -VF -Ve -VF -VF -VF -hi -dD -Ve -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +LT +WZ +LT +LT +LT +RX +tm +WZ +LT +PP +PP +PP +PP +Ku +Ku +uQ +uQ +uQ +uQ +WD +MJ Lp Lp Lp @@ -29387,26 +29675,26 @@ VF Xw Xw Xw -Xw -Xw -VF -fU -VF -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -Ve -Jp -vk +PP +LT +LT +uZ +LT +LT +LT +LT +PP +PP +PP +PP +PP +PP +Ku +uQ +uQ +yd +WD +MJ Lp Lp Lp @@ -29580,26 +29868,26 @@ dD VF VF Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -dD -VF -Jp -vk +PP +PP +PP +LT +LT +LT +LT +PP +PP +PP +PP +PP +PP +PP +PP +LT +Xc +uQ +WD +MJ Lp Gq Lp @@ -29772,27 +30060,27 @@ Lp pJ RE LO -VF -BK -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -Jp -vk +LT +ve +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +LT +LT +LT +LT +LT +WD +MJ Lp Lp Lp @@ -29964,28 +30252,28 @@ Lp Gq Lp Lp -Tl -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -Ve -VF -Jp -vk +dq +LT +LT +LT +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +PP +LT +LT +LT +WZ +LT +EA +dy Lp Lp Lp @@ -30158,27 +30446,27 @@ Lp Lp Lp Lp -pJ -RE -VF -fU -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -Xw -VF -VF -VF -VF -Jp -vk +JU +Jg +LT +uZ +LT +PP +PP +PP +PP +PP +PP +LT +LT +LT +LT +LT +LT +LT +LT +EA +dy Lp Lp Lp @@ -30353,25 +30641,25 @@ Lp Lp Lp Lp -pJ -RE -VF -VF -VF -VF -VF -Xw -Xw -Xw -Xw -Xw -Xw -VF -dD -hi -Jp -Xp -vk +JU +Jg +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +LT +tm +RX +EA +SD +dy Lp Lp Lp @@ -30548,22 +30836,22 @@ Lp Lp Lp Gq -pJ -Xp -RE -hi -VF -dD -VF -VF -VF -VF -VF -Ve -VF -Jp -Xp -vk +JU +SD +Jg +RX +LT +tm +LT +LT +LT +LT +LT +WZ +LT +EA +SD +dy Lp Lp Lp @@ -30744,18 +31032,18 @@ Lp Lp Lp Lp -pJ -Xp -RE -VF -VF -fU -VF -Ve -hi -Jp -Xp -vk +JU +SD +Jg +LT +LT +uZ +LT +WZ +RX +EA +SD +dy Lp Gq Lp @@ -30940,14 +31228,14 @@ Lp Lp QL Lp -pJ -Xp -Xp -Xp -Xp -Xp -Xp -vk +JU +SD +SD +SD +SD +SD +SD +dy Lp Lp QL @@ -44414,16 +44702,16 @@ WN WN Wb tF -rO -ra +ab tF -lS tF +lS +ra ra tF -GA -BE +Sx tF +Lp os Lp Wb @@ -44609,15 +44897,15 @@ WN Wb tF ab +Da tF -ra -BE tF tF tF -ON tF -ra +HA +tF +Lp gp Lp Wb @@ -44802,16 +45090,16 @@ WN WN Wb ra -wa -lj +ab tF tF -ra -UT tF +zI +lS tF tF tF +Lp gp Lp Wb @@ -44996,15 +45284,15 @@ WN WN Wb tF -TS -tF +ab +ON ra tF tF -GA -ra lS ra +tF +zI Lp gp Lp @@ -45191,13 +45479,13 @@ WN Wb lS ab -ra tF -ON tF ra tF -BE +tF +tF +tF tF Lp gp @@ -45384,15 +45672,15 @@ Wb Wb Wb tF -rO +ab +tF +tF +tF tF -UT tF tF -BE tF tF -GA Lp gp Lp diff --git a/maps/sectors/lavaland_140/levels/lavaland_140.dmm b/maps/sectors/lavaland_140/levels/lavaland_140.dmm index ef52bb9e46..c1e0099d15 100644 --- a/maps/sectors/lavaland_140/levels/lavaland_140.dmm +++ b/maps/sectors/lavaland_140/levels/lavaland_140.dmm @@ -56,6 +56,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/lavaland/central/base/common) +"bT" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "ch" = ( /obj/machinery/light/small{ dir = 1 @@ -69,6 +75,10 @@ /obj/structure/catwalk, /turf/simulated/floor/outdoors/lava/lavaland, /area/lavaland/central/explored) +"cl" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "cF" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -297,8 +307,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -402,8 +411,7 @@ pixel_y = -23; req_one_access = list(48) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/structure/ore_box, @@ -415,11 +423,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "km" = ( @@ -517,8 +521,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -565,9 +568,7 @@ /area/lavaland/central/base/common) "nr" = ( /obj/effect/debris/cleanable/dirt, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "nx" = ( @@ -666,8 +667,7 @@ "oM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -800,9 +800,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "qw" = ( @@ -843,8 +841,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -905,11 +902,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_tile, /area/lavaland/central/base/common) "rR" = ( @@ -932,6 +925,12 @@ }, /turf/simulated/floor/outdoors/lava/lavaland, /area/lavaland/central/explored) +"sc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "so" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -951,8 +950,7 @@ /area/lavaland/central/explored) "sN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1066,10 +1064,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -1083,6 +1078,18 @@ }, /turf/simulated/floor/carpet/blucarpet, /area/lavaland/central/base/common) +"vS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "vW" = ( /obj/structure/table/standard, /obj/machinery/light/small, @@ -1555,10 +1562,6 @@ /turf/simulated/floor/outdoors/lavaland, /area/lavaland/central/unexplored) "FF" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Dorms"; @@ -1570,6 +1573,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "FI" = ( @@ -1654,15 +1660,14 @@ /turf/simulated/floor/carpet/bcarpet, /area/lavaland/central/base/common) "GT" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Lounge"; req_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "Hi" = ( @@ -1968,13 +1973,11 @@ /turf/simulated/floor/wood, /area/lavaland/central/base/common) "NN" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ name = "Lounge"; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "NV" = ( @@ -2056,13 +2059,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/lavaland/central/base/common) "Pk" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ name = "Logistics"; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Pr" = ( @@ -2239,10 +2240,8 @@ /turf/simulated/floor/plating, /area/lavaland/central/base/common) "SN" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/infinite; - name = "south bump"; - pixel_y = -28 +/obj/machinery/power/apc/south_mount{ + cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/tiled/dark/lavaland, /area/lavaland/central/transit) @@ -8090,7 +8089,7 @@ XQ HB HB HB -HB +cl AJ Bs ew @@ -8370,7 +8369,7 @@ vA AO AO AO -wN +vS GT db db @@ -8946,7 +8945,7 @@ Zw AA Wh AO -ew +bT FF AO AO @@ -9366,7 +9365,7 @@ EX db Jl nE -nE +sc nE pn nE diff --git a/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm b/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm index 78a06e4759..054b70e97a 100644 --- a/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm +++ b/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm @@ -36,11 +36,8 @@ /turf/simulated/floor/tiled/lavaland, /area/lavaland/east/ashlander_village) "az" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/infinite; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/tiled/dark/lavaland, /area/lavaland/east/transit) @@ -345,7 +342,6 @@ "gK" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = -32 }, /turf/simulated/floor/tiled/lavaland, @@ -2529,13 +2525,10 @@ /turf/simulated/floor/tiled/steel_dirty/lavaland/exterior, /area/lavaland/east/ashlander_village) "YY" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/high/empty; chargelevel = 0; chargemode = 0; - dir = 8; - name = "west bump"; - pixel_x = -28; start_charge = 0 }, /obj/structure/table/standard, diff --git a/maps/sectors/lavaland_192/levels/lavaland_192.dmm b/maps/sectors/lavaland_192/levels/lavaland_192.dmm index e7f66587be..60b6fa2672 100644 --- a/maps/sectors/lavaland_192/levels/lavaland_192.dmm +++ b/maps/sectors/lavaland_192/levels/lavaland_192.dmm @@ -65,10 +65,6 @@ /turf/simulated/floor/plating, /area/lavaland/central/base/common) "do" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Dorms"; @@ -81,6 +77,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "dX" = ( @@ -233,6 +232,12 @@ }, /turf/simulated/floor/plating, /area/lavaland/central/base/common) +"hh" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "hi" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/phoron/engine_setup, @@ -508,8 +513,11 @@ /turf/simulated/floor/plating, /area/lavaland/central/base/common) "lT" = ( -/turf/simulated/mineral/triumph/lavaland, -/area/lavaland/central/explored) +/obj/structure/table/steel, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "lX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/airlock_sensor{ @@ -554,6 +562,7 @@ /area/lavaland/central/base/common) "mq" = ( /obj/structure/table/steel, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "mr" = ( @@ -568,8 +577,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -765,11 +773,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -923,11 +927,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_tile, /area/lavaland/central/base/common) "so" = ( @@ -937,7 +937,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/high/south_bump, +/obj/machinery/power/apc/high/south_mount, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "sx" = ( @@ -1039,6 +1039,18 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"sW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "sX" = ( /obj/machinery/sleep_console, /turf/simulated/floor/tiled, @@ -1173,8 +1185,7 @@ "vz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1191,8 +1202,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -1239,8 +1249,7 @@ /area/lavaland/central/base/common) "wE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1321,8 +1330,7 @@ pixel_y = -23; req_one_access = list(48) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/structure/ore_box, @@ -1376,9 +1384,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "zl" = ( @@ -1455,16 +1461,15 @@ /turf/simulated/floor/wood, /area/lavaland/central/base/common) "As" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Lounge"; req_access = null; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "Ay" = ( @@ -1541,9 +1546,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/lavaland/central/base/common) -"DG" = ( -/turf/simulated/floor/outdoors/lava/lavaland, -/area/lavaland/central/explored) "DW" = ( /obj/structure/sign/warning/lava, /turf/simulated/wall/r_wall, @@ -1642,9 +1644,7 @@ /area/lavaland/central/base/common) "GT" = ( /obj/effect/debris/cleanable/dirt, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Hr" = ( @@ -1723,13 +1723,11 @@ /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "IR" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(48) - }, /obj/machinery/door/airlock/multi_tile/glass{ name = "Lounge"; req_one_access = list(1,5,31,38,47,48) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/wood, /area/lavaland/central/base/common) "IV" = ( @@ -1852,9 +1850,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/lavaland/central/base/common) -"MX" = ( -/turf/simulated/mineral/triumph/lavaland, -/area/lavaland/central/explored) "ND" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2083,6 +2078,10 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"Su" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/wood, +/area/lavaland/central/base/common) "SH" = ( /obj/machinery/light/small{ dir = 8 @@ -2262,6 +2261,7 @@ dir = 4 }, /obj/structure/table/steel, +/obj/machinery/cell_charger, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "VX" = ( @@ -2454,8 +2454,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2770,285 +2769,280 @@ Md "} (2,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV gy Md "} (3,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -3148,18 +3142,23 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +tV Md "} (4,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3206,27 +3205,27 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -3342,18 +3341,18 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV Md "} (5,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3400,17 +3399,17 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -3538,16 +3537,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (6,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3732,16 +3731,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (7,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3785,13 +3784,13 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -3926,16 +3925,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (8,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -3974,18 +3973,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -4120,16 +4119,16 @@ xd xd RL RL -DG -MX -DG -DG +tV +ZK +tV +tV Md "} (9,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4168,14 +4167,14 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK RL RL RL @@ -4314,16 +4313,16 @@ xd xd RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (10,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4359,29 +4358,29 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK RX -MX +ZK RL RL RL -MX -MX +ZK +ZK xd xd xd @@ -4402,12 +4401,12 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL RL xd @@ -4508,16 +4507,16 @@ xd xd RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (11,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4551,31 +4550,31 @@ RX RX RX RX -MX -MX -MX -MX -DG -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK xd xd xd @@ -4596,12 +4595,12 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL RL xd @@ -4702,17 +4701,17 @@ xd xd RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (12,1,1) = {" Md -MX -MX -RX +ZK +ZK +RX RX RX RX @@ -4745,31 +4744,31 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK xd xd xd @@ -4790,12 +4789,12 @@ RL RL RL RL -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +ZK +ZK +ZK RL RL xd @@ -4855,31 +4854,31 @@ RX RX RX RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL @@ -4896,16 +4895,16 @@ RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (13,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -4937,33 +4936,33 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK RL RL RL @@ -4984,12 +4983,12 @@ RL RL RL RL -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +ZK +ZK +ZK RL RL xd @@ -5048,35 +5047,35 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL @@ -5090,16 +5089,16 @@ RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (14,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5128,44 +5127,44 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX xd xd @@ -5178,12 +5177,12 @@ RL RL RL RL -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +ZK +ZK +ZK RL RL xd @@ -5242,35 +5241,35 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL @@ -5284,16 +5283,16 @@ RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (15,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5322,42 +5321,42 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV RL RL RL @@ -5372,14 +5371,14 @@ RL RL RL RL -DG -MX -DG -MX -MX -DG -MX -MX +tV +ZK +tV +ZK +ZK +tV +ZK +ZK RX RX RX @@ -5436,58 +5435,58 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL -RL -MX -MX -MX -MX -RL -RL -RL -RL -DG -DG -DG -DG -Md -"} -(16,1,1) = {" -Md -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RL +RL +ZK +ZK +ZK +ZK +RL +RL +RL +RL +tV +tV +tV +tV +Md +"} +(16,1,1) = {" +Md +ZK +ZK RX RX RX @@ -5516,18 +5515,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -5536,25 +5535,25 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -5562,18 +5561,18 @@ RX RX RX RX -MX -DG -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX +ZK +tV +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK RX RX RX @@ -5630,58 +5629,58 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RL RL -MX -MX -MX +ZK +ZK +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (17,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5708,16 +5707,16 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -5730,26 +5729,26 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL -MX +ZK RL -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK RX xd xd @@ -5757,16 +5756,16 @@ xd xd xd RL -DG -MX -MX -DG -DG -DG -MX -DG -DG -MX +tV +ZK +ZK +tV +tV +tV +ZK +tV +tV +ZK RL xd xd @@ -5824,58 +5823,58 @@ RX RX xd RX -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RL -MX -MX +ZK +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (18,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -5902,14 +5901,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX xd xd @@ -5924,26 +5923,26 @@ xd xd xd RX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX xd xd @@ -5951,16 +5950,16 @@ xd xd xd RL -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK RL xd xd @@ -6018,58 +6017,58 @@ RX RX xd RX -MX -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -MX -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RL RL RL -DG -DG -DG -DG +RL +tV +tV +tV +tV Md "} (19,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6096,14 +6095,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX xd xd @@ -6117,27 +6116,27 @@ xd xd xd RL -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RL RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX xd xd @@ -6145,16 +6144,16 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RL xd xd @@ -6212,58 +6211,58 @@ RX RX xd RX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (20,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6288,15 +6287,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX xd @@ -6311,13 +6310,13 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK xd RX RX @@ -6325,30 +6324,30 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK xd xd xd xd xd RL -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -6406,58 +6405,58 @@ RX RX xd RX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (21,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6482,15 +6481,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX xd @@ -6505,12 +6504,12 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK xd RX RX @@ -6520,29 +6519,29 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK xd xd xd xd xd RL -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -6600,22 +6599,22 @@ RX RX xd RX -MX -DG -DG -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -6625,33 +6624,33 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV RL RL RL RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (22,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6675,15 +6674,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -6699,11 +6698,11 @@ xd xd xd RL -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV RL RX RX @@ -6716,27 +6715,27 @@ RX RX RX RX -MX -DG -DG +ZK +tV +tV RL -MX +ZK xd xd xd xd xd RL -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -6794,58 +6793,58 @@ RX RX xd RX -MX -MX -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy gy -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV Md "} (23,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -6869,15 +6868,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -6893,44 +6892,44 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX -MX -DG -DG -DG -MX +ZK +tV +tV +tV +ZK xd xd xd xd xd RL -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RL xd xd @@ -6988,58 +6987,58 @@ RX RX xd RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV Md "} (24,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7063,13 +7062,13 @@ RX RX xd RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -7087,44 +7086,44 @@ xd xd xd RL -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX -MX +ZK RL -DG -DG -MX +tV +tV +ZK xd xd xd xd xd RL -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RL RX RX @@ -7182,58 +7181,58 @@ RX RX xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV Md "} (25,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7256,14 +7255,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -7281,35 +7280,35 @@ RL RL RL RL -MX -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX RX RL -MX -DG -DG -MX -xd -xd -xd +ZK +tV +tV +ZK +xd +xd +xd xd xd RL -MX +ZK gy gy wX @@ -7317,8 +7316,8 @@ wX wX wX wX -MX -MX +ZK +ZK RL RX RX @@ -7376,58 +7375,58 @@ RX RX xd RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV Md "} (26,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7450,14 +7449,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -7475,9 +7474,9 @@ RL RL RL RL -MX -DG -DG +ZK +tV +tV gy gy gy @@ -7487,23 +7486,23 @@ gy gy gy gy -MX -MX +ZK +ZK RX xd RX -MX -MX -DG -DG -MX +ZK +ZK +tV +tV +ZK RL xd xd xd xd RL -MX +ZK gy gy wX @@ -7512,7 +7511,7 @@ wX wX wX wX -MX +ZK RL RX RX @@ -7570,58 +7569,58 @@ RX RX xd RX -MX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +ZK +tV +tV +tV Md "} (27,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7643,14 +7642,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -7664,8 +7663,8 @@ xd xd xd RX -MX -MX +ZK +ZK gy gy gy @@ -7682,15 +7681,15 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX -MX -MX -DG -DG -DG +ZK +ZK +tV +tV +tV RL RL xd @@ -7699,14 +7698,14 @@ xd RL gy gy -MX -MX -DG -DG +ZK +ZK +tV +tV gy wX wX -MX +ZK RL RX RX @@ -7764,58 +7763,58 @@ RX RX xd RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV Md "} (28,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -7837,14 +7836,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -7858,8 +7857,8 @@ xd xd xd RX -MX -MX +ZK +ZK gy gy gy @@ -7869,22 +7868,22 @@ fj eY gy gy -MX -MX -MX +ZK +ZK +ZK gy gy gy gy gy RL -MX +ZK RX -MX -MX -DG -DG -DG +ZK +ZK +tV +tV +tV RL RL xd @@ -7895,12 +7894,12 @@ Wq qE Wq Wq -DG -DG +tV +tV gy wX wX -DG +tV gy RX RX @@ -7958,39 +7957,39 @@ RX RX xd RX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV gy gy gy @@ -7998,18 +7997,18 @@ gy gy gy gy -MX -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV Md "} (29,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8031,14 +8030,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -8052,45 +8051,45 @@ xd xd xd RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -gy -MX -MX -MX -gy -gy -gy -gy -gy +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +gy +ZK +ZK +ZK +gy +gy +gy +gy +gy RL -MX +ZK RX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK Wq Ze is XT Wq -DG -DG +tV +tV gy gy wX @@ -8152,38 +8151,38 @@ RX RX xd RX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV gy gy gy @@ -8191,19 +8190,19 @@ gy gy gy gy -MX -MX -MX -DG -MX -DG -DG +ZK +ZK +ZK +tV +ZK +tV +tV Md "} (30,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8225,14 +8224,14 @@ xd RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -8250,41 +8249,41 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK vu -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Wq Ze is XT Wq -MX -DG +ZK +tV gy gy gy @@ -8346,37 +8345,37 @@ RX RX RX RL -MX -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV gy gy gy @@ -8384,20 +8383,20 @@ gy gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (31,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8419,13 +8418,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -8442,43 +8441,43 @@ xd xd RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK Wq Wq qE Wq Wq -MX -DG +ZK +tV WM WM jO @@ -8539,38 +8538,38 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV gy gy gy @@ -8578,20 +8577,20 @@ gy gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (32,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8613,13 +8612,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -8636,43 +8635,43 @@ xd RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK Wq is Ze Wq -MX -DG +ZK +tV WM sA sA @@ -8731,39 +8730,39 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -gy -gy -gy -gy +ZK +ZK +ZK +tV +tV +tV +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX gy gy -DG -DG -DG +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +tV +tV +tV gy gy AO @@ -8773,19 +8772,19 @@ AO AO NW AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (33,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -8807,13 +8806,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -8830,52 +8829,52 @@ xd RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK gy gy -MX -MX +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK Wq is is Wq -MX -DG +ZK +tV WM Go Go Go WM -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -8925,14 +8924,14 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK gy gy gy @@ -8944,8 +8943,8 @@ RL RL RL RL -MX -MX +ZK +ZK gy gy gy @@ -8967,19 +8966,19 @@ db KN QY AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (34,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9001,13 +9000,13 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -9024,24 +9023,24 @@ xd RX RX RX -MX -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy -MX -MX +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9050,26 +9049,26 @@ xd xd xd xd -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Wq wX is Wq -MX -DG +ZK +tV WM sA sA sA WM -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -9118,24 +9117,24 @@ RX RX RX RX -MX -MX -DG -DG -DG +ZK +ZK +tV +tV +tV RL -MX -MX +ZK +ZK gy gy gy gy RL -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK RL RL RL @@ -9143,11 +9142,11 @@ nz gy RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -9161,19 +9160,19 @@ Ru Ow pq AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (35,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9194,13 +9193,13 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -9217,25 +9216,25 @@ xd xd RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9244,26 +9243,26 @@ xd xd xd xd -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV +tV mb Wq -MX -DG +ZK +tV WM vr sA sA WM -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -9312,24 +9311,24 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK gy gy gy Lc -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL RL AO @@ -9355,19 +9354,19 @@ db cR jP AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (36,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9388,13 +9387,13 @@ xd RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -9411,25 +9410,25 @@ RX xd RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9438,26 +9437,26 @@ xd xd xd xd -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +tV WM WM jO WM WM -DG -DG -MX -MX +tV +tV +ZK +ZK RX RX RX @@ -9506,17 +9505,17 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK gy gy gy -MX +ZK RL Pk Pk @@ -9549,19 +9548,19 @@ db AO AO AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (37,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9582,17 +9581,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -RX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +ZK +RX +RX +RX +RX RX xd xd @@ -9605,25 +9604,25 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX xd xd RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9636,22 +9635,22 @@ RX RX RX RX -DG -DG -DG -DG -DG -DG -DG +tV +tV +tV +tV +tV +tV +tV gy gy gy gy gy -DG -DG -MX -MX +tV +tV +ZK +ZK RX RX RX @@ -9698,19 +9697,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK gy gy gy -MX +ZK RL Pk fm @@ -9741,21 +9740,21 @@ ew YJ eM NW -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV Md "} (38,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9776,13 +9775,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -9799,25 +9798,25 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX xd xd RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RL xd xd @@ -9831,22 +9830,22 @@ RX RX xd RL -DG -DG -DG -DG -DG -DG +tV +tV +tV +tV +tV +tV gy gy gy vt -DG -DG -DG -MX -MX -MX +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -9891,15 +9890,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RL gy gy @@ -9935,21 +9934,21 @@ ew Zh VC NW -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (39,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -9970,13 +9969,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -9993,27 +9992,27 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10024,23 +10023,23 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV gy -DG +tV gy gy -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10078,28 +10077,28 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy gy -MX +ZK RL -MX +ZK Pk Cq CX @@ -10121,7 +10120,7 @@ yX yw yw yw -yw +Su PZ SN ew @@ -10129,21 +10128,21 @@ ew Zw Cg NW -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (40,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10164,13 +10163,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -10187,27 +10186,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10218,23 +10217,23 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV hx -DG +tV wX wX -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10269,31 +10268,31 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +ZK RL -MX +ZK Pk Cq WX @@ -10323,22 +10322,21 @@ ew YJ ut NW -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (41,1,1) = {" Md -MX -MX -RX +ZK +ZK RX RX RX @@ -10358,14 +10356,14 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -10381,28 +10379,28 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX RX +ZK +tV +tV +tV +tV +ZK RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK RX RX RX @@ -10412,23 +10410,24 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG +RX +ZK +ZK +tV +tV +tV +tV +tV +tV wX wX -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10460,32 +10459,32 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX -MX -MX +ZK +ZK gy gy gy -MX +ZK RL RL Pk @@ -10505,7 +10504,7 @@ so AO AO AO -ws +sW As db db @@ -10519,19 +10518,19 @@ db AO AO AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (42,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10552,13 +10551,13 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -10575,27 +10574,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -10606,23 +10605,23 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +tV wX gy -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -10653,35 +10652,35 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX +ZK RL -MX +ZK Pk Cq WX @@ -10713,19 +10712,19 @@ db vl Ir AO -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV Md "} (43,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10746,13 +10745,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -10769,27 +10768,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10800,23 +10799,23 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV wX wX gy -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -10845,21 +10844,21 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -10868,14 +10867,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK Pk Cq CX @@ -10907,19 +10906,19 @@ RS iu yP AO -MX -MX -MX +ZK +ZK +ZK gy -DG -DG -DG +tV +tV +tV Md "} (44,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -10940,13 +10939,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -10963,27 +10962,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -10994,23 +10993,23 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +tV hx wX wX vt -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11037,18 +11036,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11062,14 +11061,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK Pk Cq WX @@ -11101,25 +11100,19 @@ db XR ql AO -MX -MX -MX +ZK +ZK +ZK gy -DG -DG -DG +tV +tV +tV Md "} (45,1,1) = {" Md -MX -MX -RX -RX -RX -RX -RX -RX +ZK +ZK RX RX RX @@ -11134,19 +11127,19 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11157,27 +11150,33 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -11188,23 +11187,23 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +tV gy wX wX wX -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11230,18 +11229,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -11256,14 +11255,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX +ZK RL -MX +ZK Pk Cq CX @@ -11289,25 +11288,25 @@ IV QN UV AO -ew +hh do AO AO AO AO -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (46,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -11328,13 +11327,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11351,27 +11350,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -11382,24 +11381,24 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +tV +tV hx gy wX -DG -DG -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11420,19 +11419,19 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11450,14 +11449,14 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK Pk Cq WX @@ -11489,19 +11488,19 @@ wE VM We AO -MX -MX -MX +ZK +ZK +ZK gy -DG -DG -DG +tV +tV +tV Md "} (47,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -11522,13 +11521,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11545,27 +11544,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy -MX +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -11576,24 +11575,24 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +tV +tV wX gy -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11614,18 +11613,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11640,18 +11639,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RL -MX +ZK Pk Cq CX @@ -11683,19 +11682,19 @@ oX YS ew NW -MX -MX +ZK +ZK gy -DG -DG -DG -DG +tV +tV +tV +tV Md "} (48,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -11716,13 +11715,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -11739,27 +11738,27 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -11770,24 +11769,24 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +ZK +tV +tV wX gy -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11806,19 +11805,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -11831,21 +11830,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK Pk Cq WX @@ -11857,8 +11856,8 @@ lF AO AO hp -MX -MX +ZK +ZK AO tv EX @@ -11877,21 +11876,19 @@ bH uh ew NW -MX +ZK gy gy gy -DG -DG -DG +tV +tV +tV Md "} (49,1,1) = {" Md -MX -MX -RX -RX +ZK +ZK RX RX RX @@ -11910,15 +11907,15 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX RX RX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -11933,27 +11930,29 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +RX RX RX RX RX -MX +RX +ZK gy -MX +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -11964,24 +11963,24 @@ RX RX RX RX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +tV wX wX wX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -11997,20 +11996,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -12025,21 +12024,21 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK vu gy gy gy gy gy -MX -MX +ZK +ZK RL -MX +ZK Pk Cq CX @@ -12049,9 +12048,9 @@ TK If lX AO -MX -MX -MX +ZK +ZK +ZK AO AO db @@ -12073,17 +12072,17 @@ ew NW gy gy -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Md "} (50,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12104,13 +12103,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12127,27 +12126,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX +ZK gy -MX +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12158,24 +12157,24 @@ RX RX RX RX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +tV wX wX wX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12191,18 +12190,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -12217,11 +12216,11 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -12230,10 +12229,10 @@ gy gy gy RL -MX +ZK RL -MX -MX +ZK +ZK Pk Cq WX @@ -12243,9 +12242,9 @@ zO pK mh AO -MX -MX -MX +ZK +ZK +ZK AO sQ tz @@ -12267,17 +12266,17 @@ SL AO gy gy -MX +ZK gy -DG -DG -DG +tV +tV +tV Md "} (51,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12296,15 +12295,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12321,27 +12320,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX +ZK gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12352,24 +12351,24 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy wX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12383,20 +12382,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12411,9 +12410,9 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -12423,11 +12422,11 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK Pk Cq CX @@ -12437,9 +12436,9 @@ AO AO AO AO -MX -MX -MX +ZK +ZK +ZK AO sX tU @@ -12451,7 +12450,7 @@ db HA Mw ew -mq +lT AO AO AO @@ -12462,16 +12461,16 @@ AO gy gy gy -DG -DG -DG -DG +tV +tV +tV +tV Md "} (52,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12490,15 +12489,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12515,27 +12514,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12546,27 +12545,27 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy gy -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12575,19 +12574,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12604,9 +12603,9 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -12615,27 +12614,27 @@ gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL -MX +ZK Pk Cq WX Ki Pk -MX -MX -MX -MX -MX -MX -MX -AO -XG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +AO +XG ub vA AO @@ -12652,20 +12651,20 @@ ew tU xV AO -MX -DG -DG -DG -DG -DG -MX -DG +ZK +tV +tV +tV +tV +tV +ZK +tV Md "} (53,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12684,15 +12683,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12709,27 +12708,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -12740,9 +12739,9 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -12750,17 +12749,17 @@ gy gy gy gy -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -12768,18 +12767,18 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -12798,36 +12797,36 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy gy -MX +ZK RL RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL Pk Cq CX Oq Pk -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK AO NW NW @@ -12846,20 +12845,20 @@ ew Pv Ob AO -MX -DG -DG -DG -DG -DG -DG -DG +ZK +tV +tV +tV +tV +tV +tV +tV Md "} (54,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -12878,15 +12877,15 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -12903,27 +12902,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -12943,31 +12942,31 @@ ax RX gy gy -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -12989,41 +12988,41 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL -MX +ZK Pk Cq WX Ki Pk -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy gy gy gy @@ -13042,18 +13041,18 @@ Iy NW gy gy -MX -MX -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV Md "} (55,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13072,15 +13071,15 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -13097,27 +13096,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -13136,32 +13135,32 @@ RX RX RX gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -13180,48 +13179,48 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX +ZK +ZK +ZK RL RL -MX -MX +ZK +ZK RL -MX +ZK Pk Cq CX Oq Pk -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK gy AO sH @@ -13234,28 +13233,20 @@ VA VA mq NW -MX +ZK gy -MX -MX -DG -DG -DG -DG +ZK +ZK +tV +tV +tV +tV Md "} (56,1,1) = {" Md -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK RX RX RX @@ -13266,15 +13257,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -13283,6 +13265,22 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -13291,27 +13289,28 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX RX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX -MX -MX -MX +RX +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -13329,31 +13328,31 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -13374,30 +13373,30 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX RX -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK RL RL -MX +ZK Pk Cq WX @@ -13408,15 +13407,15 @@ Pk Pk Pk Pk -MX +ZK RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK NW kp ub @@ -13428,20 +13427,20 @@ AO NW NW AO -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (57,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13460,15 +13459,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13485,27 +13484,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -13528,24 +13527,24 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13568,30 +13567,30 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK Pk Cq CX @@ -13602,15 +13601,15 @@ ZJ ZJ Oj Pk -MX +ZK RL RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK AO AO RE @@ -13620,22 +13619,22 @@ AO gy gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +gy +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (58,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13654,15 +13653,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13679,27 +13678,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -13722,24 +13721,24 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -13760,32 +13759,32 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX +ZK +ZK RX RX RX RX xd RX -MX -MX -MX +ZK +ZK +ZK RL -MX +ZK RL -MX -MX +ZK +ZK Pk Cq WX @@ -13796,15 +13795,15 @@ WX Qu nu Pk -MX +ZK RL RL -MX -MX +ZK +ZK gy gy gy -MX +ZK gy Iq gy @@ -13813,23 +13812,23 @@ VY gy gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (59,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -13850,13 +13849,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -13873,30 +13872,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX -RX -RX -RX +ZK +ZK RX RX RX @@ -13916,27 +13912,29 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX RX RX RX @@ -13954,32 +13952,33 @@ RX RX RX RX -MX -MX -MX +RX +ZK +ZK +ZK gy gy gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK RL -MX -MX +ZK +ZK RL -MX +ZK Pk Cq cF @@ -13990,13 +13989,13 @@ cF cF nu Pk -MX +ZK RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy @@ -14006,24 +14005,24 @@ gy gy gy te -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (60,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14044,13 +14043,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -14067,27 +14066,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -14110,20 +14109,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14147,8 +14146,8 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy @@ -14156,10 +14155,10 @@ gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14167,11 +14166,11 @@ RX RX RX RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RL RL Pk @@ -14184,40 +14183,40 @@ ON HB nx Pk -MX +ZK RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (61,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14238,13 +14237,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -14261,27 +14260,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -14304,15 +14303,15 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -14339,20 +14338,20 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14360,13 +14359,13 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK RL RL RL -MX +ZK RL Pk Pk @@ -14378,40 +14377,40 @@ Pk Pk Pk Pk -MX -RL -RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +RL +RL +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (62,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14432,13 +14431,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -14455,27 +14454,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -14498,15 +14497,15 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -14533,18 +14532,18 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14564,53 +14563,48 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL -MX +ZK RL RL RL -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK gy gy gy gy gy gy -MX +ZK RL RL -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Md "} (63,1,1) = {" Md -MX -MX -RX -RX -RX -RX -RX +ZK +ZK RX RX RX @@ -14626,17 +14620,19 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +ZK +ZK +RX +RX RX RX RX @@ -14649,27 +14645,30 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +RX +RX +RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14692,15 +14691,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -14727,18 +14726,18 @@ RX RX RX RX -MX +ZK gy gy gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14758,48 +14757,48 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK RL -MX +ZK gy gy gy gy -MX -MX +ZK +ZK RL RL -MX -DG -DG -DG -DG +ZK +tV +tV +tV +tV Md "} (64,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -14820,12 +14819,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -14843,27 +14842,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -14883,17 +14882,17 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -14918,21 +14917,21 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -14953,47 +14952,47 @@ RL RL RL RL -MX -MX +ZK +ZK RL RL RL -MX +ZK RL RL RL RL RL -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RL gy gy gy gy -MX +ZK RL -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (65,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15014,12 +15013,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15037,27 +15036,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15077,16 +15076,16 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15112,18 +15111,18 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -15155,39 +15154,39 @@ RL RL gy RL -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RL gy gy gy -MX -MX +ZK +ZK RL -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV Md "} (66,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15208,12 +15207,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15231,27 +15230,27 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15269,18 +15268,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15306,15 +15305,15 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -15341,47 +15340,47 @@ RL RL RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX +ZK RL -MX -MX -MX +ZK +ZK +ZK RL -DG -DG -DG -DG +tV +tV +tV +tV Md "} (67,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15402,12 +15401,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15425,27 +15424,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15463,18 +15462,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15500,15 +15499,15 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -15535,47 +15534,47 @@ RL RL RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV Md "} (68,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15596,12 +15595,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15619,27 +15618,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15655,20 +15654,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -15694,13 +15693,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -15729,47 +15728,47 @@ RL RL RL RL -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV Md "} (69,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15790,12 +15789,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -15813,27 +15812,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -15848,21 +15847,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -15888,13 +15887,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -15923,47 +15922,47 @@ RL RL RL RL -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV Md "} (70,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -15984,12 +15983,12 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -16007,27 +16006,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16042,21 +16041,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -16082,13 +16081,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -16117,47 +16116,47 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK Md "} (71,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16178,12 +16177,12 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -16201,27 +16200,27 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16234,23 +16233,23 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16276,13 +16275,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -16311,47 +16310,47 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} (72,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16372,13 +16371,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -16395,27 +16394,27 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX +ZK +ZK Lc gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16428,23 +16427,23 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16470,13 +16469,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16505,47 +16504,47 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK Md "} (73,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16566,15 +16565,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16589,27 +16588,27 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -16622,22 +16621,22 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16664,11 +16663,11 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy -MX +ZK RX RX RX @@ -16697,49 +16696,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} (74,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16760,15 +16759,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -16782,26 +16781,26 @@ xd RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX xd xd xd RX -MX +ZK RL RL gy gy -MX +ZK RL RL xd @@ -16816,23 +16815,22 @@ xd RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +RX RX RX RX @@ -16858,11 +16856,12 @@ RX RX RX RX -MX -MX +RX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -16891,49 +16890,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV eY eY -DG -DG -DG -DG -DG -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -MX +tV +tV +tV +tV +tV +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK Md "} (75,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -16954,15 +16953,15 @@ RX xd RX RX -MX -MX -DG -DG -DG -DG -MX -DG -MX +ZK +ZK +tV +tV +tV +tV +ZK +tV +ZK RX RX RX @@ -16976,13 +16975,13 @@ xd RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -16990,12 +16989,12 @@ xd xd xd RX -MX +ZK RL gy gy gy -MX +ZK RL RL xd @@ -17010,21 +17009,21 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX +ZK +ZK +ZK +tV +tV +ZK RL -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -17052,11 +17051,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -17085,49 +17084,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -DG -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK Md "} (76,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17148,17 +17147,17 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX xd xd @@ -17170,12 +17169,12 @@ xd RX RX RX -MX -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -17184,7 +17183,7 @@ xd xd xd RX -MX +ZK RL gy gy @@ -17205,20 +17204,20 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17246,11 +17245,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -17279,49 +17278,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -DG -MX -MX -MX -gy -gy -gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX +tV +tV +tV +tV +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK Md "} (77,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17343,16 +17342,16 @@ xd RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX xd xd @@ -17362,14 +17361,14 @@ xd xd xd RX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -17378,14 +17377,14 @@ xd xd xd RX -MX +ZK RL gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -17440,11 +17439,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -17473,80 +17472,80 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -MX -MX -MX -MX -gy -gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -MX -Md -"} -(78,1,1) = {" -Md -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -xd +tV +tV +tV +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +Md +"} +(78,1,1) = {" +Md +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +xd xd RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX xd xd @@ -17556,14 +17555,14 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -17579,15 +17578,15 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17619,26 +17618,26 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX +ZK RX RX RX @@ -17667,49 +17666,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -DG -MX -MX -MX -gy -gy -gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (79,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17732,15 +17731,15 @@ xd RX RX xd -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX xd xd @@ -17750,14 +17749,14 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -17772,16 +17771,16 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17811,28 +17810,28 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX +ZK RX RX RX @@ -17861,49 +17860,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV fj fj -DG -DG -MX -MX -MX -MX -gy -gy -gy -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (80,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -17926,15 +17925,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX xd xd @@ -17944,16 +17943,16 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -17962,20 +17961,20 @@ xd xd RL RL -MX +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -17996,37 +17995,37 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -gy -gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX gy gy gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX +gy +gy +gy +ZK RX RX RX @@ -18055,49 +18054,49 @@ RL RL RL RL -MX -MX -MX -MX -MX -MX -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV eY eY -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (81,1,1) = {" Md -MX -MX +ZK +ZK RX RX RX @@ -18120,15 +18119,15 @@ RX xd xd RX -MX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX xd xd @@ -18138,16 +18137,16 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -18156,20 +18155,20 @@ xd xd RL RL -MX -MX +ZK +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -18190,14 +18189,14 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18211,16 +18210,16 @@ gy gy gy gy -MX -MX +ZK +ZK gy gy gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -18240,90 +18239,90 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (82,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RL xd xd @@ -18332,17 +18331,17 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX xd @@ -18351,46 +18350,46 @@ xd RL RL RL -MX +ZK gy gy gy gy -MX +ZK gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18413,8 +18412,8 @@ gy gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -18434,109 +18433,109 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK Md "} (83,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RL -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -RL -xd +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +RL +xd xd xd xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK RX RX xd @@ -18544,40 +18543,40 @@ xd xd RL RL -MX -MX +ZK +ZK gy gy gy gy gy gy -MX +ZK gy -MX -MX +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18590,10 +18589,10 @@ gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy @@ -18605,10 +18604,10 @@ gy gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX RX @@ -18628,90 +18627,90 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK gy gy -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK Md "} (84,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RL RL -MX -MX -MX -MX -DG -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RL xd xd @@ -18720,17 +18719,17 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX xd @@ -18748,28 +18747,28 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18783,26 +18782,26 @@ gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -18819,124 +18818,124 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK gy gy -MX +ZK gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RL -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} (85,1,1) = {" Md -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RL -MX -MX -MX -MX -DG -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -RX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +RL +xd +xd +xd +xd +xd +xd +RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +RX RX RX RX RX RX xd -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -18945,20 +18944,20 @@ gy gy gy gy -MX -MX +ZK +ZK gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK vu -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -18969,25 +18968,25 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19003,37 +19002,37 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX +ZK gy gy gy @@ -19041,65 +19040,65 @@ gy gy gy gy -MX +ZK RL -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} (86,1,1) = {" Md -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK RL -MX -MX -MX -DG -DG -MX -DG -MX +ZK +ZK +ZK +tV +tV +ZK +tV +ZK RL xd xd @@ -19108,19 +19107,19 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV RX RX RX @@ -19128,8 +19127,8 @@ RX RX RX xd -MX -MX +ZK +ZK gy gy gy @@ -19162,17 +19161,17 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19195,126 +19194,126 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX +ZK +ZK gy gy gy gy gy -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK Md "} (87,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd +xd +xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV RX RX RX @@ -19323,11 +19322,11 @@ RX RX RX RL -MX -MX +ZK +ZK gy -MX -MX +ZK +ZK gy gy gy @@ -19354,11 +19353,11 @@ gy gy gy gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19389,105 +19388,105 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (88,1,1) = {" Md -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -19496,19 +19495,19 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV RX RX RX @@ -19516,13 +19515,13 @@ xd RX RX RX -MX +ZK RL gy RL -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -19544,15 +19543,15 @@ gy gy gy RL -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19583,175 +19582,175 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX +ZK +ZK gy gy gy gy -MX -MX +ZK +ZK RX RX -MX -MX -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (89,1,1) = {" Md -DG -DG -MX -MX -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -MX -DG -DG -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -MX -MX -MX -MX -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd +xd +xd +xd +xd +RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX RX RX RX @@ -19777,29 +19776,29 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -19809,73 +19808,73 @@ RX RX RX RX -MX +ZK gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX -MX -MX -DG -MX -DG -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +ZK +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (90,1,1) = {" Md -MX -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -19884,19 +19883,19 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK RX RX RX @@ -19904,34 +19903,34 @@ RX xd RX xd -MX -MX -MX +ZK +ZK +ZK RL -MX -MX +ZK +ZK RL -MX +ZK gy gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy -MX +ZK gy gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -19971,29 +19970,29 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -20002,95 +20001,95 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX -MX -MX +ZK +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md -"} -(91,1,1) = {" -Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(91,1,1) = {" +Md +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd xd xd xd xd RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -20100,26 +20099,26 @@ xd RX RX RX -MX -MX +ZK +ZK RL RL -MX -MX +ZK +ZK gy -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20166,28 +20165,28 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -20196,74 +20195,74 @@ RX RX RX RX -MX +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (92,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RL -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -20272,19 +20271,19 @@ xd xd xd RX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX RX @@ -20294,26 +20293,26 @@ RX RX RX RX -MX +ZK RL -MX -MX -MX +ZK +ZK +ZK RL RL -MX +ZK RL -MX +ZK RL -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20361,25 +20360,25 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -20389,105 +20388,105 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (93,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -RX -MX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -xd -xd -xd -xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd +xd +xd +xd +xd +RX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +xd +xd +xd +xd xd xd xd @@ -20496,18 +20495,18 @@ RX RX RX xd -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20558,20 +20557,20 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -20583,11 +20582,11 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy -MX +ZK RX RX RX @@ -20595,63 +20594,63 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (94,1,1) = {" Md -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -20660,17 +20659,17 @@ xd xd xd RX -MX -MX -MX -DG -DG -DG -MX -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +tV +tV +ZK +ZK RX RX RX @@ -20752,20 +20751,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -20775,13 +20774,13 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RX RX RX @@ -20789,82 +20788,82 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (95,1,1) = {" Md -MX -DG -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -20894,14 +20893,12 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -RX -RX +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -20945,37 +20942,39 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +RX RX RX RX RX RX RX -MX -MX -MX -MX +RX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -20983,82 +20982,82 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (96,1,1) = {" Md -MX -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -21087,13 +21086,13 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -21137,20 +21136,20 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -21162,13 +21161,13 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX +ZK RX RX RX @@ -21177,86 +21176,86 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (97,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -21281,13 +21280,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX xd RX @@ -21331,20 +21330,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -21355,14 +21354,14 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +ZK +ZK RX RX RX @@ -21371,100 +21370,100 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (98,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -RX -RX -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +RX +RX +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd xd xd xd @@ -21475,13 +21474,13 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK RX xd RX @@ -21525,20 +21524,20 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -21549,13 +21548,13 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK gy gy gy -MX +ZK RX RX RX @@ -21565,87 +21564,87 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (99,1,1) = {" Md -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -DG -DG -DG -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK RX RX xd @@ -21669,13 +21668,13 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK RX xd RX @@ -21717,22 +21716,22 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -21743,13 +21742,13 @@ RX RX RX RX -MX -MX +ZK +ZK gy gy gy -MX -MX +ZK +ZK RX RX RX @@ -21759,287 +21758,93 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} (100,1,1) = {" Md -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -RX -RX -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -MX -MX -RX -RX -RX -xd -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md -"} -(101,1,1) = {" -Md -MX -MX -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -RX -RX +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX xd -RX +xd +xd +xd xd xd xd @@ -22056,12 +21861,12 @@ RX RX RX RX -MX -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -22105,18 +21910,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -22128,16 +21933,16 @@ RX RX RX RX -MX -MX -MX -gy +ZK +ZK +ZK +ZK gy gy gy -MX -MX -RX +ZK +ZK +ZK RX RX RX @@ -22147,92 +21952,92 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(102,1,1) = {" +(101,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK RX RX RX RX +xd RX xd xd @@ -22249,12 +22054,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +RX +ZK +tV +tV +tV +ZK RX RX RX @@ -22298,19 +22103,19 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX +RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -22322,15 +22127,15 @@ RX RX RX RX -MX -MX +ZK +ZK +ZK gy gy gy gy -MX -RX -RX +ZK +ZK RX RX RX @@ -22341,84 +22146,86 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md "} -(103,1,1) = {" +(102,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -22427,28 +22234,26 @@ RX RX RX xd -RX xd -RX -RX -RX -RX -RX -RX -RX +xd +xd +xd +xd +xd +xd +xd xd RX RX RX RX RX -RX -MX -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -22492,19 +22297,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX RX RX RX @@ -22515,14 +22321,13 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +gy gy gy gy -MX -MX +ZK RX RX RX @@ -22535,81 +22340,81 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(104,1,1) = {" +(103,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -22620,7 +22425,9 @@ RX RX RX RX +xd RX +xd RX RX RX @@ -22628,20 +22435,18 @@ RX RX RX RX +xd RX RX RX -MX -RL -MX -MX -MX RX -MX -DG -DG -MX -MX +RX +RX +ZK +tV +tV +tV +ZK RX RX RX @@ -22684,21 +22489,21 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -22709,14 +22514,14 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK +gy gy gy -MX -MX -MX +ZK +ZK RX RX RX @@ -22729,144 +22534,81 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(105,1,1) = {" +(104,1,1) = {" Md -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -xd -xd -xd -xd -xd -xd -xd -RX -RX -MX -MX -DG -DG -RL -MX -MX -DG -DG -DG -MX -RX -RX -RX -RX -RX -RX -xd -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -22878,39 +22620,9 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX -MX RX RX RX @@ -22918,125 +22630,29 @@ RX RX RX RX +ZK +RL +ZK +ZK +ZK RX +ZK +tV +tV +ZK +ZK RX RX RX RX -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(106,1,1) = {" -Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -RL -RL -RL -RL -RL -RL -RL -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX RX xd -xd -xd -xd -xd -xd -xd -RX -RX -MX -DG -DG -MX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX RX -xd -RX RX RX RX @@ -23067,44 +22683,39 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy +ZK +ZK +ZK gy gy -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -23117,91 +22728,91 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(107,1,1) = {" +(105,1,1) = {" Md -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -RL -xd -xd -xd -xd -xd -xd -xd -MX -DG -DG -DG -DG -DG -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX xd xd @@ -23212,17 +22823,17 @@ xd xd RX RX -MX -DG -DG -MX -MX -DG -DG -DG -DG -MX -xd +ZK +ZK +tV +tV +RL +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -23265,41 +22876,41 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -RX -RX -RX RX -MX -MX -MX -MX -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -gy -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +RX RX RX RX @@ -23311,91 +22922,91 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -DG -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(108,1,1) = {" +(106,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV RL -xd -xd -xd -xd -xd -xd -xd -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +RL +RL +RL +RL +RL +RL +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX xd xd @@ -23405,22 +23016,22 @@ xd xd xd RX -MX -MX -DG -MX -MX -MX -DG -DG -DG -MX -MX +RX +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +RX RX RX -xd RX -xd RX RX xd @@ -23459,38 +23070,38 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -gy -gy -gy -gy -gy -gy -gy -gy +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -RX -RX +ZK +ZK RX RX RX @@ -23505,63 +23116,63 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK Md "} -(109,1,1) = {" +(107,1,1) = {" Md -MX -MX -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV RL xd xd @@ -23570,26 +23181,26 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX xd xd @@ -23599,28 +23210,26 @@ xd xd xd RX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX -RX -RX -RX -RX RX +ZK +tV +tV +ZK +ZK +tV +tV +tV +tV +ZK +xd RX RX RX -xd RX RX RX +xd +RX RX RX RX @@ -23653,24 +23262,26 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +RX RX RX RX -MX -MX -MX -gy -gy +ZK +ZK +ZK +ZK gy gy gy @@ -23682,9 +23293,9 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -23699,63 +23310,63 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(110,1,1) = {" +(108,1,1) = {" Md -MX -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV RL xd xd @@ -23764,51 +23375,51 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -MX -MX -RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -DG -MX -MX -DG -DG -DG -MX -MX -RX -RX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX +xd +xd +xd +xd +xd +xd +xd RX +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX +xd RX +xd RX RX xd @@ -23847,24 +23458,23 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +RX RX RX RX -MX -MX -MX -gy -gy -gy -gy +ZK +ZK +ZK gy gy gy @@ -23876,9 +23486,9 @@ gy gy gy gy -MX -MX -MX +ZK +ZK +RX RX RX RX @@ -23893,63 +23503,64 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +RX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(111,1,1) = {" +(109,1,1) = {" Md -DG -DG -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK RL xd xd @@ -23958,26 +23569,46 @@ xd xd xd xd -DG -DG -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX +xd +xd +xd +xd +xd +xd +xd RX +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK RX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -23985,19 +23616,11 @@ RX RX RX RX +xd +RX +RX +RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -24005,7 +23628,6 @@ RX RX RX RX -xd RX RX RX @@ -24030,29 +23652,22 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK gy gy gy @@ -24063,16 +23678,12 @@ gy gy gy gy -MX -MX -MX -MX gy gy gy -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -24087,119 +23698,127 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(112,1,1) = {" +(110,1,1) = {" Md -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX +ZK +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +RL +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX +RX RX RX RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +RX +ZK +tV +ZK +ZK +tV +tV +tV +ZK +ZK +RX +RX RX RX RX RX RX -MX -MX -MX -DG -DG -MX -MX RX RX +xd RX RX RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX RX RX -xd RX RX RX @@ -24227,22 +23846,20 @@ RX RX RX RX -MX -MX -MX -gy -gy -gy -gy -gy -gy -DG -DG -DG -DG -gy -gy -gy +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +RX +RX +ZK +ZK +ZK gy gy gy @@ -24255,18 +23872,12 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX gy gy gy -MX -MX +ZK +ZK +ZK RX RX RX @@ -24281,116 +23892,116 @@ RX RX RX RX -MX -MX -MX -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(113,1,1) = {" +(111,1,1) = {" Md -MX -DG -MX -MX -DG -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -RX +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +RL +xd +xd +xd +xd +xd +xd +xd +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -RL RX RX RX RX RX RX -MX -MX -MX -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -MX RX RX xd @@ -24421,25 +24032,26 @@ RX RX RX RX -MX -gy -gy -gy -gy -gy -eY -eY -fj -fj -fj -fj -fj -eY -gy -gy -gy -gy -gy +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy @@ -24448,19 +24060,18 @@ gy gy gy gy -MX -MX -MX -MX -MX -MX -MX -MX +gy +gy +ZK +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK +ZK RX RX RX @@ -24475,117 +24086,117 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(114,1,1) = {" +(112,1,1) = {" Md -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -DG -DG -MX -DG -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -RL -xd -xd -xd -xd -xd -xd -xd -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -xd -xd -xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +RX +RX RX RX RX RX -MX -MX -DG -DG -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +ZK +ZK +RX RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +RX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +RX RX xd RX @@ -24615,22 +24226,19 @@ RX RX RX RX -MX -MX -Lc +ZK +ZK +ZK +gy gy gy gy -eY -fj -fj -fj -fj -fj -eY -eY gy gy +tV +tV +tV +tV gy gy gy @@ -24640,21 +24248,24 @@ gy gy gy gy -MX -MX -MX -RX -RX -MX -MX -MX -MX gy gy gy gy gy -MX +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK RX RX RX @@ -24669,123 +24280,119 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(115,1,1) = {" +(113,1,1) = {" Md -MX -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -xd -xd -xd -xd -xd -xd -xd -xd -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -RX -xd -xd -xd -xd -RL -RL -RL -DG -MX -RX +ZK +tV +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX RX -xd RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +RL +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +ZK +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +ZK +RX +RX +xd RX RX RX @@ -24809,19 +24416,24 @@ RX RX RX RX -MX -MX -MX -MX +RX +RX +RX +RX +ZK +gy gy gy gy -DG -DG -DG -DG -DG gy +eY +eY +fj +fj +fj +fj +fj +eY gy gy gy @@ -24831,24 +24443,23 @@ gy gy gy gy -MX -MX -MX -MX -RX -RX -RX -RX -MX -MX -MX -MX gy gy gy gy -Lc -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK RX RX RX @@ -24863,120 +24474,119 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK Md "} -(116,1,1) = {" +(114,1,1) = {" Md -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -DG -DG -MX -RX +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +RL +xd +xd xd xd xd xd xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK xd xd xd -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX +ZK +ZK +tV +tV +ZK RX RX -MX -MX -DG -RL -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX +xd RX RX RX @@ -25004,45 +24614,46 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +Lc +gy +gy +gy +eY +fj +fj +fj +fj +fj +eY +eY gy gy gy gy gy -MX -MX -MX -MX -RX -RX -RX +gy +gy +gy +gy +gy +gy +ZK +ZK +ZK RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX +ZK RX RX RX @@ -25057,60 +24668,60 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(117,1,1) = {" +(115,1,1) = {" Md -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -RX +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK xd xd xd @@ -25119,66 +24730,57 @@ xd xd xd xd -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX +xd +xd +xd +xd +RL +RL +RL +tV +ZK RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX +xd RX RX RX @@ -25202,41 +24804,50 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX RX +ZK +ZK +ZK +ZK +gy +gy +gy +tV +tV +tV +tV +tV +gy +gy +gy +gy +gy +gy +gy +gy +gy +gy +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX +Lc +ZK RX RX RX @@ -25251,59 +24862,59 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(118,1,1) = {" +(116,1,1) = {" Md -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK RX xd xd @@ -25313,70 +24924,55 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -RL -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX -RX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +tV +RL +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -25396,14 +24992,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX RX RX RX @@ -25415,22 +25003,45 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy gy -MX -MX +ZK RX RX RX @@ -25445,129 +25056,121 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(119,1,1) = {" +(117,1,1) = {" Md -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -MX -MX -DG -DG -MX -MX -RX -RX -xd -xd -xd +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +RX xd xd xd xd xd -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -RL -RL -MX xd xd xd +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX RX -xd RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -25590,14 +25193,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX RX RX RX @@ -25606,6 +25201,23 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -25614,17 +25226,16 @@ RX RX RX RX -MX -MX -MX -MX -gy +ZK +ZK +ZK +ZK gy gy gy gy -MX -RX +ZK +ZK RX RX RX @@ -25639,59 +25250,59 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK Md "} -(120,1,1) = {" +(118,1,1) = {" Md -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -RX -RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX xd xd @@ -25701,97 +25312,61 @@ xd xd xd xd -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RL -RL -DG -RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -MX -MX RX RX RX @@ -25806,18 +25381,6 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX RX RX RX @@ -25832,99 +25395,18 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -Md -"} -(121,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX RX RX RX -xd -xd -xd -xd -xd -xd -xd -xd -MX -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX RX @@ -25937,22 +25419,19 @@ RX RX RX RX +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -25965,27 +25444,126 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(119,1,1) = {" +Md +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +tV +ZK +ZK RX RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +RL +RL +ZK +xd +xd +xd RX +xd RX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -26000,17 +25578,6 @@ RX RX RX RX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX -MX RX RX RX @@ -26022,100 +25589,20 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(122,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -MX -DG -DG -DG -DG -DG -RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -26126,6 +25613,16 @@ RX RX RX RX +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK RX RX RX @@ -26134,21 +25631,6 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -26156,15 +25638,126 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(120,1,1) = {" +Md +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX +RL +RL +tV +RL +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -26172,14 +25765,6 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -26191,17 +25776,6 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -gy -gy -gy -gy RX RX RX @@ -26209,6 +25783,14 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26219,97 +25801,26 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(123,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX -MX -DG -DG -DG -DG -MX -MX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX RX RX RX @@ -26321,30 +25832,103 @@ RX RX RX RX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(121,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX RX @@ -26354,6 +25938,20 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26364,16 +25962,6 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -26384,23 +25972,19 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX RX RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26411,40 +25995,21 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(124,1,1) = {" -Md -MX -MX -MX RX RX RX RX +ZK +ZK +ZK +gy +gy +gy +gy +gy +ZK +ZK +ZK RX RX RX @@ -26458,14 +26023,60 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(122,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26477,35 +26088,33 @@ xd xd RL RL -DG -DG -DG -DG -DG -MX -MX -MX -RL -MX -MX +ZK +tV +tV +tV +tV +tV RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26524,28 +26133,21 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -26558,16 +26160,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -26578,19 +26170,15 @@ RX RX RX RX -MX -MX -MX -MX -gy -gy -gy -gy -gy -MX -MX -MX RX +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26602,39 +26190,18 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +gy +gy +gy RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(125,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -26651,14 +26218,58 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(123,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX -MX -DG -DG -DG -DG -DG -MX +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26671,30 +26282,33 @@ xd xd RL RL -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX +tV +tV +tV +tV +tV +ZK +ZK RL -xd -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -26714,27 +26328,27 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX RX RX RX @@ -26749,19 +26363,16 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -26772,16 +26383,18 @@ RX RX RX RX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +gy gy gy gy gy -MX -MX -MX +ZK +ZK RX RX RX @@ -26797,38 +26410,36 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(126,1,1) = {" +(124,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -26845,18 +26456,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX +RX +ZK +tV +tV +tV +ZK +ZK +ZK +RX RX RX RX -xd xd xd xd @@ -26865,23 +26476,31 @@ xd xd RL RL -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX -RX +tV +tV +tV +tV +tV +ZK +ZK +ZK +RL +ZK +ZK +RL +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX -xd -xd -xd RX RX RX @@ -26904,6 +26523,21 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -26913,24 +26547,6 @@ RX RX RX RX -MX -MX -MX -RX -RX -RX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -RX -RX RX RX RX @@ -26941,20 +26557,18 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -26963,20 +26577,18 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -RX +gy +ZK +ZK +ZK RX RX RX @@ -26990,45 +26602,38 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(127,1,1) = {" +(125,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -27039,14 +26644,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -27054,19 +26651,39 @@ RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX +xd +xd +xd +xd +xd +xd +RL +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +xd RX RX RX @@ -27098,34 +26715,31 @@ RX RX RX RX -xd -xd -xd RX RX +ZK +ZK +ZK +ZK RX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX -MX -MX -MX RX RX RX -MX -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -MX -MX RX RX RX @@ -27134,21 +26748,21 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -27157,66 +26771,21 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK gy gy gy gy -MX -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(128,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -27227,19 +26796,44 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(126,1,1) = {" +Md +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX @@ -27250,23 +26844,43 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX +xd +xd +xd +xd +xd +xd +xd +RL +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX +xd +xd +xd RX RX RX @@ -27292,35 +26906,31 @@ RX RX RX RX -xd RX -xd RX RX RX RX RX +ZK +ZK +ZK RX -MX -MX -MX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -DG -DG -MX -DG -DG -MX -MX -MX -MX RX RX RX @@ -27330,19 +26940,20 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -27351,68 +26962,19 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -Md -"} -(129,1,1) = {" -Md -MX -MX -MX -RX -RX +gy +ZK +ZK +ZK +ZK RX RX RX @@ -27427,13 +26989,46 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +Md +"} +(127,1,1) = {" +Md +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -27443,20 +27038,33 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +RX +RX +RX +RX +RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -27484,79 +27092,83 @@ RX RX RX RX -xd RX RX RX RX RX xd +xd +xd +RX +RX +RX RX RX RX +ZK +ZK +ZK +RX RX -MX -MX -MX RX +ZK +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -MX -DG -DG -MX -DG -DG -DG -MX -MX -MX RX RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX -MX -RX +gy +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -27569,44 +27181,41 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(130,1,1) = {" +(128,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -27621,15 +27230,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -27639,17 +27248,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -27682,51 +27291,57 @@ RX RX RX RX +xd RX +xd RX RX RX RX RX RX -MX +ZK +ZK +ZK RX RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -27735,17 +27350,17 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX +gy +ZK +ZK +ZK +ZK RX RX RX @@ -27760,50 +27375,41 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(131,1,1) = {" +(129,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -27815,38 +27421,38 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -27871,7 +27477,6 @@ RX RX RX RX -xd RX RX RX @@ -27884,63 +27489,72 @@ RX RX RX RX +xd RX RX RX RX +ZK +ZK +ZK RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX -DG -MX -MX -RX +ZK +ZK +ZK +ZK +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -RX +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -27954,47 +27568,42 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(132,1,1) = {" +(130,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -28009,15 +27618,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -28027,17 +27636,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28079,6 +27688,7 @@ RX RX RX RX +ZK RX RX RX @@ -28088,33 +27698,34 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +tV +tV +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28123,17 +27734,18 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +RX RX RX RX @@ -28146,49 +27758,46 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK Md "} -(133,1,1) = {" +(131,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -28203,15 +27812,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -28221,17 +27830,17 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -28261,12 +27870,14 @@ RX RX RX RX +xd RX RX RX RX RX RX +xd RX RX RX @@ -28281,34 +27892,34 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28317,16 +27928,18 @@ RX RX RX RX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX +ZK +ZK +RX RX RX RX @@ -28340,49 +27953,45 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(134,1,1) = {" +(132,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -28397,46 +28006,15 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -28448,6 +28026,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -28481,28 +28068,7 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX @@ -28511,70 +28077,11 @@ RX RX RX RX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(135,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -28582,26 +28089,50 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK RX RX RX @@ -28609,20 +28140,52 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(133,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -28639,6 +28202,13 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -28650,6 +28220,15 @@ RX RX RX RX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -28676,99 +28255,17 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(136,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -28785,35 +28282,50 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK RX RX RX @@ -28827,6 +28339,47 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(134,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -28843,6 +28396,13 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -28854,6 +28414,15 @@ RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -28872,97 +28441,16 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -gy -gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX RX -MX -DG -DG -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(137,1,1) = {" -Md -MX -MX -MX RX RX RX @@ -28979,13 +28467,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX @@ -28997,18 +28478,30 @@ RX RX RX RX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -29017,149 +28510,70 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK RX RX RX RX RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -MX -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -MX -DG -DG -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(138,1,1) = {" +(135,1,1) = {" Md -MX -MX -MX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -29173,16 +28587,16 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29191,18 +28605,18 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29261,100 +28675,99 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX -MX -gy -gy -gy -gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK gy gy -RL -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(139,1,1) = {" +(136,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -29367,17 +28780,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29385,19 +28798,19 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29456,99 +28869,99 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -RL RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX RX -MX -RL -MX -MX -MX -RL -gy -gy -gy -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(140,1,1) = {" +(137,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -29561,17 +28974,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29579,19 +28992,19 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX RX +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29652,93 +29065,97 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -MX -MX -RX -RX -RX -RX +gy +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(141,1,1) = {" +(138,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -29755,13 +29172,13 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -29773,15 +29190,15 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -29843,120 +29260,63 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX -xd -xd -xd -xd -xd -xd -MX -MX -MX -MX -MX +ZK +ZK +ZK gy gy gy -vu -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -MX -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -Md -"} -(142,1,1) = {" -Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -MX -MX -DG -DG -DG -MX -RX -RX +gy +gy +gy +RL +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -29964,18 +29324,37 @@ RX RX RX RX +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +Md +"} +(139,1,1) = {" +Md +ZK +ZK +ZK +RX +RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX RX RX RX @@ -29987,6 +29366,13 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -29998,6 +29384,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -30042,10 +29437,6 @@ RX RX RX RX -MX -MX -MX -MX RX RX RX @@ -30055,43 +29446,6 @@ RX RX RX RX -xd -xd -xd -xd -xd -xd -MX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX -RL -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX RX RX RX @@ -30101,54 +29455,101 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -Md -"} -(143,1,1) = {" -Md -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +RL +RX RX RX RX RX RX +ZK +RL +ZK +ZK +ZK +RL +gy +gy +gy +ZK +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +RX +RX +RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +Md +"} +(140,1,1) = {" +Md +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -DG -DG -DG -MX RX RX RX @@ -30159,17 +29560,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -30179,6 +29578,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -30243,49 +29651,58 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -MX -MX -MX -MX -MX -gy +ZK +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX +ZK +ZK +ZK RL -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -30295,32 +29712,32 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(144,1,1) = {" +(141,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30337,49 +29754,37 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX RX -xd -xd -xd -xd -RX RX RX RX @@ -30440,6 +29845,18 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -30449,37 +29866,37 @@ xd xd xd xd -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy gy -MX -MX -MX -MX +vu +ZK +ZK RL -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX @@ -30489,32 +29906,32 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(145,1,1) = {" +(142,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30531,40 +29948,36 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX +ZK +ZK +tV +tV +tV +ZK +RX RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +RX +RX +RX RX RX RX @@ -30628,6 +30041,10 @@ RX RX RX RX +ZK +ZK +ZK +ZK RX RX RX @@ -30643,37 +30060,37 @@ xd xd xd xd -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -RX +gy +ZK +ZK +ZK +RL +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -30683,32 +30100,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(146,1,1) = {" +(143,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30725,35 +30142,35 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -DG -DG -DG -DG -DG -MX -MX -MX -MX +RX +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +RX +RX RX RX RX @@ -30837,36 +30254,36 @@ xd xd xd xd -MX -MX -MX +ZK +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX +gy +ZK +ZK +ZK +RL +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX @@ -30877,32 +30294,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(147,1,1) = {" +(144,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -30919,12 +30336,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -30937,32 +30354,17 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -30972,6 +30374,10 @@ RX RX RX RX +xd +xd +xd +xd RX RX RX @@ -31025,42 +30431,53 @@ RX RX RX RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +xd xd xd xd xd -xd -xd -MX -MX -MX +xd +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -RX -RX +gy +ZK +ZK +ZK +ZK +RL +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK RX RX RX @@ -31071,32 +30488,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(148,1,1) = {" +(145,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31113,12 +30530,12 @@ RX RX RX RX -MX -MX -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK RX RX RX @@ -31131,32 +30548,32 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -31225,36 +30642,36 @@ xd xd xd xd -MX -MX -MX +ZK +ZK +ZK +ZK gy gy -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -RX -RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -31265,32 +30682,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(149,1,1) = {" +(146,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31307,12 +30724,12 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -31325,35 +30742,20 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -MX -MX -DG -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX RX RX RX @@ -31361,7 +30763,6 @@ RX RX RX RX -xd RX RX RX @@ -31419,34 +30820,6 @@ RX RX RX RX -MX -MX -MX -gy -gy -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -31457,34 +30830,80 @@ RX RX RX RX +xd +xd +xd +xd +xd +xd +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK Md "} -(150,1,1) = {" +(147,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX RX RX RX @@ -31492,8 +30911,6 @@ RX RX RX RX -xd -xd RX RX RX @@ -31501,18 +30918,18 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +ZK +ZK +RX RX RX RX RX RX -xd xd xd xd @@ -31521,40 +30938,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -MX -MX -MX -DG -DG -DG -MX -DG -MX -MX -MX -RX -RX -RX +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX -xd RX RX RX @@ -31613,34 +31023,41 @@ RX RX RX RX -MX -MX -DG -eY -eY -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX RX +xd +xd +xd +xd +xd +xd +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -31653,32 +31070,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(151,1,1) = {" +(148,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31695,13 +31112,13 @@ RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +ZK +ZK +RX RX RX RX @@ -31715,36 +31132,30 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -31756,7 +31167,6 @@ RX RX RX RX -xd RX RX RX @@ -31807,34 +31217,41 @@ RX RX RX RX -MX -MX -DG -fj -fj -DG -DG -DG -DG -DG -DG -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX RX +xd +xd +xd +xd +xd +xd +ZK +ZK +ZK +gy +gy +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -31847,32 +31264,32 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -DG -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK Md "} -(152,1,1) = {" +(149,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -31883,19 +31300,19 @@ RX RX RX RX -xd RX RX RX RX RX -MX -DG -DG -DG -MX -MX -MX +RX +ZK +tV +tV +tV +ZK +ZK +RX RX RX RX @@ -31909,33 +31326,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -MX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -31943,13 +31360,12 @@ RX RX RX RX +xd RX RX RX RX -xd RX -xd RX RX RX @@ -32000,36 +31416,36 @@ RX RX RX RX -MX -MX -MX -DG -fj -fj -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX +ZK +ZK +ZK +gy +gy +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32041,33 +31457,33 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX -Md -"} -(153,1,1) = {" -Md -MX -MX -MX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(150,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -32075,21 +31491,23 @@ RX RX RX RX +xd +xd +RX RX RX RX RX RX RX +ZK +tV +tV +tV +ZK +ZK RX RX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -32101,42 +31519,41 @@ xd xd xd xd -xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +ZK +ZK +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK RX RX RX RX RX RX +xd RX RX RX @@ -32192,36 +31609,36 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -fj -fj -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX +ZK +ZK +tV +eY +eY +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -32235,32 +31652,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(154,1,1) = {" +(151,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -32277,17 +31694,17 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX +ZK +tV +tV +tV +ZK +ZK +ZK +RX RX RX RX -xd RX xd xd @@ -32297,33 +31714,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32338,6 +31755,7 @@ RX RX RX RX +xd RX RX RX @@ -32385,37 +31803,36 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -fj -fj -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +tV +fj +fj +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32429,32 +31846,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(155,1,1) = {" +(152,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -32465,20 +31882,20 @@ RX RX RX RX +xd RX RX RX RX RX +ZK +tV +tV +tV +ZK +ZK +ZK RX -MX -MX -DG -DG -DG -MX -MX -MX RX RX RX @@ -32491,42 +31908,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +ZK RX RX RX @@ -32538,7 +31946,9 @@ RX RX RX RX +xd RX +xd RX RX RX @@ -32578,27 +31988,6 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -fj -fj -DG -DG -MX -MX -MX -RX -RX -MX -MX -MX -RX RX RX RX @@ -32610,6 +31999,34 @@ RX RX RX RX +ZK +ZK +ZK +tV +fj +fj +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -32623,33 +32040,32 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(156,1,1) = {" +(153,1,1) = {" Md -MX -MX -MX -RX +ZK +ZK +ZK RX RX RX @@ -32665,15 +32081,14 @@ RX RX RX RX -MX -MX -MX -DG -DG -MX -MX -MX RX +ZK +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -32684,40 +32099,36 @@ xd xd xd xd +xd +xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -32771,28 +32182,7 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -fj -fj -DG -RL -MX -MX RX -xd -xd -xd -RL -RL -xd RX RX RX @@ -32801,6 +32191,33 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +fj +fj +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -32817,32 +32234,32 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(157,1,1) = {" +(154,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -32859,17 +32276,17 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -MX -MX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX +xd RX xd xd @@ -32879,44 +32296,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -32964,29 +32370,8 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -eY -eY -RL -RL -MX RX RX -xd -xd -xd -xd -xd -xd RX RX RX @@ -32999,6 +32384,34 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +fj +fj +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -33011,36 +32424,36 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -Md -"} -(158,1,1) = {" -Md -MX -MX -MX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +tV +tV +ZK +ZK +ZK +ZK +Md +"} +(155,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -33052,17 +32465,21 @@ RX RX RX RX -xd -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +RX +RX RX RX xd @@ -33073,32 +32490,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -33132,15 +32550,6 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX @@ -33156,31 +32565,9 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -gy -gy -RL -RL RX RX RX -xd -xd -xd -xd -xd -xd RX RX RX @@ -33190,6 +32577,34 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +fj +fj +tV +tV +ZK +ZK +ZK +RX +RX +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -33205,32 +32620,36 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(159,1,1) = {" +(156,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX RX RX RX @@ -33245,18 +32664,16 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK RX RX -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX RX RX xd @@ -33267,32 +32684,33 @@ xd xd xd RL -DG -DG -DG -DG -DG -DG -MX -MX -DG -DG -MX -MX -DG -MX -MX -DG -MX -DG -MX -MX -DG -MX -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX @@ -33325,16 +32743,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -33342,38 +32750,47 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -RL -gy -gy -RL -RL -MX RX RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +fj +fj +tV +RL +ZK +ZK +RX xd xd xd -xd -xd +RL +RL xd RX RX @@ -33399,32 +32816,33 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(160,1,1) = {" +(157,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX RX RX RX @@ -33440,17 +32858,16 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX RX RX xd @@ -33461,37 +32878,33 @@ xd xd xd RL -MX -DG -DG -DG -MX -DG -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX -DG -MX -MX -DG -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -33516,51 +32929,55 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -RL -gy -gy +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +eY +eY RL RL -RX +ZK RX RX xd @@ -33593,35 +33010,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(161,1,1) = {" +(158,1,1) = {" Md -MX -MX -MX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -33637,15 +33051,18 @@ RX RX RX RX +xd +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK RX -MX -MX -DG -DG -DG -DG -MX -MX RX xd xd @@ -33654,29 +33071,35 @@ xd xd xd xd -xd -MX -DG -DG -DG -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX -MX -MX -MX -MX -MX -MX -DG -MX -MX -MX -MX RX RX RX @@ -33706,54 +33129,48 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RL -gy +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV gy gy RL +RL RX RX RX @@ -33787,34 +33204,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(162,1,1) = {" +(159,1,1) = {" Md -MX -MX -MX -RX -RX +ZK +ZK +ZK RX RX RX @@ -33831,17 +33246,18 @@ RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -DG -MX -MX -xd xd xd xd @@ -33849,25 +33265,39 @@ xd xd xd xd -MX -DG -DG -DG -MX -MX -MX -MX -MX +RL +tV +tV +tV +tV +tV +tV +ZK +ZK +tV +tV +ZK +ZK +tV +ZK +ZK +tV +ZK +tV +ZK +ZK +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX -MX -MX -MX -MX RX RX RX @@ -33894,69 +33324,56 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX -RL -gy -gy -gy -RL -MX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +RL +gy +gy +RL +RL +ZK +RX +RX +xd +xd xd xd xd xd -xd -xd RX RX RX @@ -33981,60 +33398,35 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(163,1,1) = {" +(160,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX RX RX RX @@ -34043,22 +33435,53 @@ RX RX RX RX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX +xd +xd +xd +xd +xd +xd +xd +RL +ZK +tV +tV +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK RX RX RX @@ -34089,60 +33512,54 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX -MX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RL gy gy -gy RL -MX +RL +RX RX RX xd @@ -34175,37 +33592,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(164,1,1) = {" +(161,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -34219,36 +33631,51 @@ RX RX RX RX -xd RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK RX +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +ZK +ZK RX RX RX @@ -34278,67 +33705,57 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RL +gy +gy +gy +RL RX RX RX -RX -RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -RX -RX -RX -RX -MX -gy -gy -gy -gy -RL -MX -RX -RX xd xd xd @@ -34369,40 +33786,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(165,1,1) = {" +(162,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -34415,40 +33824,49 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +xd +xd +xd +xd +xd +xd +xd +xd +ZK +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX RX +ZK +ZK +ZK +ZK RX RX RX @@ -34475,62 +33893,61 @@ RX RX RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX -MX -MX +RL gy gy gy RL -RL -MX +ZK RX RX xd @@ -34563,32 +33980,33 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -DG -DG -DG -MX -MX -MX -MX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(166,1,1) = {" +(163,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX RX RX RX @@ -34608,36 +34026,31 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +RX RX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -34669,62 +34082,66 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX RX RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX +ZK +RL gy gy gy RL -RL -MX +ZK RX RX xd @@ -34757,33 +34174,32 @@ RX RX RX RX -MX -MX -MX -MX +ZK +ZK +ZK +ZK RL RL RL RL RL -MX -MX -MX -MX -DG -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(167,1,1) = {" +(164,1,1) = {" Md -MX -MX -MX -RX +ZK +ZK +ZK RX RX RX @@ -34804,34 +34220,34 @@ RX RX xd RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX -MX -MX -MX -DG -DG -DG -DG -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -34858,69 +34274,70 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL -gy -gy -gy -gy -RL -RL +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +ZK +gy +gy +gy +gy RL -xd -xd +ZK +RX +RX xd xd xd @@ -34951,32 +34368,34 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL +ZK +ZK +ZK +ZK RL RL RL RL RL -DG -DG -MX -MX -MX +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK Md "} -(168,1,1) = {" +(165,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX RX RX RX @@ -34995,43 +34414,39 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX @@ -35050,71 +34465,73 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX RX RX RX RX RX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -MX -MX RX RX RX RX -xd -xd -xd -xd -xd -xd -RL -RL +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +ZK +ZK gy gy -RL gy RL RL -xd -xd -xd +ZK +RX +RX xd xd xd @@ -35145,40 +34562,32 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL +ZK +ZK +ZK +ZK RL RL RL RL RL -DG -DG -MX -MX -MX +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK Md "} -(169,1,1) = {" +(166,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -35190,131 +34599,51 @@ RX RX RX RX -xd RX RX RX RX RX -MX -MX -MX -DG -DG -DG -MX RX RX RX RX +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK RX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -MX -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX RX RX -xd -xd -xd -xd -xd -RL -RL -RL -gy -RL -RL -gy -RL -RL -xd -xd -xd -xd -xd -xd -xd -xd -xd RX RX RX @@ -35339,33 +34668,45 @@ RX RX RX RX -MX -MX -MX -MX -RL -RL -RL -RL -RL -RL -RL -RL -RL -RL -DG -DG -MX -MX -MX -Md -"} -(170,1,1) = {" -Md -MX -MX -MX -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK RX RX RX @@ -35375,8 +34716,22 @@ RX RX RX RX +ZK +ZK +gy +gy +gy +RL +RL +ZK RX RX +xd +xd +xd +xd +xd +xd RX RX RX @@ -35384,79 +34739,49 @@ RX RX RX RX -xd RX RX RX RX RX RX -MX -MX -MX -DG -DG -MX -MX RX RX RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX RX RX +ZK +ZK +ZK +ZK +RL +RL +RL +RL +RL +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +Md +"} +(167,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -35476,39 +34801,37 @@ RX RX RX RX +xd RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX RX RX RX RX RX +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX -xd -xd -xd -xd -xd -RL -RL -Lc -gy -RL -RL -gy -RL -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd RX RX RX @@ -35534,6 +34857,49 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -35542,23 +34908,24 @@ xd xd xd xd +xd RL RL +gy +gy +gy +gy RL RL RL -DG -DG -MX -MX -MX -Md -"} -(171,1,1) = {" -Md -MX -MX -MX +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -35583,66 +34950,40 @@ RX RX RX RX +ZK +ZK +ZK +ZK +RL +RL +RL +RL +RL +RL +RL +RL +RL +RL +tV +tV +ZK +ZK +ZK +Md +"} +(168,1,1) = {" +Md +ZK +ZK +ZK RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX RX RX RX -MX -MX -MX -DG -MX -DG -DG -DG -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -35660,50 +35001,36 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX RX RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -xd -xd -xd -xd -xd -RL -RL -RL -gy -RL -gy -gy -RL -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -RX +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -35722,11 +35049,50 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -35736,26 +35102,24 @@ xd xd xd xd +xd RL RL +gy +gy RL +gy RL RL -DG -DG -MX -MX -MX -Md -"} -(172,1,1) = {" -Md -MX -MX -MX -RX -RX -RX +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -35779,62 +35143,35 @@ RX RX RX RX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX -MX RX +ZK +ZK +ZK +ZK +RL +RL +RL +RL +RL +RL +RL +RL +RL +RL +tV +tV +ZK +ZK +ZK +Md +"} +(169,1,1) = {" +Md +ZK +ZK +ZK RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -MX -MX RX RX RX @@ -35852,16 +35189,85 @@ RX RX RX RX +xd RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +ZK +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -35869,6 +35275,17 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -35883,10 +35300,11 @@ RL RL RL gy -gy -gy +RL +RL gy RL +RL xd xd xd @@ -35896,10 +35314,6 @@ xd xd xd xd -xd -RX -RX -RX RX RX RX @@ -35924,44 +35338,32 @@ RX RX RX RX -RX -xd -xd -xd -xd -xd +ZK +ZK +ZK +ZK +RL +RL RL RL RL RL RL -DG -DG -MX -MX -MX +RL +RL +RL +tV +tV +ZK +ZK +ZK Md "} -(173,1,1) = {" +(170,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -35973,61 +35375,9 @@ RX RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX -MX -MX -MX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -DG -MX -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -36040,6 +35390,80 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +ZK +ZK +RX +RX +RX +RX +RX +RX +ZK +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -36053,13 +35477,6 @@ RX RX RX RX -RX -RX -RX -RX -RX -xd -xd RX RX RX @@ -36071,16 +35488,16 @@ RX xd xd xd +xd +xd RL RL +Lc +gy RL RL -RL -gy -gy gy RL -RL xd xd xd @@ -36129,28 +35546,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK Md "} -(174,1,1) = {" +(171,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -36169,15 +35576,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX -MX -MX RX RX RX @@ -36186,47 +35584,66 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -DG -DG -DG -DG -DG -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +ZK +tV +ZK +tV +tV +tV +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -xd RX RX RX @@ -36264,17 +35681,17 @@ RX RX xd xd -RL -RL +xd +xd +xd RL RL RL gy +RL gy gy RL -RL -xd xd xd xd @@ -36323,55 +35740,24 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK Md "} -(175,1,1) = {" +(172,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX RX RX RX -MX -DG -DG -DG -DG -DG -MX -MX RX RX RX @@ -36389,36 +35775,67 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -MX -MX -MX -MX -MX -MX -MX RX RX RX +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +ZK +ZK RX RX -xd -xd RX RX RX @@ -36458,17 +35875,17 @@ RX RX xd xd -RL -RL +xd +xd +xd RL RL RL gy gy +gy +gy RL -RL -RL -xd xd xd xd @@ -36517,28 +35934,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +ZK +ZK +ZK Md "} -(176,1,1) = {" +(173,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -36558,14 +35965,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -DG -MX RX RX RX @@ -36573,14 +35972,67 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +tV +ZK +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX RX RX +xd RX RX RX @@ -36593,10 +36045,6 @@ RX RX RX RX -MX -MX -MX -MX RX RX RX @@ -36619,37 +36067,8 @@ RX RX RX RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +xd +xd xd RL RL @@ -36671,8 +36090,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -36711,55 +36128,21 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(177,1,1) = {" +(174,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX -MX -MX -MX -DG -DG -DG -DG -MX RX RX RX @@ -36785,6 +36168,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +ZK +ZK +ZK RX RX RX @@ -36796,19 +36188,44 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +tV +tV +tV +tV +tV +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX RX RX xd -xd -RX -RX -RX -RX -RX -RX RX RX RX @@ -36845,6 +36262,8 @@ RX RX RX xd +xd +RL RL RL RL @@ -36854,8 +36273,6 @@ gy gy RL RL -RL -xd xd xd xd @@ -36905,27 +36322,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(178,1,1) = {" +(175,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX -RX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -36947,13 +36355,6 @@ RX RX RX RX -MX -MX -DG -DG -DG -MX -MX RX RX RX @@ -36962,7 +36363,14 @@ RX RX RX RX -bG +ZK +tV +tV +tV +tV +tV +ZK +ZK RX RX RX @@ -36980,6 +36388,26 @@ RX RX RX RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK +ZK +ZK +ZK +ZK +ZK RX RX RX @@ -36987,17 +36415,9 @@ RX RX RX RX -xd RX xd xd -xd -xd -xd -xd -RX -RX -RX RX RX RX @@ -37035,14 +36455,13 @@ RX RX RX RX -RX -RX -RX -RL +xd +xd +RL +RL RL RL RL -gy gy gy RL @@ -37059,8 +36478,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37099,18 +36516,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(179,1,1) = {" +(176,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37140,16 +36557,15 @@ RX RX RX RX +ZK +ZK +tV +tV +tV +ZK +tV +ZK RX -MX -MX -MX -DG -DG -MX -MX -gy -MX RX RX RX @@ -37174,12 +36590,14 @@ RX RX RX RX -xd RX -xd RX -xd -xd +ZK +ZK +ZK +ZK +RX +RX RX RX RX @@ -37190,6 +36608,8 @@ RX RX RX RX +xd +xd RX RX RX @@ -37230,7 +36650,6 @@ RX RX RX xd -MX RL RL RL @@ -37238,7 +36657,7 @@ RL RL gy gy -RL +gy RL RL xd @@ -37253,8 +36672,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37293,18 +36710,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(180,1,1) = {" +(177,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37334,18 +36751,15 @@ RX RX RX RX +ZK +ZK +ZK +tV +tV +tV +tV +ZK RX -MX -MX -gy -eY -fj -fj -eY -gy -gy -ax -ax RX RX RX @@ -37386,6 +36800,15 @@ RX RX RX RX +xd +xd +RX +RX +RX +RX +RX +RX +RX RX RX RX @@ -37421,11 +36844,7 @@ RX RX RX xd -xd -MX -MX -MX -MX +RL RL RL RL @@ -37447,8 +36866,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37487,18 +36904,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(181,1,1) = {" +(178,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37529,18 +36946,14 @@ RX RX RX RX -ax -gy -gy -eY -fj -fj -eY -gy -gy -ax -ax -ax +ZK +ZK +tV +tV +tV +ZK +ZK +RX RX RX RX @@ -37548,6 +36961,8 @@ RX RX RX RX +bG +RX RX RX RX @@ -37571,7 +36986,14 @@ RX RX RX RX +xd RX +xd +xd +xd +xd +xd +xd RX RX RX @@ -37613,15 +37035,12 @@ RX RX RX RX -xd RX RX -MX -MX -MX RL -MX -gy +RL +RL +RL gy gy gy @@ -37641,8 +37060,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -37681,18 +37098,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(182,1,1) = {" +(179,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37722,16 +37139,17 @@ RX RX RX RX -ax -ax -gy +RX +ZK +ZK +ZK +tV +tV +ZK +ZK gy -MX -MX -DG -DG -MX -MX +ZK +RX RX RX RX @@ -37739,7 +37157,6 @@ RX RX RX RX -bG RX RX RX @@ -37756,8 +37173,12 @@ RX RX RX RX +xd RX +xd RX +xd +xd RX RX RX @@ -37808,17 +37229,14 @@ RX RX RX xd -RX -MX -MX +ZK +RL +RL +RL +RL RL -MX -MX -MX -MX gy gy -MX RL RL RL @@ -37836,7 +37254,6 @@ xd xd xd xd -xd RX RX RX @@ -37875,18 +37292,18 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(183,1,1) = {" +(180,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -37901,7 +37318,6 @@ RX RX RX RX -xd RX RX RX @@ -37915,18 +37331,20 @@ RX RX RX RX +RX +RX +RX +ZK +ZK +gy +eY +fj +fj +eY +gy +gy ax ax -ax -gy -MX -MX -MX -DG -DG -MX -MX -RX RX RX RX @@ -38002,16 +37420,17 @@ RX RX RX xd -MX -MX +xd +ZK +ZK +ZK +ZK +RL RL RL -MX -MX gy gy gy -MX RL RL RL @@ -38029,8 +37448,6 @@ xd xd xd xd -xd -xd RX RX RX @@ -38069,18 +37486,21 @@ RL RL RL RL -DG -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(184,1,1) = {" +(181,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX +RX RX RX RX @@ -38109,18 +37529,17 @@ RX RX RX ax +gy +gy +eY +fj +fj +eY +gy +gy ax ax ax -MX -MX -MX -MX -DG -DG -MX -MX -RX RX RX RX @@ -38193,23 +37612,21 @@ RX RX RX RX +xd RX RX -xd -MX -RL +ZK +ZK +ZK RL -MX -MX +ZK +gy gy gy gy -MX RL RL -xd -xd -xd +RL xd xd xd @@ -38263,18 +37680,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK Md "} -(185,1,1) = {" +(182,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -38294,27 +37711,26 @@ RX RX RX RX -xd RX RX -xd RX -xd -xd RX RX -PP RX RX RX RX -MX -MX -DG -DG -DG -MX RX +ax +ax +gy +gy +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -38322,6 +37738,11 @@ RX RX RX RX +bG +RX +RX +RX +RX RX RX RX @@ -38353,9 +37774,7 @@ RX RX RX RX -xd RX -xd RX RX RX @@ -38389,21 +37808,19 @@ RX RX xd RX +ZK +ZK RL -MX -MX -MX -MX -MX -MX +ZK +ZK +ZK +ZK +gy gy -MX -MX +ZK +RL RL RL -xd -xd -xd xd xd xd @@ -38457,18 +37874,21 @@ RL RL RL RL -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(186,1,1) = {" +(183,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK +RX +RX +RX RX RX RX @@ -38480,6 +37900,7 @@ RX RX RX RX +xd RX RX RX @@ -38493,6 +37914,17 @@ RX RX RX RX +ax +ax +ax +gy +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX RX @@ -38502,13 +37934,6 @@ RX RX RX RX -MX -MX -MX -DG -MX -MX -xd RX RX RX @@ -38542,20 +37967,13 @@ RX RX RX RX -xd -xd -xd -xd RX RX RX RX RX -xd RX -xd RX -xd RX RX RX @@ -38582,21 +38000,20 @@ RX RX RX RX -MX -MX +xd +ZK +ZK +RL RL -MX -MX +ZK +ZK gy -MX gy gy -MX +ZK +RL RL RL -xd -xd -xd xd xd xd @@ -38651,22 +38068,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +tV +tV +tV +ZK +ZK Md "} -(187,1,1) = {" +(184,1,1) = {" Md -MX -MX -MX -RX -RX -RX -RX +ZK +ZK +ZK RX RX RX @@ -38694,18 +38107,23 @@ RX RX RX RX +ax +ax +ax +ax +ZK +ZK +ZK +ZK +tV +tV +ZK +ZK RX RX -MX -MX -MX -DG -DG -MX RX RX RX -xd RX RX RX @@ -38776,19 +38194,18 @@ RX RX RX RX -MX +xd +ZK RL -MX -MX -gy +RL +ZK +ZK gy gy gy -MX -MX -xd -xd -xd +ZK +RL +RL xd xd xd @@ -38845,18 +38262,18 @@ RL RL RL RL -MX -DG -DG -MX -MX +ZK +tV +tV +ZK +ZK Md "} -(188,1,1) = {" +(185,1,1) = {" Md -MX -MX -MX +ZK +ZK +ZK RX RX RX @@ -38876,26 +38293,32 @@ RX RX RX RX +xd RX RX +xd RX +xd +xd RX RX +PP RX RX RX RX +ZK +ZK +tV +tV +tV +ZK RX RX RX RX RX RX -MX -MX -MX -DG -MX RX RX RX @@ -38904,15 +38327,11 @@ RX RX RX RX -xd RX RX RX -xd RX -xd RX -xd RX RX RX @@ -38933,7 +38352,9 @@ RX RX RX RX +xd RX +xd RX RX RX @@ -38965,20 +38386,41 @@ RX RX RX RX +xd RX +RL +ZK +ZK +ZK +ZK +ZK +ZK +gy +ZK +ZK +RL +RL +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX -MX -MX -MX -MX -gy -gy -gy -MX -MX -MX RX RX RX @@ -39004,6 +38446,28 @@ RX RX RX RX +xd +xd +xd +xd +xd +RL +RL +RL +RL +RL +ZK +tV +tV +ZK +ZK +Md +"} +(186,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -39034,26 +38498,16 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -DG -DG -DG -MX -Md -"} -(189,1,1) = {" -Md -MX -MX -MX RX RX RX +ZK +ZK +ZK +tV +ZK +ZK +xd RX RX RX @@ -39085,20 +38539,22 @@ RX RX RX RX -MX -MX -MX -MX -MX RX RX +xd +xd +xd +xd RX RX RX RX RX +xd RX +xd RX +xd RX RX RX @@ -39125,6 +38581,37 @@ RX RX RX RX +ZK +ZK +RL +ZK +ZK +gy +ZK +gy +gy +ZK +RL +RL +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -39153,6 +38640,28 @@ RX RX RX RX +xd +xd +xd +xd +xd +RL +RL +RL +RL +RL +ZK +tV +tV +ZK +ZK +Md +"} +(187,1,1) = {" +Md +ZK +ZK +ZK RX RX RX @@ -39162,17 +38671,141 @@ RX RX RX RX -MX -MX -MX -MX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +tV +ZK +RX +RX +RX +xd +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +RL +ZK +ZK gy gy gy -MX -MX -MX -MX +gy +ZK +ZK +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd RX RX RX @@ -39189,636 +38822,1002 @@ RX RX RX RX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -Md -"} -(190,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -gy -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -DG -DG -DG -MX -Md -"} -(191,1,1) = {" -Md -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -RL -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -MX -DG -MX -MX -DG -MX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +xd +xd +xd +xd +xd +RL +RL +RL +RL +RL +ZK +tV +tV +ZK +ZK Md "} -(192,1,1) = {" +(188,1,1) = {" Md ZK -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT -lT +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +tV +ZK +RX +RX +RX +RX +RX +RX +RX +RX +xd +RX +RX +RX +xd +RX +xd +RX +xd +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +ZK +Md +"} +(189,1,1) = {" +Md +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +gy +gy +gy +ZK +ZK +ZK +ZK +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +Md +"} +(190,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +gy +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +tV +tV +tV +ZK +Md +"} +(191,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +RL +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK tV -lT -lT +ZK +ZK tV -lT +ZK +Md +"} +(192,1,1) = {" +Md +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +ZK +tV +ZK +ZK +tV +ZK Md "} diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm index e48f0e6335..e001226868 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm @@ -697,7 +697,9 @@ /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/bunker/kitchen) "es" = ( -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 112 + }, /turf/simulated/mineral/floor/cave{ name = "dirt" }, @@ -1191,7 +1193,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/bunk) "ik" = ( @@ -1252,7 +1254,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/engi) "iF" = ( @@ -1359,7 +1361,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/mineyard) "jD" = ( @@ -1548,8 +1550,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /turf/simulated/floor/wood/broken, @@ -1579,8 +1580,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /obj/structure/cable/cyan{ @@ -2536,7 +2536,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /mob/living/simple_mob/animal/roach/jaeger, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker) @@ -3641,7 +3641,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/aa) "Eq" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -3650,8 +3650,7 @@ }, /area/tether_away/beach/resort/bunk) "Ew" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/closet/cabinet{ @@ -3940,7 +3939,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) "Ho" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -3995,7 +3994,7 @@ /area/tether_away/beach/mineyard) "HH" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/asteroid_steel{ outdoors = 1 }, @@ -4061,8 +4060,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -4142,7 +4140,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/structure/flora/pottedplant/dead, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/resort/lockermed) @@ -4546,7 +4544,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /obj/structure/table/standard, /obj/item/storage/box/donkpockets{ pixel_x = 2; @@ -4715,7 +4713,7 @@ }, /area/tether_away/beach/station/tram) "OE" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -5069,8 +5067,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -5113,7 +5110,7 @@ /area/tether_away/beach/desalinator) "Se" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/bunker/restroom) "Sl" = ( @@ -5246,8 +5243,7 @@ /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/bunker/restroom) "Tp" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable, @@ -5472,7 +5468,7 @@ /area/tether_away/beach/jungle) "VU" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/janitor) "Wc" = ( @@ -5634,7 +5630,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/table/woodentable, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/mess) diff --git a/maps/sectors/mining_140/levels/mining_140.dmm b/maps/sectors/mining_140/levels/mining_140.dmm index e9d07d1098..3933183aaa 100644 --- a/maps/sectors/mining_140/levels/mining_140.dmm +++ b/maps/sectors/mining_140/levels/mining_140.dmm @@ -16,7 +16,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "mining_planet"; - layer = 3.3; name = "Mining Dock Controller"; pixel_y = 30 }, diff --git a/maps/sectors/mining_192/levels/mining_192.dmm b/maps/sectors/mining_192/levels/mining_192.dmm index 14dd20f249..9ecc891bb6 100644 --- a/maps/sectors/mining_192/levels/mining_192.dmm +++ b/maps/sectors/mining_192/levels/mining_192.dmm @@ -30,7 +30,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "mining_planet"; - layer = 3.3; name = "Mining Dock Controller"; pixel_y = 30 }, diff --git a/maps/sectors/piratebase_140/levels/piratebase_140.dmm b/maps/sectors/piratebase_140/levels/piratebase_140.dmm index 0919c6894e..e69c9fe43e 100644 --- a/maps/sectors/piratebase_140/levels/piratebase_140.dmm +++ b/maps/sectors/piratebase_140/levels/piratebase_140.dmm @@ -18,7 +18,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "pirate_docker"; - layer = 3.3; name = "Belting Dock Controller"; pixel_y = 30; req_one_access = null @@ -896,11 +895,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/reinforced, /area/shuttle/pirate/deck) "Pr" = ( diff --git a/maps/sectors/piratebase_192/levels/piratebase_192.dmm b/maps/sectors/piratebase_192/levels/piratebase_192.dmm index e79aef7ce0..2121c4b02e 100644 --- a/maps/sectors/piratebase_192/levels/piratebase_192.dmm +++ b/maps/sectors/piratebase_192/levels/piratebase_192.dmm @@ -141,10 +141,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -156,6 +152,9 @@ name = "Bunks"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/red, /area/piratebase/bunks) "bt" = ( @@ -419,8 +418,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 24; req_access = list(168) @@ -520,7 +518,7 @@ /area/shuttle/pirate/deck) "eC" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 26; pixel_y = -6; @@ -683,6 +681,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/sickbay) "gg" = ( @@ -935,6 +936,12 @@ }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) +"iT" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/halls) "jf" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -986,8 +993,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -1035,6 +1041,15 @@ }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) +"jT" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/piratebase/mess) "jX" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -1206,9 +1221,6 @@ /turf/simulated/mineral/floor/vacuum, /area/piratebase/atmospherics) "lk" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1218,6 +1230,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(168) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/halls) "lv" = ( @@ -1567,8 +1580,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 24; req_access = list(168) @@ -1667,6 +1679,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) "oV" = ( @@ -1687,7 +1702,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /turf/simulated/floor/tiled/steel_dirty/yellow, @@ -1740,6 +1755,9 @@ /area/piratebase/captain) "pD" = ( /obj/effect/floor_decal/rust, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/atmospherics) "pG" = ( @@ -1813,10 +1831,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/mess) "qq" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -1828,6 +1842,9 @@ name = "Sickbay"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/sickbay) "qs" = ( @@ -1929,7 +1946,7 @@ /area/piratebase/sickbay) "ru" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; pixel_x = 8; pixel_y = -26; @@ -2169,7 +2186,7 @@ /area/piratebase/power) "tG" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 1; frequency = 1380; pixel_x = -26; @@ -2209,6 +2226,10 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/halls) +"uc" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/halls) "up" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2577,6 +2598,12 @@ }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/power) +"ye" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/bunks) "yh" = ( /obj/effect/floor_decal/rust, /obj/machinery/air_alarm/alarms_hidden{ @@ -2654,7 +2681,7 @@ /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/brig) "yK" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /obj/structure/cable/yellow{ @@ -2809,7 +2836,7 @@ /turf/simulated/floor/reinforced, /area/piratebase/vault) "zV" = ( -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /obj/structure/cable/yellow, @@ -2898,9 +2925,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(168) }, /turf/simulated/floor/tiled/steel_dirty/dark, @@ -2933,7 +2958,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 4; pixel_x = 8; pixel_y = -26; @@ -3139,9 +3164,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/sickbay) @@ -3874,10 +3898,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/pirate/bridge) "It" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -3889,6 +3909,9 @@ name = "Head"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/bunks) "Ix" = ( @@ -3977,7 +4000,7 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump{ +/obj/machinery/power/apc/alarms_hidden/east_mount{ req_access = list(168) }, /obj/item/radio/intercom/raider{ @@ -3993,15 +4016,14 @@ /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mess) "JH" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Mining Operations"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) "JM" = ( @@ -4063,9 +4085,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(168) }, /turf/simulated/floor/reinforced, @@ -4083,6 +4103,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) +"KJ" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/piratebase/bunks) "KN" = ( /obj/machinery/light{ dir = 8 @@ -4181,8 +4207,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -4334,6 +4359,10 @@ }, /turf/simulated/floor, /area/shuttle/pirate/engine) +"MT" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_dirty/silver, +/area/piratebase/mining) "MU" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 @@ -4454,10 +4483,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -4468,6 +4493,9 @@ dir = 4; name = "Atmospherics" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/atmospherics) "Ot" = ( @@ -4515,8 +4543,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -4669,14 +4696,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/halls) "Qu" = ( @@ -4757,7 +4783,7 @@ "QM" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; pixel_x = -8; pixel_y = -26; @@ -4786,15 +4812,13 @@ "QW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(168) - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(168) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/mining) "QX" = ( @@ -4900,6 +4924,9 @@ /area/piratebase/mess) "Sb" = ( /obj/effect/floor_decal/rust, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/construction) "Sh" = ( @@ -4929,6 +4956,9 @@ /area/piratebase/brig) "Sp" = ( /obj/structure/curtain/medical, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/sickbay) "Ss" = ( @@ -5111,8 +5141,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -5176,7 +5205,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 1; pixel_x = -26; req_access = list(168) @@ -5299,10 +5328,6 @@ /turf/simulated/floor/tiled/steel_dirty/dark, /area/piratebase/dock) "Wd" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -5314,6 +5339,9 @@ name = "Mess Hall"; req_access = list(168) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty, /area/piratebase/mess) "Wf" = ( @@ -5352,8 +5380,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 24; req_access = list(168) @@ -5471,10 +5498,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(168) - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -5485,6 +5508,9 @@ dir = 4; name = "DECOMMISSIONED" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/silver, /area/piratebase/construction) "Xy" = ( @@ -5558,7 +5584,7 @@ /area/piratebase/mining) "XV" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; pixel_x = 26; req_access = list(168) }, @@ -5632,8 +5658,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(168) @@ -5654,7 +5679,7 @@ req_access = list(168) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 4; pixel_x = -5; pixel_y = -26; @@ -24351,7 +24376,7 @@ tV Uf kc Uf -Uf +uc Uf pY Fn @@ -25710,7 +25735,7 @@ Rp Fn Fn Fn -Uf +iT Qn Fn Fn @@ -25718,7 +25743,7 @@ Fn Fn Fn Fn -Uj +jT Wd Fn Fn @@ -25882,7 +25907,7 @@ lO gq ww RN -gq +MT Hn gq BB @@ -26874,7 +26899,7 @@ Rp Fn Fn Fn -HB +ye bn Fn Fn @@ -28232,7 +28257,7 @@ ON ON ON ON -Ib +KJ It ON ON diff --git a/maps/sectors/tradeport_140/levels/tradeport_140.dmm b/maps/sectors/tradeport_140/levels/tradeport_140.dmm index 08804e8637..487df665ba 100644 --- a/maps/sectors/tradeport_140/levels/tradeport_140.dmm +++ b/maps/sectors/tradeport_140/levels/tradeport_140.dmm @@ -1022,7 +1022,7 @@ /area/tradeport/safarizoo) "dC" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = -25; @@ -1238,9 +1238,8 @@ "es" = ( /obj/machinery/light, /obj/structure/flora/pottedplant/drooping, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) @@ -1566,9 +1565,6 @@ /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) "fN" = ( -/obj/machinery/door/firedoor/multi_tile{ - req_one_access = list(160) - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/multi_tile/glass{ @@ -1578,6 +1574,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) "fP" = ( @@ -1861,7 +1858,7 @@ /area/tradeport/facility) "gS" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = 25; @@ -1951,7 +1948,7 @@ pixel_x = 30; req_access = list(160) }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderstardoor"; pixel_x = -8; pixel_y = -23 @@ -2038,7 +2035,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 5; pixel_y = 25; @@ -2121,13 +2118,11 @@ /turf/simulated/floor/airless, /area/space) "ie" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/wall, /area/tradeport/commons) @@ -2325,8 +2320,7 @@ /turf/simulated/shuttle/plating, /area/shuttle/trade_ship/general) "iU" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(160) @@ -2352,10 +2346,8 @@ "iW" = ( /obj/structure/cable/yellow, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor, @@ -2368,9 +2360,7 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /turf/simulated/floor/tiled/neutral, @@ -3347,9 +3337,7 @@ /turf/simulated/floor/grass, /area/tradeport/safarizoo) "mK" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -3393,7 +3381,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = 25; @@ -3870,7 +3858,6 @@ "os" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_inbound"; - layer = 3.3; name = "inbound conveyor"; pixel_y = 8 }, @@ -4725,7 +4712,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = -25; @@ -4985,10 +4972,8 @@ /obj/machinery/vending/nifsoft_shop{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor/tiled/old_tile/blue, @@ -5140,9 +5125,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) @@ -5259,7 +5243,7 @@ pixel_x = 34; pixel_y = 3 }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderportdoor"; pixel_x = -8; pixel_y = 23 @@ -5557,16 +5541,9 @@ /turf/simulated/floor/tiled/freezer, /area/tradeport) "uF" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tradeport/spine) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/old_tile/red, +/area/tradeport) "uG" = ( /obj/structure/window/reinforced, /turf/simulated/floor/snow, @@ -5615,9 +5592,8 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -6022,7 +5998,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 25; pixel_y = 5; @@ -6079,7 +6055,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/tradeport) "ww" = ( @@ -6354,7 +6330,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; pixel_x = -10; pixel_y = 25; req_access = list(160) @@ -6372,9 +6348,7 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/rust, @@ -7033,9 +7007,7 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/corner/blue/border, @@ -7592,9 +7564,8 @@ /turf/simulated/floor/reinforced, /area/tradeport/pads) "BZ" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) @@ -7911,7 +7882,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -5; pixel_y = -25; @@ -8289,8 +8260,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow{ @@ -8419,8 +8389,7 @@ /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) "Fw" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -9104,9 +9073,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, /turf/simulated/floor/carpet/blue, /area/tradeport/commons) @@ -9727,7 +9695,6 @@ "KY" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_outbound"; - layer = 3.3; name = "outbound conveyor"; pixel_y = 8 }, @@ -10281,9 +10248,7 @@ /turf/simulated/floor/airless, /area/space) "MV" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -10622,7 +10587,7 @@ name = "Nebula Gas - Employees Only" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -6; pixel_y = 25; @@ -10787,9 +10752,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "OT" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -10992,8 +10955,7 @@ /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) "PQ" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -11219,9 +11181,7 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/shuttle/trade_ship/cockpit) "QF" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -11459,18 +11419,14 @@ /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/spine) "Rm" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, /turf/simulated/floor/wood, /area/tradeport/cyndi) "Ro" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -11538,15 +11494,14 @@ /area/tradeport/commons) "RH" = ( /obj/item/stool/padded, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, /obj/item/toy/plushie/squid/blue, /obj/landmark/spawnpoint/job/trader, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) "RJ" = ( @@ -13001,6 +12956,9 @@ /area/tradeport/atmospherics) "Xo" = ( /obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) "Xt" = ( @@ -13492,10 +13450,8 @@ /turf/simulated/floor/wood, /area/tradeport/cyndishow) "Zg" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /obj/structure/cable/yellow, @@ -13659,7 +13615,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; pixel_x = 10; pixel_y = -25; req_access = list(160) @@ -13696,9 +13652,7 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "ZZ" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -22999,7 +22953,7 @@ sm sm GT fE -uF +zd zd zd zd @@ -23010,7 +22964,7 @@ Xt zd zd zd -uF +zd fE Mq sm @@ -27827,7 +27781,7 @@ Tk Tk GT fE -uF +zd lm zd hC @@ -27838,7 +27792,7 @@ Xt mZ zd lm -uF +zd fE Pf rX @@ -29388,7 +29342,7 @@ lA VZ EP LP -EP +uF AV Ag vs diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm index c653fb3244..1eca98de80 100644 --- a/maps/sectors/tradeport_192/levels/tradeport_192.dmm +++ b/maps/sectors/tradeport_192/levels/tradeport_192.dmm @@ -2058,10 +2058,8 @@ /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) "hr" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /obj/structure/cable/yellow, @@ -2286,8 +2284,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -2669,7 +2666,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 5; pixel_y = 25; @@ -3143,15 +3140,16 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) "lg" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 }, -/turf/simulated/wall, +/turf/simulated/floor/carpet, /area/tradeport/commons) "lh" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -3287,7 +3285,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -5; pixel_y = -25; @@ -3389,17 +3387,14 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/tradeport/atmospherics) "lX" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -3536,8 +3531,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/shuttle/floor/white, @@ -3676,7 +3670,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; pixel_x = 10; pixel_y = -25; req_access = list(160) @@ -5203,7 +5197,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; pixel_x = -10; pixel_y = 25; req_access = list(160) @@ -5453,9 +5447,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) "uf" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -6563,7 +6555,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = 25; @@ -6674,7 +6666,7 @@ pixel_x = 34; pixel_y = 3 }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderportdoor"; pixel_x = -8; pixel_y = 23 @@ -6794,15 +6786,14 @@ /area/shuttle/trade_ship/cockpit) "yI" = ( /obj/item/stool/padded, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, /obj/item/toy/plushie/squid/blue, /obj/landmark/spawnpoint/job/trader, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) "yJ" = ( @@ -6864,7 +6855,7 @@ pixel_x = 30; req_access = list(160) }, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "traderstardoor"; pixel_x = -8; pixel_y = -23 @@ -6978,8 +6969,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(160) @@ -7105,7 +7095,7 @@ /area/shuttle/trade_ship/general) "zH" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = 25; @@ -7245,9 +7235,7 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/effect/floor_decal/corner/blue/border, @@ -7325,8 +7313,7 @@ /turf/simulated/floor/tiled/asteroid_steel/airless, /area/tradeport/pads) "AG" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/shuttle/floor/white, @@ -7407,7 +7394,7 @@ name = "Nebula Gas - Employees Only" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; pixel_x = -6; pixel_y = 25; @@ -7443,9 +7430,7 @@ /turf/simulated/floor/tiled/freezer, /area/tradeport) "Ba" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -7569,7 +7554,7 @@ /area/tradeport/atmospherics) "Bq" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 8018; master_tag = "trade_space_lock"; pixel_x = -25; @@ -7678,8 +7663,7 @@ /turf/simulated/wall/r_wall, /area/tradeport/pads) "BK" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/green{ @@ -7838,7 +7822,6 @@ "Ci" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_outbound"; - layer = 3.3; name = "outbound conveyor"; pixel_y = 8 }, @@ -7969,8 +7952,7 @@ /turf/simulated/floor, /area/tradeport/pads) "CK" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ name = "north bump"; pixel_y = 28; req_access = list(160) @@ -8560,8 +8542,7 @@ "EX" = ( /obj/machinery/light, /obj/structure/flora/pottedplant/drooping, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -9023,7 +9004,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tradeport_hangar_dock"; pixel_x = -25; @@ -9606,8 +9587,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/carpet/blue, @@ -9709,10 +9689,8 @@ /obj/machinery/vending/nifsoft_shop{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor/tiled/old_tile/blue, @@ -9800,8 +9778,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow{ @@ -10206,9 +10183,7 @@ dir = 8 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /turf/simulated/floor/tiled/neutral, @@ -10317,9 +10292,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "LI" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -10734,7 +10707,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; pixel_x = 25; pixel_y = 5; @@ -11182,9 +11155,7 @@ /turf/simulated/floor/tiled/old_cargo/beige, /area/tradeport/atmospherics) "OG" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -12089,9 +12060,7 @@ /turf/simulated/floor/outdoors/dirtlight, /area/tradeport/cyndishow) "RG" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -13305,7 +13274,6 @@ "Wf" = ( /obj/machinery/conveyor_switch/oneway{ id = "spine_inbound"; - layer = 3.3; name = "inbound conveyor"; pixel_y = 8 }, @@ -13321,7 +13289,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/tradeport) "Wj" = ( @@ -13546,9 +13514,7 @@ /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) "Xd" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -13899,10 +13865,8 @@ "Yu" = ( /obj/structure/cable/yellow, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/alarms_hidden/south_mount{ cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -28; req_access = list(160) }, /turf/simulated/floor, @@ -13990,9 +13954,7 @@ /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) "YF" = ( -/obj/machinery/power/apc/alarms_hidden{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/alarms_hidden/south_mount{ req_access = list(160) }, /obj/structure/cable/yellow, @@ -42575,7 +42537,7 @@ PJ NQ nq tu -lg +tu cA tu tu @@ -43945,7 +43907,7 @@ GO fE Rv Hq -iq +lg nq rf Ym diff --git a/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm b/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm index a4497e36db..6705323243 100644 --- a/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm +++ b/maps/sectors/virgo2_140/levels/virgo2_140_aerostat.dmm @@ -295,12 +295,9 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ alarms_hidden = 1; cell_type = /obj/item/cell/high/empty; - dir = 4; - name = "east bump"; - pixel_x = 28; req_access = list() }, /turf/simulated/floor/bluegrid/virgo2, diff --git a/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm b/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm index b57aca7451..22989556e1 100644 --- a/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm +++ b/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm @@ -637,8 +637,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/lockermed) "kk" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /obj/structure/cable/cyan{ @@ -702,8 +701,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /turf/simulated/floor/wood, @@ -719,8 +717,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 8; +/obj/machinery/air_alarm/alarms_hidden/west_mount{ pixel_x = -27 }, /obj/structure/cable/cyan{ @@ -736,8 +733,7 @@ /turf/simulated/floor/outdoors/beach/sand/desert, /area/tether_away/beach/resort) "mb" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ pixel_y = 26 }, /obj/structure/cable/cyan{ @@ -1421,8 +1417,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -1776,8 +1771,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ pixel_y = 26 }, /obj/structure/table/woodentable, @@ -1820,8 +1814,7 @@ pixel_y = 20; wall_mounted = 1 }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable/cyan{ @@ -1891,8 +1884,7 @@ /turf/simulated/floor/water, /area/tether_away/beach/cavebase) "Tp" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/air_alarm/alarms_hidden/east_mount{ pixel_x = 22 }, /obj/structure/cable, diff --git a/maps/sectors/wasteland_140/levels/wasteland_140.dmm b/maps/sectors/wasteland_140/levels/wasteland_140.dmm index 878402424b..74b31bf531 100644 --- a/maps/sectors/wasteland_140/levels/wasteland_140.dmm +++ b/maps/sectors/wasteland_140/levels/wasteland_140.dmm @@ -256,11 +256,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/exterior_workshop) @@ -297,11 +293,7 @@ /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_power) "lx" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange, /turf/simulated/floor/classd/indoors, /area/class_d/wildcat_mining_base/refueling_outbuilding) @@ -344,11 +336,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -436,11 +424,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/interior/main_room) @@ -517,11 +501,7 @@ /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/refueling_outbuilding) "qj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -639,11 +619,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, @@ -1033,7 +1009,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "airless"; - layer = 3.3; name = "Airless Dock Controller"; pixel_y = 30 }, @@ -1433,11 +1408,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_power) "OL" = ( diff --git a/maps/sectors/wasteland_192/levels/wasteland_192.dmm b/maps/sectors/wasteland_192/levels/wasteland_192.dmm index 07d51d5c41..8bacb72365 100644 --- a/maps/sectors/wasteland_192/levels/wasteland_192.dmm +++ b/maps/sectors/wasteland_192/levels/wasteland_192.dmm @@ -357,11 +357,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/exterior_workshop) @@ -451,11 +447,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_power) "rg" = ( @@ -506,11 +498,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, /area/class_d/wildcat_mining_base/interior/main_room) @@ -964,11 +952,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/corner_kafel/yellow/diagonal, /turf/simulated/floor/tiled/classd/indoors, @@ -1217,7 +1201,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "airless"; - layer = 3.3; name = "Airless Dock Controller"; pixel_y = 30 }, @@ -1291,11 +1274,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -1493,11 +1472,7 @@ /turf/simulated/floor/classd/indoors, /area/class_d/wildcat_mining_base/refueling_outbuilding) "SU" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange, /turf/simulated/floor/classd/indoors, /area/class_d/wildcat_mining_base/refueling_outbuilding) @@ -1604,11 +1579,7 @@ /turf/simulated/floor/classd, /area/class_d/wildcat_mining_base/exterior_workshop) "WE" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, diff --git a/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm b/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm index e924f18374..9cfd25343f 100644 --- a/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm +++ b/maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm @@ -109,7 +109,9 @@ /turf/simulated/mineral/floor/classd/indoors, /area/class_d/explored) "xj" = ( -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 666 + }, /turf/simulated/mineral/floor/classd/indoors, /area/class_d/explored/underground) "yh" = ( diff --git a/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm b/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm index a6d9330957..d404f8732c 100644 --- a/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm +++ b/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm @@ -1047,8 +1047,7 @@ /area/submap/HeadscientistHQ) "VI" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4; +/obj/machinery/power/apc/east_mount{ pixel_y = -32; req_access = null; start_charge = 0 diff --git a/maps/submaps/level_specific/debrisfield/clownship.dmm b/maps/submaps/level_specific/debrisfield/clownship.dmm index 4b76dd1056..5b3e7e9758 100644 --- a/maps/submaps/level_specific/debrisfield/clownship.dmm +++ b/maps/submaps/level_specific/debrisfield/clownship.dmm @@ -23,9 +23,7 @@ "aP" = ( /obj/item/toy/figure/clown, /obj/structure/table/bananium_reinforced, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -250,9 +248,7 @@ /area/submap/debrisfiled_vr/clownshuttle/engine) "nK" = ( /mob/living/simple_mob/humanoid/clown/commando/ranged/space, -/obj/machinery/power/apc/alarms_hidden{ - pixel_x = -28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -420,9 +416,7 @@ /turf/simulated/shuttle/floor/yellow/airless, /area/submap/debrisfiled_vr/clownshuttle/cargo) "ve" = ( -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -828,9 +822,7 @@ pixel_x = 28 }, /obj/structure/table/bananium_reinforced, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -906,9 +898,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden{ - pixel_y = 28 - }, +/obj/machinery/power/apc/alarms_hidden, /obj/structure/table/bananium_reinforced, /turf/simulated/shuttle/floor/yellow/airless, /area/submap/debrisfiled_vr/clownshuttle/engine) diff --git a/maps/submaps/level_specific/debrisfield/derelict.dmm b/maps/submaps/level_specific/debrisfield/derelict.dmm index 72685c2164..83a4475be6 100644 --- a/maps/submaps/level_specific/debrisfield/derelict.dmm +++ b/maps/submaps/level_specific/debrisfield/derelict.dmm @@ -369,10 +369,8 @@ /area/debrisfield/derelict) "bJ" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - alarms_hidden = 1; - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/south_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) @@ -549,11 +547,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/debrisfield/derelict) @@ -608,11 +603,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/greengrid/airless, /area/debrisfield/derelict) @@ -638,11 +630,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/plating/external, /area/debrisfield/derelict) diff --git a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm index 112ce7b172..a6e10fddeb 100644 --- a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm @@ -1,8 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/item/material/shard/shrapnel, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; +/obj/machinery/fire_alarm/alarms_hidden/east_mount{ pixel_x = -24 }, /turf/simulated/floor/airless, diff --git a/maps/submaps/level_specific/debrisfield_vr/derelict.dmm b/maps/submaps/level_specific/debrisfield_vr/derelict.dmm index d9ccb4de70..29e0a3e15a 100644 --- a/maps/submaps/level_specific/debrisfield_vr/derelict.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/derelict.dmm @@ -82,11 +82,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 2; - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/south_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/techfloor, /area/submap/debrisfield_vr/derelict/bridge) @@ -669,11 +666,8 @@ /area/submap/debrisfield_vr/derelict/interior) "cs" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 2; - name = "south bump"; - pixel_y = -24 +/obj/machinery/power/apc/south_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/dark, /area/submap/debrisfield_vr/derelict/interior) @@ -824,11 +818,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/tiled/dark, /area/submap/debrisfield_vr/derelict/ai_access_port) @@ -851,11 +842,8 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/plating, /area/submap/debrisfield_vr/derelict/ai_access_starboard) @@ -907,12 +895,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/greengrid, /area/submap/debrisfield_vr/derelict/ai_chamber) diff --git a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm index 3d919787d0..9f9f172923 100644 --- a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm @@ -180,10 +180,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ start_charge = 0 }, /obj/structure/cable{ @@ -593,8 +590,7 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "lV" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /obj/structure/closet/crate{ @@ -723,8 +719,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/machinery/light/flicker, @@ -732,9 +727,7 @@ /area/shuttle/gecko_cr_cockpit_wreck) "pf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -886,9 +879,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_engineering_wreck) @@ -939,10 +930,7 @@ /area/shuttle/gecko_cr_engineering_wreck) "sV" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24; +/obj/machinery/power/apc/north_mount{ start_charge = 0 }, /obj/structure/cable{ @@ -1053,9 +1041,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/railing/grey{ dir = 4 @@ -1205,9 +1191,7 @@ /area/shuttle/gecko_cr_cockpit_wreck) "yR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "yX" = ( @@ -2416,9 +2400,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/airless, /area/shuttle/gecko_cr_engineering_wreck) @@ -2446,10 +2428,7 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "Tw" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /obj/structure/bed/pod, /obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, @@ -2612,8 +2591,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/handrail{ diff --git a/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm b/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm index 1378233591..27c88e83d9 100644 --- a/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/mining_drones.dmm @@ -72,8 +72,7 @@ /turf/simulated/floor/airless, /area/submap/debrisfield_vr/mining_outpost) "o" = ( -/obj/machinery/power/apc/alarms_hidden{ - dir = 1; +/obj/machinery/air_alarm/alarms_hidden/north_mount{ pixel_y = 24 }, /obj/structure/cable{ diff --git a/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm b/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm index 047612333c..1ad03d941b 100644 --- a/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/old_teleporter.dmm @@ -18,10 +18,9 @@ /turf/simulated/floor/airless, /area/submap/debrisfield_vr/old_tele) "f" = ( -/obj/machinery/power/apc/alarms_hidden{ +/obj/machinery/power/apc/north_mount{ cell_type = null; coverlocked = 0; - dir = 1; locked = 0; opened = 1; pixel_y = 24 diff --git a/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm index ead9f574ff..895927c9fa 100644 --- a/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm @@ -68,10 +68,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24; +/obj/machinery/power/apc/north_mount{ start_charge = 0 }, /obj/structure/bed/chair/bay/chair{ @@ -158,9 +155,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24; +/obj/machinery/power/apc/south_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ @@ -291,7 +286,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_head) @@ -410,10 +405,7 @@ /obj/structure/bed/chair/bay/comfy{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28; +/obj/machinery/power/apc/west_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techmaint/airless, @@ -665,10 +657,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ density = 0; dir = 4; - icon_state = "door_open" - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 + icon_state = "open" }, /obj/structure/cable{ icon_state = "4-8" @@ -676,6 +665,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_cockpit) "ks" = ( @@ -756,7 +748,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_q2) @@ -855,7 +847,7 @@ }, /obj/machinery/door/airlock/glass_external/public{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) @@ -1082,10 +1074,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24; +/obj/machinery/power/apc/north_mount{ start_charge = 0 }, /obj/structure/bed/chair/bay/chair{ @@ -1176,6 +1165,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_engineering) "tL" = ( @@ -1287,9 +1279,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24; +/obj/machinery/power/apc/south_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ @@ -1312,7 +1302,7 @@ /obj/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external/public{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) @@ -1339,6 +1329,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_cockpit) "DK" = ( @@ -1604,7 +1597,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/voidcraft{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_galley) @@ -1736,7 +1729,7 @@ "UT" = ( /obj/machinery/door/airlock/glass_external/public{ density = 0; - icon_state = "door_open" + icon_state = "open" }, /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techmaint/airless, @@ -1748,10 +1741,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ @@ -1802,16 +1792,16 @@ /obj/machinery/door/airlock/multi_tile/metal{ density = 0; dir = 4; - icon_state = "door_open"; + icon_state = "open"; name = "Salamander Engineering Bay"; opacity = 0 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_engineering) "WP" = ( @@ -1902,10 +1892,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ start_charge = 0 }, /turf/simulated/floor/tiled/techfloor{ diff --git a/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm b/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm index 9b8feff75b..b7fbe28e9d 100644 --- a/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm @@ -290,11 +290,7 @@ /turf/simulated/floor/tiled, /area/submap/debrisfield_vr/tinyshuttle/crew) "aG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -505,11 +501,7 @@ /turf/simulated/floor/tiled/airless, /area/submap/debrisfield_vr/tinyshuttle/bridge) "aZ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/effect/debris/cleanable/dirt, /obj/machinery/light_switch{ @@ -913,11 +905,7 @@ /turf/simulated/floor/reinforced/airless, /area/submap/debrisfield_vr/tinyshuttle/hangar) "bI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/reinforced/airless, /area/submap/debrisfield_vr/tinyshuttle/hangar) @@ -955,11 +943,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/submap/debrisfield_vr/tinyshuttle/engine) "bM" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -1020,8 +1004,7 @@ /area/submap/debrisfield_vr/tinyshuttle/engine) "bS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -24 }, /obj/effect/debris/cleanable/liquid_fuel, @@ -1042,10 +1025,7 @@ /turf/simulated/shuttle/plating/airless/carry, /area/submap/debrisfield_vr/tinyshuttle/engine) "bV" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/alarms_hidden/west_mount, /turf/simulated/floor/reinforced/airless, /area/submap/debrisfield_vr/tinyshuttle/hangar) "bW" = ( diff --git a/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm b/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm index 6e8840e4eb..690b7eccf7 100644 --- a/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm +++ b/maps/submaps/level_specific/virgo2/Blackshuttledown.dmm @@ -235,11 +235,9 @@ /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aP" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; - name = "Unknown APC"; - pixel_x = -24 + name = "Unknown APC" }, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) diff --git a/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm b/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm index e147d0dc15..3ff7a669ec 100644 --- a/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm +++ b/maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm @@ -17,9 +17,8 @@ /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/CrashedSmuggler/ship) "cc" = ( -/obj/machinery/power/apc/alarms_hidden{ - cell_type = /obj/item/cell/high/empty; - pixel_x = 28 +/obj/machinery/power/apc/alarms_hidden/south_mount{ + cell_type = /obj/item/cell/high/empty }, /obj/structure/cable/cyan{ dir = 4 diff --git a/maps/submaps/level_specific/virgo2/DJOutpost1.dmm b/maps/submaps/level_specific/virgo2/DJOutpost1.dmm index 390e0c4497..5cb6f72583 100644 --- a/maps/submaps/level_specific/virgo2/DJOutpost1.dmm +++ b/maps/submaps/level_specific/virgo2/DJOutpost1.dmm @@ -170,16 +170,14 @@ "B" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/wood, diff --git a/maps/submaps/level_specific/virgo2/DoomP.dmm b/maps/submaps/level_specific/virgo2/DoomP.dmm index 6a298be75b..d367cdd4e8 100644 --- a/maps/submaps/level_specific/virgo2/DoomP.dmm +++ b/maps/submaps/level_specific/virgo2/DoomP.dmm @@ -134,11 +134,8 @@ /turf/simulated/floor/plating, /area/submap/virgo2/DoomP) "aG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "PAPC"; - pixel_x = 0; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + name = "PAPC" }, /obj/structure/cable/green{ icon_state = "0-8" diff --git a/maps/submaps/level_specific/virgo2/Epod4.dmm b/maps/submaps/level_specific/virgo2/Epod4.dmm index f6050ae72c..3609878f5f 100644 --- a/maps/submaps/level_specific/virgo2/Epod4.dmm +++ b/maps/submaps/level_specific/virgo2/Epod4.dmm @@ -42,7 +42,6 @@ pixel_y = 0 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0 diff --git a/maps/submaps/level_specific/virgo2/Lab1.dmm b/maps/submaps/level_specific/virgo2/Lab1.dmm index 463ba1bdc6..dda75b8bbd 100644 --- a/maps/submaps/level_specific/virgo2/Lab1.dmm +++ b/maps/submaps/level_specific/virgo2/Lab1.dmm @@ -117,12 +117,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/virgo2/Lab1) "u" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/hyper; - dir = 8; name = "Unknown APC"; - operating = 0; - pixel_x = -24 + operating = 0 }, /obj/structure/cable{ icon_state = "0-4" diff --git a/maps/submaps/level_specific/virgo2/Manor1.dmm b/maps/submaps/level_specific/virgo2/Manor1.dmm index bad95ce6a5..8d2b6ea957 100644 --- a/maps/submaps/level_specific/virgo2/Manor1.dmm +++ b/maps/submaps/level_specific/virgo2/Manor1.dmm @@ -446,7 +446,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/submap/virgo2/Manor1) "bO" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/holofloor/wood, /area/submap/virgo2/Manor1) "bP" = ( diff --git a/maps/submaps/level_specific/virgo2/Rockybase.dmm b/maps/submaps/level_specific/virgo2/Rockybase.dmm index 104eecfeb3..5cf8ce41d5 100644 --- a/maps/submaps/level_specific/virgo2/Rockybase.dmm +++ b/maps/submaps/level_specific/virgo2/Rockybase.dmm @@ -651,11 +651,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "Unknown APC"; - pixel_x = -24 + name = "Unknown APC" }, /turf/simulated/floor/plating/virgo2, /area/submap/virgo2/Rockybase) diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm index 25004892de..74012cbd5a 100644 --- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm +++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_1.dmm @@ -73,7 +73,7 @@ /turf/simulated/floor/lythios43c/indoors, /area/submap/lythios/west_caves/buried_structure) "nK" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ start_charge = 0 }, /obj/structure/cable{ diff --git a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm index 221cb22a3d..1480d0f9c3 100644 --- a/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm +++ b/maps/submaps/lythios_rift/caves/west_caves_buriedstructure_2.dmm @@ -43,7 +43,7 @@ /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/outside/west_caves) "A" = ( -/obj/machinery/power/apc/alarms_hidden/north_bump{ +/obj/machinery/power/apc/alarms_hidden/north_mount{ start_charge = 0 }, /turf/simulated/floor/lythios43c/indoors, diff --git a/maps/submaps/mountains/Mineshaft1.dmm b/maps/submaps/mountains/Mineshaft1.dmm index 24e3ef4b81..07a6aff45a 100644 --- a/maps/submaps/mountains/Mineshaft1.dmm +++ b/maps/submaps/mountains/Mineshaft1.dmm @@ -120,9 +120,8 @@ /turf/simulated/floor, /area/submap/cave/AMine1) "y" = ( -/obj/machinery/power/apc{ - operating = 0; - pixel_x = 31 +/obj/machinery/power/apc/south_mount{ + operating = 0 }, /turf/simulated/floor, /area/submap/cave/AMine1) diff --git a/maps/submaps/mountains/Rockb1.dmm b/maps/submaps/mountains/Rockb1.dmm index ef20b4734f..6463cee7ab 100644 --- a/maps/submaps/mountains/Rockb1.dmm +++ b/maps/submaps/mountains/Rockb1.dmm @@ -144,11 +144,8 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - operating = 0; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + operating = 0 }, /turf/simulated/floor/tiled, /area/submap/Rockb1) diff --git a/maps/submaps/mountains/crashed_ufo.dmm b/maps/submaps/mountains/crashed_ufo.dmm index c2b55ec9bf..c118f1c0ee 100644 --- a/maps/submaps/mountains/crashed_ufo.dmm +++ b/maps/submaps/mountains/crashed_ufo.dmm @@ -153,7 +153,7 @@ /area/submap/cave/crashed_ufo) "aI" = ( /obj/machinery/door/airlock/alien/locked{ - p_open = 1 + panel_open = 1 }, /turf/simulated/shuttle/floor/alienplating, /area/submap/cave/crashed_ufo) diff --git a/maps/submaps/mountains/quarantineshuttle.dmm b/maps/submaps/mountains/quarantineshuttle.dmm index d1e3e3d87a..a722dea882 100644 --- a/maps/submaps/mountains/quarantineshuttle.dmm +++ b/maps/submaps/mountains/quarantineshuttle.dmm @@ -39,7 +39,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "QShuttlePoIDoors"; - layer = 3.3; name = "Emergency Lockdown Shutters" }, /obj/item/barrier_tape_segment/medical{ diff --git a/maps/submaps/plains/Epod.dmm b/maps/submaps/plains/Epod.dmm index ab9df9baf9..33d320c7ab 100644 --- a/maps/submaps/plains/Epod.dmm +++ b/maps/submaps/plains/Epod.dmm @@ -48,7 +48,6 @@ "k" = ( /obj/structure/bed/chair, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28; pixel_y = 0 diff --git a/maps/submaps/wilderness/Blackshuttledown.dmm b/maps/submaps/wilderness/Blackshuttledown.dmm index 3d8b0f0d5b..37f301e158 100644 --- a/maps/submaps/wilderness/Blackshuttledown.dmm +++ b/maps/submaps/wilderness/Blackshuttledown.dmm @@ -542,10 +542,8 @@ /turf/simulated/floor/plating, /area/submap/Blackshuttledown) "bH" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "BSD APC"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + name = "BSD APC" }, /turf/simulated/floor/tiled/yellow, /area/submap/Blackshuttledown) diff --git a/maps/submaps/wilderness/Blueshuttledown.dmm b/maps/submaps/wilderness/Blueshuttledown.dmm index c14e899734..d792afe298 100644 --- a/maps/submaps/wilderness/Blueshuttledown.dmm +++ b/maps/submaps/wilderness/Blueshuttledown.dmm @@ -554,10 +554,8 @@ /turf/simulated/floor/plating, /area/submap/Blackshuttledown) "bH" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "BSD APC"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + name = "BSD APC" }, /turf/simulated/floor/tiled/yellow, /area/submap/Blackshuttledown) diff --git a/maps/submaps/wilderness/DJOutpost1.dmm b/maps/submaps/wilderness/DJOutpost1.dmm index 110c273483..f4a9c67cf7 100644 --- a/maps/submaps/wilderness/DJOutpost1.dmm +++ b/maps/submaps/wilderness/DJOutpost1.dmm @@ -178,16 +178,14 @@ "B" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/wood, diff --git a/maps/submaps/wilderness/DJOutpost3.dmm b/maps/submaps/wilderness/DJOutpost3.dmm index c730da481b..e537b58943 100644 --- a/maps/submaps/wilderness/DJOutpost3.dmm +++ b/maps/submaps/wilderness/DJOutpost3.dmm @@ -174,16 +174,14 @@ "aC" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, diff --git a/maps/submaps/wilderness/DJOutpost4.dmm b/maps/submaps/wilderness/DJOutpost4.dmm index e8d4064bfa..83c429e70c 100644 --- a/maps/submaps/wilderness/DJOutpost4.dmm +++ b/maps/submaps/wilderness/DJOutpost4.dmm @@ -223,16 +223,14 @@ "aK" = ( /obj/structure/table/steel_reinforced, /obj/item/radio, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/east_mount{ cell_type = /obj/item/cell/hyper; - dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; - operating = 0; - pixel_x = 24 + operating = 0 }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, diff --git a/maps/submaps/wilderness/DoomP.dmm b/maps/submaps/wilderness/DoomP.dmm index 212b24f3c0..926d8772ee 100644 --- a/maps/submaps/wilderness/DoomP.dmm +++ b/maps/submaps/wilderness/DoomP.dmm @@ -152,10 +152,8 @@ /turf/simulated/floor/plating, /area/submap/DoomP) "aG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "PAPC"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + name = "PAPC" }, /obj/structure/cable/green{ icon_state = "0-8" diff --git a/maps/submaps/wilderness/Epod4.dmm b/maps/submaps/wilderness/Epod4.dmm index ecda831343..8fdeac1043 100644 --- a/maps/submaps/wilderness/Epod4.dmm +++ b/maps/submaps/wilderness/Epod4.dmm @@ -58,7 +58,6 @@ dir = 8 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, diff --git a/maps/submaps/wilderness/Lab1.dmm b/maps/submaps/wilderness/Lab1.dmm index a740b2179d..870939b822 100644 --- a/maps/submaps/wilderness/Lab1.dmm +++ b/maps/submaps/wilderness/Lab1.dmm @@ -117,12 +117,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/submap/Lab1) "u" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/hyper; - dir = 8; name = "Unknown APC"; - operating = 0; - pixel_x = -24 + operating = 0 }, /obj/structure/cable{ icon_state = "0-4" diff --git a/maps/submaps/wilderness/Manor1.dmm b/maps/submaps/wilderness/Manor1.dmm index cb933d4c4f..6c95746644 100644 --- a/maps/submaps/wilderness/Manor1.dmm +++ b/maps/submaps/wilderness/Manor1.dmm @@ -456,7 +456,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) "bO" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bP" = ( diff --git a/maps/submaps/wilderness/Rockybase.dmm b/maps/submaps/wilderness/Rockybase.dmm index 54534d23a1..1571a38f7a 100644 --- a/maps/submaps/wilderness/Rockybase.dmm +++ b/maps/submaps/wilderness/Rockybase.dmm @@ -889,11 +889,9 @@ /turf/simulated/floor/tiled, /area/submap/Rockybase) "de" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "Unknown APC"; - pixel_x = -24 + name = "Unknown APC" }, /obj/structure/cable/green{ icon_state = "0-4" diff --git a/maps/templates/admin/dhael_centcom.dmm b/maps/templates/admin/dhael_centcom.dmm index c8981f47d1..1572ed56fe 100644 --- a/maps/templates/admin/dhael_centcom.dmm +++ b/maps/templates/admin/dhael_centcom.dmm @@ -2636,7 +2636,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchenC"; - layer = 3.3; name = "Kitchen Shutters" }, /turf/unsimulated/floor/steel, @@ -3344,7 +3343,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC2"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor/steel, @@ -6504,7 +6502,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -8956,7 +8954,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC4"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor{ @@ -12331,6 +12328,12 @@ icon_state = "dark" }, /area/centcom/specops) +"NC" = ( +/obj/machinery/door/firedoor/glass, +/turf/unsimulated/floor/steel{ + icon_state = "white" + }, +/area/centcom/medical) "NE" = ( /obj/structure/table/reinforced, /obj/item/material/minihoe, @@ -14677,7 +14680,6 @@ /area/centcom/evac) "Yc" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /obj/effect/floor_decal/borderfloorblack{ @@ -21803,7 +21805,7 @@ kv pT oS kv -kv +NC kv kv kv diff --git a/maps/templates/admin/dojo.dmm b/maps/templates/admin/dojo.dmm index 052f9cb247..8fab16c5e5 100644 --- a/maps/templates/admin/dojo.dmm +++ b/maps/templates/admin/dojo.dmm @@ -855,7 +855,7 @@ /area/ninja_dojo/dojo) "eW" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "ninja_shuttle"; name = "interior access button"; diff --git a/maps/templates/admin/ert.dmm b/maps/templates/admin/ert.dmm index c1a4cd57fd..8cd64145b6 100644 --- a/maps/templates/admin/ert.dmm +++ b/maps/templates/admin/ert.dmm @@ -212,6 +212,7 @@ "ch" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) "ci" = ( @@ -280,9 +281,8 @@ dir = 4 }, /obj/machinery/meter, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "VB APC - North"; pixel_y = 24 }, @@ -295,8 +295,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "cY" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -392,6 +391,7 @@ name = "Medical Bay"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "dB" = ( @@ -474,14 +474,15 @@ "dY" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/int_door, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "ee" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_port) +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) "ef" = ( /obj/structure/table/rack/steel, /obj/item/clothing/glasses/night, @@ -490,9 +491,7 @@ /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -591,10 +590,9 @@ dir = 4 }, /obj/machinery/meter, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 + name = "VB APC - South" }, /obj/structure/cable/yellow, /obj/machinery/light/small{ @@ -608,9 +606,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light_switch{ dir = 4; pixel_x = -23 @@ -778,9 +774,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "gR" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -793,9 +788,8 @@ /obj/structure/table/rack/steel, /obj/item/mecha_parts/mecha_equipment/shocker, /obj/item/mecha_parts/mecha_equipment/shocker, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "VB APC - North"; pixel_y = 24 }, @@ -819,6 +813,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "ha" = ( @@ -833,9 +830,7 @@ /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) @@ -999,6 +994,9 @@ id = "NRV_DELTA"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "iB" = ( @@ -1072,6 +1070,9 @@ name = "Engineering"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "jQ" = ( @@ -1128,6 +1129,9 @@ id = "NRV_MECHS"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "kl" = ( @@ -1327,8 +1331,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) "lR" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techmaint, @@ -1465,14 +1468,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1; - req_one_access = list(103) - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/barracks) "mJ" = ( @@ -1540,13 +1542,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/barracks) "na" = ( @@ -1564,8 +1566,7 @@ /obj/item/gun/energy/xray, /obj/item/gun/energy/xray, /obj/machinery/light, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -1604,8 +1605,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) @@ -1676,14 +1677,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/blast/regular{ closed_layer = 4; id = "NRV_MECHS"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "nB" = ( @@ -1696,14 +1697,14 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/blast/regular{ closed_layer = 4; id = "NRV_DELTA"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/mech_bay) "nC" = ( @@ -1790,9 +1791,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "op" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 }, @@ -1846,6 +1845,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) +"oS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/barracks) "oV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1865,9 +1876,8 @@ /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -1988,6 +1998,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "pq" = ( @@ -2024,13 +2037,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "pA" = ( @@ -2369,7 +2382,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "sd" = ( @@ -2428,9 +2441,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sw" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/teleporter) "sz" = ( @@ -2538,10 +2549,10 @@ "ta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "tg" = ( @@ -2688,6 +2699,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "uq" = ( @@ -2698,9 +2712,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "uu" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/dock_star) "ux" = ( @@ -2814,8 +2826,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) "vv" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2851,10 +2862,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways) "wl" = ( @@ -3016,9 +3027,8 @@ /obj/item/gun/energy/ionrifle/pistol, /obj/item/gun/energy/ionrifle, /obj/item/gun/energy/ionrifle, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3184,9 +3194,7 @@ /obj/effect/floor_decal/corner/yellow{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "yv" = ( @@ -3213,9 +3221,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hangar) "yC" = ( @@ -3291,9 +3297,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "zc" = ( @@ -3383,9 +3387,8 @@ /turf/simulated/floor/wood, /area/ship/ert/commander) "Af" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3411,18 +3414,15 @@ /turf/simulated/floor/wood, /area/ship/ert/commander) "Ai" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/hallways_aft) "An" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3438,9 +3438,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) "Aq" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/item/modular_computer/console/preset/security, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/bridge) @@ -3484,6 +3482,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_dl) "AI" = ( @@ -3615,6 +3616,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "Br" = ( @@ -3660,9 +3664,8 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/eng_storage) "Cn" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -3738,13 +3741,13 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "CP" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "CT" = ( @@ -3882,9 +3885,8 @@ /obj/item/extinguisher/mini, /obj/item/extinguisher/mini, /obj/item/extinguisher/mini, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "VB APC - North"; pixel_y = 24 }, @@ -3909,8 +3911,7 @@ /obj/item/hardsuit/ert/security, /obj/item/hardsuit/ert/security, /obj/item/hardsuit/ert/security, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/industrial/outline/grey, @@ -4001,8 +4002,7 @@ "EB" = ( /obj/effect/floor_decal/corner/white, /obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/light_switch{ @@ -4086,9 +4086,8 @@ /obj/structure/table/rack/steel, /obj/item/storage/box/frags, /obj/item/storage/box/frags, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -4168,8 +4167,8 @@ /obj/machinery/door/airlock/glass/security{ req_one_access = list(103) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) @@ -4315,10 +4314,9 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) "GT" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 + name = "VB APC - South" }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/white, @@ -4517,16 +4515,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "Ip" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -4594,8 +4590,7 @@ /obj/item/pen{ pixel_y = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/item/toy/figure/ert, @@ -5059,9 +5054,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/item/gun/energy/laser, /obj/item/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/grey, @@ -5176,9 +5169,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -5545,6 +5537,12 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) +"OQ" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/med) "OR" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -5757,9 +5755,8 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/teleporter) "Qc" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "VB APC - West"; pixel_x = -24 }, @@ -5806,10 +5803,9 @@ /obj/item/smes_coil, /obj/item/t_scanner/advanced, /obj/item/t_scanner/advanced, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "VB APC - South"; - pixel_y = -24 + name = "VB APC - South" }, /obj/structure/cable/yellow, /turf/simulated/floor/tiled/techfloor, @@ -5888,11 +5884,9 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/engineering) "Rh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/dock_star) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hangar) "Rt" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5903,13 +5897,13 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) "Rv" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/glass/medical{ name = "Medical Bay"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) "Rw" = ( @@ -5929,8 +5923,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_dl) @@ -6078,9 +6072,8 @@ /area/ship/ert/dock_star) "SA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -6240,8 +6233,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/teleporter) "Ul" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/item/modular_computer/console/preset/medical{ @@ -6354,13 +6346,13 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engineering) "VJ" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/glass/medical{ name = "Medical Bay"; req_access = list(103) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "VO" = ( @@ -6589,9 +6581,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/structure/cable/yellow{ icon_state = "2-8" }, @@ -6614,9 +6604,8 @@ /turf/simulated/floor/reinforced/airless, /area/ship/ert/barracks) "Yq" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "VB APC - East"; pixel_x = 24 }, @@ -6656,6 +6645,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/bridge) +"Yv" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/ship/ert/hallways) "Yx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6762,8 +6755,7 @@ /area/ship/ert/med) "ZU" = ( /obj/machinery/light, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/power/port_gen/pacman/mrs, @@ -14979,7 +14971,7 @@ Sz Sz Ql sC -Rh +ch bJ uE yo @@ -15101,7 +15093,7 @@ yz ae am dn -ee +dY ik lX oV @@ -16668,7 +16660,7 @@ OU mF ip ip -BW +Yv Bc BW Js @@ -16678,7 +16670,7 @@ BW VP sX Jf -BW +Yv Br Br Br @@ -16948,7 +16940,7 @@ Ye Zo Bo Bo -Jd +oS mI Bo tH @@ -16965,7 +16957,7 @@ Rz Yd ZT yI -QT +OQ pz KI KI @@ -18226,7 +18218,7 @@ Ye Zo Bo Bo -ip +ee mZ Bo tH @@ -18655,7 +18647,7 @@ fj jD JM ip -Tl +Rh JE Nf Nf diff --git a/maps/templates/admin/ert_base.dmm b/maps/templates/admin/ert_base.dmm index 4290c73862..b08446daef 100644 --- a/maps/templates/admin/ert_base.dmm +++ b/maps/templates/admin/ert_base.dmm @@ -92,7 +92,7 @@ }, /obj/structure/fans/tiny, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ert1_control"; pixel_x = 24; @@ -304,7 +304,7 @@ "aL" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ert1_control"; pixel_x = -22; @@ -1824,7 +1824,7 @@ /area/shuttle/specops/centcom) "dL" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1381; master_tag = "ert2_control"; pixel_x = -22; @@ -2007,7 +2007,7 @@ /area/shuttle/specops/centcom) "ed" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1381; master_tag = "ert2_control"; pixel_x = 24; diff --git a/maps/templates/admin/killhouse1.dmm b/maps/templates/admin/killhouse1.dmm index 210e4039da..526bb740db 100644 --- a/maps/templates/admin/killhouse1.dmm +++ b/maps/templates/admin/killhouse1.dmm @@ -5,7 +5,7 @@ /turf/simulated/floor/wood, /area/killhouse/one) "au" = ( -/obj/machinery/power/apc/hyper/west_bump{ +/obj/machinery/power/apc/hyper/west_mount{ cell_type = /obj/item/cell/infinite }, /obj/machinery/light/small, @@ -823,7 +823,7 @@ /area/killhouse/one) "MR" = ( /obj/structure/trash_pile, -/obj/machinery/power/apc/hyper/east_bump{ +/obj/machinery/power/apc/hyper/east_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/concrete/rng/lythios43c/outdoors, diff --git a/maps/templates/admin/killhouse2.dmm b/maps/templates/admin/killhouse2.dmm index 0ab364717f..fbbffdcfd6 100644 --- a/maps/templates/admin/killhouse2.dmm +++ b/maps/templates/admin/killhouse2.dmm @@ -1723,7 +1723,7 @@ /turf/simulated/floor/tiled/white, /area/killhouse/two) "Ev" = ( -/obj/machinery/power/apc/hyper/east_bump{ +/obj/machinery/power/apc/hyper/east_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/outdoors/snow/lythios43c, @@ -2105,10 +2105,7 @@ /area/killhouse/two) "Nu" = ( /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/filingcabinet/medical, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -2721,7 +2718,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/killhouse/two) "Wi" = ( -/obj/machinery/power/apc/hyper/south_bump{ +/obj/machinery/power/apc/hyper/south_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/concrete/rng/lythios43c/outdoors, diff --git a/maps/templates/admin/killhouseteleporter.dmm b/maps/templates/admin/killhouseteleporter.dmm index 74ab423318..61ddde6323 100644 --- a/maps/templates/admin/killhouseteleporter.dmm +++ b/maps/templates/admin/killhouseteleporter.dmm @@ -124,7 +124,7 @@ dir = 6; icon_state = "warning" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ cell_type = /obj/item/cell/infinite }, /turf/simulated/floor/reinforced, diff --git a/maps/templates/admin/kk_mercship.dmm b/maps/templates/admin/kk_mercship.dmm index 3b4fa404ea..1a4d79112a 100644 --- a/maps/templates/admin/kk_mercship.dmm +++ b/maps/templates/admin/kk_mercship.dmm @@ -47,18 +47,15 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ak" = ( /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -125,13 +122,13 @@ id = "Merc_Rear_Blast"; name = "Blast Shield" }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal{ req_one_access = list(150) }, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "aE" = ( @@ -167,9 +164,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "aS" = ( @@ -279,8 +274,7 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -588,9 +582,8 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -636,9 +629,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -1258,10 +1250,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/machinery/light{ dir = 4 }, @@ -1520,10 +1509,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "hH" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/wood, /area/ship/manta/commander) "hL" = ( @@ -1819,9 +1805,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "iQ" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -1903,9 +1888,8 @@ /turf/simulated/wall/rshull, /area/shuttle/manta_ship_boat) "jg" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -2158,6 +2142,13 @@ /obj/machinery/appliance/cooker/grill, /turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) +"kA" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/engineering) "kF" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/surgery, @@ -2332,8 +2323,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -2380,7 +2370,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "lM" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, @@ -2390,6 +2379,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "lO" = ( @@ -2441,9 +2431,8 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -2538,10 +2527,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/manta_ship_boat) "my" = ( @@ -2594,8 +2580,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "mN" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /obj/structure/bed/chair/bay/shuttle{ @@ -2697,9 +2682,8 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -2915,6 +2899,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) +"oj" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "om" = ( /obj/structure/cable/orange{ icon_state = "2-4" @@ -2961,9 +2954,8 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_port) "ov" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -3136,8 +3128,7 @@ /area/ship/manta/hallways_star) "pt" = ( /obj/structure/catwalk, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/plating, @@ -3217,9 +3208,8 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -3371,9 +3361,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "qK" = ( -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -3388,10 +3376,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -3444,10 +3429,9 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rl" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -3526,8 +3510,7 @@ /area/ship/manta/hallways_aft) "rE" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -3706,13 +3689,13 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "sz" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "sG" = ( @@ -3721,6 +3704,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "sM" = ( @@ -3766,6 +3750,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "th" = ( @@ -3818,9 +3803,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 1 }, @@ -3873,6 +3856,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "tL" = ( @@ -3890,6 +3876,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "tQ" = ( @@ -3924,14 +3911,14 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_port) "uc" = ( /obj/structure/cable/orange{ icon_state = "4-8" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/techfloor, @@ -4126,9 +4113,7 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 1 }, @@ -4216,9 +4201,7 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 4 }, @@ -4232,10 +4215,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "vw" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /obj/machinery/light/small{ @@ -4399,9 +4381,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "wc" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; @@ -4416,6 +4395,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wd" = ( @@ -4447,8 +4429,7 @@ /obj/structure/flora/pottedplant{ icon_state = "plant-20" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/techfloor{ @@ -4589,9 +4570,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wQ" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; @@ -4600,6 +4578,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "wU" = ( @@ -4731,9 +4712,8 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "xv" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -4776,9 +4756,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xG" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(150) @@ -4787,6 +4764,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xK" = ( @@ -4919,8 +4899,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/techfloor{ @@ -5167,6 +5146,12 @@ id = "Manta_Wargear"; layer = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "zf" = ( @@ -5548,13 +5533,13 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "AX" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "Bi" = ( @@ -5562,9 +5547,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "Bk" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -5608,6 +5592,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "BJ" = ( @@ -5706,10 +5691,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "Cn" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /obj/machinery/light/small{ @@ -5788,9 +5772,6 @@ /turf/space, /area/ship/manta/radiator_star) "CF" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; name = "Mech Bay"; @@ -5811,6 +5792,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "CK" = ( @@ -5921,9 +5905,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /obj/machinery/light{ dir = 8 }, @@ -6060,10 +6042,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon, @@ -6292,6 +6271,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_star) "EY" = ( @@ -6390,10 +6370,9 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange{ icon_state = "0-8" @@ -6662,10 +6641,9 @@ /obj/structure/table/rack, /obj/item/mecha_parts/mecha_equipment/shocker, /obj/effect/floor_decal/techfloor, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /turf/simulated/floor/tiled/techfloor, @@ -7282,6 +7260,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "KI" = ( @@ -7367,8 +7348,7 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/light, @@ -7432,10 +7412,9 @@ /area/ship/manta/dock_star) "LC" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange{ icon_state = "0-4" @@ -7525,10 +7504,10 @@ /obj/machinery/door/airlock/multi_tile/metal{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_star) "LZ" = ( @@ -7868,6 +7847,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "NK" = ( @@ -8022,10 +8002,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) @@ -8299,9 +8276,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -8319,9 +8295,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/west_mount{ alarms_hidden = 1; - dir = 8; name = "Merc APC - West"; pixel_x = -24 }, @@ -8391,8 +8366,7 @@ /area/ship/manta/teleporter) "QE" = ( /obj/structure/catwalk, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/plating, @@ -8414,13 +8388,10 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "QJ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "QO" = ( @@ -8608,10 +8579,10 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "RU" = ( @@ -8664,6 +8635,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Se" = ( @@ -8720,7 +8692,6 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -8729,12 +8700,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "St" = ( /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "SF" = ( @@ -8803,8 +8776,7 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -8815,9 +8787,8 @@ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -9163,7 +9134,6 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_2) "UF" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ @@ -9175,6 +9145,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "UH" = ( @@ -9214,10 +9185,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "UR" = ( @@ -9509,10 +9477,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "Ww" = ( -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/south_mount{ alarms_hidden = 1; - name = "Merc APC - South"; - pixel_y = -24 + name = "Merc APC - South" }, /obj/structure/cable/orange, /turf/simulated/floor/wood, @@ -9538,7 +9505,6 @@ /turf/simulated/wall/rshull, /area/ship/manta/dock_port) "WN" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/structure/cable/orange{ icon_state = "1-2" }, @@ -9551,6 +9517,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "WO" = ( @@ -9567,7 +9534,6 @@ /obj/machinery/door/airlock/multi_tile/metal{ req_one_access = list(150) }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9575,6 +9541,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_port) "WV" = ( @@ -9744,6 +9711,9 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "XE" = ( @@ -9798,9 +9768,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "XR" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/metal{ dir = 4; name = "Brig"; @@ -9813,6 +9780,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "XS" = ( @@ -9828,6 +9798,9 @@ /obj/structure/cable/orange{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "XY" = ( @@ -9844,9 +9817,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Yf" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; @@ -9858,6 +9828,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "Yh" = ( @@ -9884,9 +9857,6 @@ /area/ship/manta/hangar) "Yl" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; req_one_access = list(150) @@ -9897,8 +9867,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"Ym" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/bridge) "Yo" = ( /obj/machinery/door/window/brigdoor/northleft{ req_access = list(150); @@ -9939,9 +9919,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/north_mount{ alarms_hidden = 1; - dir = 1; name = "Merc APC - North"; pixel_y = 24 }, @@ -9960,6 +9939,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "YF" = ( @@ -10129,9 +10109,8 @@ pixel_x = 12; pixel_y = 8 }, -/obj/machinery/power/apc/hyper{ +/obj/machinery/power/apc/hyper/east_mount{ alarms_hidden = 1; - dir = 4; name = "Merc APC - East"; pixel_x = 24 }, @@ -10215,7 +10194,6 @@ /turf/simulated/floor/plating, /area/ship/manta/dock_star) "ZY" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ req_one_access = list(150) }, @@ -10227,6 +10205,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) @@ -17950,7 +17929,7 @@ ZT ZT ZT ZT -ic +oj wc ZT ZT @@ -19807,7 +19786,7 @@ ag ag aJ tm -WV +Ym wd dn er @@ -20384,9 +20363,9 @@ gR zU Yd er -WV +Ym IG -sg +kA sg NM sg diff --git a/maps/templates/admin/mercbase.dmm b/maps/templates/admin/mercbase.dmm index d2faec5037..259bf3732a 100644 --- a/maps/templates/admin/mercbase.dmm +++ b/maps/templates/admin/mercbase.dmm @@ -167,7 +167,6 @@ /area/antag/antag_base) "ar" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_y = 32 }, /turf/unsimulated/floor{ @@ -2619,7 +2618,7 @@ opacity = 0 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "merc_shuttle"; name = "exterior access button"; @@ -2892,7 +2891,7 @@ req_access = list(150) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "merc_shuttle"; name = "interior access button"; @@ -4095,7 +4094,7 @@ /area/shuttle/mercenary) "hh" = ( /obj/machinery/access_button/airlock_exterior{ - command = "cycle_interior"; + command = "cycle_int"; master_tag = "merc_south_airlock"; pixel_x = -25 }, diff --git a/maps/templates/admin/skipjack.dmm b/maps/templates/admin/skipjack.dmm index 0e63db3d04..caad2f9255 100644 --- a/maps/templates/admin/skipjack.dmm +++ b/maps/templates/admin/skipjack.dmm @@ -787,7 +787,7 @@ /area/shuttle/skipjack) "cb" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "vox_west_control"; req_one_access = list(150) @@ -812,7 +812,7 @@ /area/shuttle/skipjack) "ce" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "vox_east_control"; req_access = list(150) @@ -1023,7 +1023,7 @@ "cA" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "vox_west_control"; pixel_x = -22; @@ -1061,7 +1061,7 @@ "cE" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "vox_east_control"; pixel_x = 22; diff --git a/maps/templates/admin/wizard.dmm b/maps/templates/admin/wizard.dmm index 9b1fa966bb..32cc58385e 100644 --- a/maps/templates/admin/wizard.dmm +++ b/maps/templates/admin/wizard.dmm @@ -88,7 +88,6 @@ "am" = ( /obj/structure/bed/chair/wood/wings, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, @@ -154,7 +153,6 @@ /area/wizard_station) "at" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, @@ -749,7 +747,6 @@ /obj/item/suit_cooling_unit, /obj/structure/table/steel_reinforced, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, @@ -760,7 +757,6 @@ /area/wizard_station) "bN" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 0; pixel_y = 30 }, diff --git a/maps/templates/archive/tradeship.dmm b/maps/templates/archive/tradeship.dmm index 31625cdfd8..326c3fa52d 100644 --- a/maps/templates/archive/tradeship.dmm +++ b/maps/templates/archive/tradeship.dmm @@ -1699,7 +1699,7 @@ /area/shuttle/trade) "dQ" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1331; master_tag = "trade2_control"; pixel_x = -22; @@ -1874,7 +1874,7 @@ /area/shuttle/trade) "ei" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1331; master_tag = "trade2_control"; pixel_x = 24; diff --git a/maps/templates/shuttles/overmaps/generic/bearcat.dmm b/maps/templates/shuttles/overmaps/generic/bearcat.dmm index 7ecc31fc6a..d01aec9717 100644 --- a/maps/templates/shuttles/overmaps/generic/bearcat.dmm +++ b/maps/templates/shuttles/overmaps/generic/bearcat.dmm @@ -114,7 +114,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/comms) "at" = ( @@ -131,7 +131,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/command) "av" = ( @@ -327,8 +327,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden{ - dir = 4 +/obj/machinery/power/apc/alarms_hidden/east_mount{ }, /turf/simulated/floor/wood, /area/shuttle/bearcat/command_captain) @@ -543,7 +542,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_port) "bx" = ( @@ -580,7 +579,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_starboard) "bB" = ( @@ -737,7 +736,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_central) "bZ" = ( @@ -880,7 +879,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_saloon) "cr" = ( @@ -1074,7 +1073,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_toilets) "cQ" = ( @@ -1216,7 +1215,7 @@ /obj/structure/handrail{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_dorms) "dh" = ( @@ -1332,7 +1331,7 @@ /obj/structure/handrail{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/crew_corridors) "dy" = ( @@ -1356,7 +1355,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_kitchen) "dC" = ( @@ -1588,7 +1587,7 @@ /obj/item/storage/box/syringes, /obj/structure/cable, /obj/item/storage/firstaid, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_medbay) "ed" = ( @@ -1634,7 +1633,7 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine) "ej" = ( @@ -1707,7 +1706,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/cargo) "ev" = ( @@ -1879,7 +1878,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/unused1) "eU" = ( @@ -2227,7 +2226,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/unused2) "fH" = ( @@ -2316,7 +2315,7 @@ /area/shuttle/bearcat/unused2) "fS" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/crew_wash) "fT" = ( @@ -2412,7 +2411,7 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/maintenance_enginecontrol) "gf" = ( @@ -2735,7 +2734,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_atmos) "gP" = ( @@ -2822,7 +2821,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /obj/machinery/air_alarm/alarms_hidden{ dir = 4; pixel_x = -26 @@ -3037,7 +3036,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine_pod_starboard) "kD" = ( @@ -3188,7 +3187,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine_pod_port) "FG" = ( diff --git a/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm b/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm index b4c5cec30d..5cc9139826 100644 --- a/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm +++ b/maps/templates/shuttles/overmaps/generic/cruise_ship.dmm @@ -514,7 +514,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/wood, /area/shuttle/cruise_ship) "Ub" = ( @@ -584,7 +584,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/shuttle/cruise_ship/bedroom) "Za" = ( diff --git a/maps/templates/shuttles/overmaps/generic/cruiser.dmm b/maps/templates/shuttles/overmaps/generic/cruiser.dmm index 9038bdf427..2ba877ae41 100644 --- a/maps/templates/shuttles/overmaps/generic/cruiser.dmm +++ b/maps/templates/shuttles/overmaps/generic/cruiser.dmm @@ -26,7 +26,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_8"; name = "exterior access button"; @@ -134,11 +134,7 @@ /turf/simulated/floor/wood, /area/mothership/breakroom) "ap" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/mothership/breakroom) "aq" = ( @@ -350,7 +346,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/breakroom) "aR" = ( @@ -482,16 +478,12 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bn" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/hydroponics) "bo" = ( @@ -603,11 +595,7 @@ }, /obj/item/material/knife/butch, /obj/item/material/kitchen/rollingpin, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/mothership/kitchen) "bB" = ( @@ -902,8 +890,7 @@ /area/mothership/hydroponics) "ci" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -917,7 +904,7 @@ /area/mothership/kitchen) "ck" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/white, /area/mothership/kitchen) "cl" = ( @@ -1061,11 +1048,7 @@ /obj/item/radio/off, /obj/item/radio/off, /obj/item/radio/off, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "cH" = ( @@ -1077,7 +1060,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_7"; name = "exterior access button"; @@ -1132,7 +1115,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_7"; name = "interior access button"; @@ -1233,7 +1216,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_2"; name = "interior access button"; @@ -1297,8 +1280,7 @@ /obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/table/rack/shelf/steel, @@ -1349,7 +1331,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/eva) "de" = ( @@ -1370,11 +1352,7 @@ /obj/structure/cable/cyan{ icon_state = "2-4" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -1494,11 +1472,7 @@ /obj/structure/cable/cyan{ icon_state = "2-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -1544,7 +1518,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom1) "dw" = ( @@ -1614,7 +1588,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/bathroom2) "dH" = ( @@ -1772,7 +1746,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ee" = ( @@ -1793,11 +1767,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eg" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/cyan{ icon_state = "2-8" }, @@ -1891,10 +1861,7 @@ /turf/simulated/floor/tiled/white, /area/mothership/surgery) "eq" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -1904,8 +1871,7 @@ "er" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/button/remote/airlock{ @@ -1944,7 +1910,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm1) "eu" = ( @@ -2057,7 +2023,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm2) "eE" = ( @@ -2079,10 +2045,7 @@ "eF" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/button/remote/airlock{ id = "ship-dorm2-door"; name = "Dorm 2 Lock"; @@ -2130,10 +2093,7 @@ /obj/item/clothing/suit/armor/pcarrier/blue/sol, /obj/item/clothing/suit/armor/pcarrier/blue/sol, /obj/item/clothing/suit/armor/pcarrier/blue/sol, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -2449,11 +2409,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "fA" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /obj/structure/cable/cyan{ icon_state = "0-2" @@ -2484,8 +2441,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "fC" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2714,8 +2670,7 @@ "gc" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/box/gloves, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, @@ -2726,7 +2681,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/surgery) "ge" = ( @@ -2763,7 +2718,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/chemistry) "gh" = ( @@ -2790,8 +2745,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gk" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/cable, @@ -2944,19 +2898,12 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/mothership/treatment) "gL" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -3208,7 +3155,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/pathfinder, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/security) "hj" = ( @@ -3362,8 +3309,7 @@ "hH" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/button/remote/airlock{ @@ -3399,7 +3345,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/wood, /area/mothership/dorm3) "hK" = ( @@ -3459,7 +3405,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/wood, /area/mothership/dorm4) "hO" = ( @@ -3478,10 +3424,7 @@ "hP" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/button/remote/airlock{ id = "ship-dorm4-door"; name = "Dorm 4 Lock"; @@ -3662,10 +3605,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "ip" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iq" = ( @@ -3918,7 +3858,7 @@ dir = 4 }, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/processing) "iS" = ( @@ -4006,7 +3946,7 @@ icon_state = "0-2" }, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/mothership/morgue) "jg" = ( @@ -4219,7 +4159,7 @@ /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) "jC" = ( @@ -4272,7 +4212,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/resleeving) "jM" = ( @@ -4363,10 +4303,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/mothership/sechallway) @@ -4375,11 +4312,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jT" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "jU" = ( @@ -4769,7 +4702,7 @@ /obj/item/book/manual/security_space_law, /obj/structure/closet/secure_closet/nanotrasen_warden, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/warden) "kM" = ( @@ -4852,8 +4785,7 @@ "kU" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/button/remote/airlock{ @@ -4890,7 +4822,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm5) "kX" = ( @@ -4950,7 +4882,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/mothership/dorm6) "lb" = ( @@ -4970,10 +4902,7 @@ "lc" = ( /obj/item/bedsheet/captaindouble, /obj/structure/bed/double/padded, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/button/remote/airlock{ id = "ship-dorm6-door"; name = "Dorm 6 Lock"; @@ -5042,7 +4971,7 @@ icon_state = "0-2" }, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/mothership/medical) "lo" = ( @@ -5562,7 +5491,7 @@ /area/mothership/rnd) "mp" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/rnd) "mq" = ( @@ -5829,7 +5758,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "mV" = ( @@ -5857,7 +5786,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "mZ" = ( @@ -6345,8 +6274,7 @@ /area/mothership/rnd) "nS" = ( /obj/structure/closet/wardrobe/robotics_black, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/steel_grid, @@ -6427,8 +6355,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6443,7 +6370,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/armory) "ob" = ( @@ -6516,8 +6443,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/mothership/bridge) "oi" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/bed/chair/bay/shuttle{ @@ -6788,8 +6714,7 @@ /area/mothership/robotics) "oO" = ( /obj/machinery/mech_recharger, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/bluegrid, @@ -6813,7 +6738,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/mothership/robotics) "oS" = ( @@ -6922,15 +6847,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/mothership/holodeck) "pd" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/secure_closet/personal, @@ -6955,7 +6879,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_6"; name = "exterior access button"; @@ -7008,16 +6932,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/telecomms1) "pu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_6"; name = "interior access button"; @@ -7048,7 +6968,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms1) "pz" = ( @@ -7207,7 +7127,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/telecomms2) "pO" = ( @@ -7225,16 +7145,12 @@ /turf/simulated/floor/greengrid, /area/mothership/telecomms2) "pR" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_3"; name = "interior access button"; @@ -7295,7 +7211,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_3"; name = "exterior access button"; @@ -7577,10 +7493,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -7595,7 +7508,7 @@ dir = 8 }, /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/cryotube) "qZ" = ( @@ -7610,8 +7523,7 @@ /obj/machinery/cryopod{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -7651,7 +7563,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/mothership/engineering) "rf" = ( @@ -8382,7 +8294,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_5"; name = "exterior access button"; @@ -8439,10 +8351,7 @@ /turf/simulated/floor/tiled/techfloor, /area/mothership/telecomms2) "tl" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ts" = ( @@ -8452,8 +8361,7 @@ /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "tA" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -8582,11 +8490,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "xS" = ( @@ -8683,7 +8587,7 @@ "zE" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_4"; name = "interior access button"; @@ -8697,7 +8601,7 @@ "Am" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_5"; name = "interior access button"; @@ -8909,7 +8813,7 @@ "Gi" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_8"; name = "interior access button"; @@ -9078,7 +8982,7 @@ "PC" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "ws_dock_1"; name = "interior access button"; @@ -9100,7 +9004,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_4"; name = "exterior access button"; @@ -9132,11 +9036,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "QI" = ( @@ -9177,8 +9077,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -9257,7 +9156,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_1"; name = "exterior access button"; @@ -9291,8 +9190,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -9452,11 +9350,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techmaint, /area/mothership/hallway) "ZS" = ( @@ -9468,7 +9362,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "ws_dock_2"; name = "exterior access button"; diff --git a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm index 2e458cf5db..ad04dfc27d 100644 --- a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm +++ b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm @@ -122,7 +122,7 @@ name = "curabitur fax machine"; pixel_y = 6 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/bcarpet, /area/shuttle/curabitur/curashuttle/cockpit) "aq" = ( @@ -245,8 +245,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/carpet/bcarpet, @@ -605,10 +604,7 @@ /obj/machinery/air_alarm/alarms_hidden{ pixel_y = 26 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/shuttle/curabitur/curashuttle/med) "bj" = ( @@ -746,7 +742,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/shuttle/curabitur/curashuttle/med) "bC" = ( @@ -993,7 +989,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/curabitur/curashuttle/eng) "bU" = ( @@ -1071,9 +1067,7 @@ /obj/item/surgical/bone_clamp, /obj/item/surgical/bone_clamp, /obj/item/surgical/scalpel/ripper, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/vent, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/curabitur/curashuttle/eng) @@ -1265,7 +1259,7 @@ /obj/structure/handrail{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/curabitur/curashuttle/hangar) "cB" = ( diff --git a/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm b/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm index 64211b8cf1..173f014c28 100644 --- a/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm +++ b/maps/templates/shuttles/overmaps/generic/gecko_cr.dmm @@ -194,7 +194,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_cr_cockpit) "eP" = ( @@ -578,8 +578,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/gecko_cr) "lV" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /obj/structure/closet/crate{ @@ -707,17 +706,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit) "pf" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -876,9 +872,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_cr_engineering) @@ -940,7 +934,7 @@ }, /obj/machinery/meter, /obj/effect/catwalk_plated/dark, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/gecko_cr) "te" = ( @@ -1051,9 +1045,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/railing/grey{ dir = 4 @@ -1245,9 +1237,7 @@ /area/shuttle/gecko_cr) "yR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/reinforced, /area/shuttle/gecko_cr) "yX" = ( @@ -2025,7 +2015,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_engineering) "Mf" = ( @@ -2105,8 +2095,7 @@ /area/shuttle/gecko_cr_engineering) "NM" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /turf/simulated/floor/plating, @@ -2315,10 +2304,7 @@ /area/shuttle/gecko_cr_cockpit) "PW" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/shuttle/gecko_cr_engineering) "Ql" = ( @@ -2490,9 +2476,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_cr_engineering) @@ -2520,10 +2504,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/gecko_cr) "Tw" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /obj/structure/bed/pod, /obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, @@ -2676,8 +2657,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/handrail{ diff --git a/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm b/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm index f60ea7b7d9..a324572c4b 100644 --- a/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm +++ b/maps/templates/shuttles/overmaps/generic/gecko_sh.dmm @@ -6,7 +6,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh_engineering) "aF" = ( @@ -273,7 +273,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_sh_cockpit) "eP" = ( @@ -582,8 +582,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "lV" = ( -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /obj/structure/closet/crate{ @@ -669,8 +668,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -792,9 +790,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_sh_engineering) @@ -1007,9 +1003,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/window/basic{ dir = 4 @@ -1220,7 +1214,7 @@ icon_state = "0-8" }, /obj/structure/railing/grey, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "zM" = ( @@ -1526,8 +1520,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/handrail{ @@ -1964,8 +1957,7 @@ /area/shuttle/gecko_sh_engineering) "NM" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 4; +/obj/machinery/fire_alarm/east_mount{ pixel_x = -27 }, /turf/simulated/floor/plating, @@ -2100,10 +2092,7 @@ /area/shuttle/gecko_sh) "PW" = ( /obj/structure/handrail, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/shuttle/gecko_sh_engineering) "Ql" = ( @@ -2281,9 +2270,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/gecko_sh_engineering) @@ -2295,10 +2282,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "Tw" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 27 - }, +/obj/machinery/fire_alarm/west_mount, /obj/structure/bed/pod, /obj/item/bedsheet/blue, /turf/simulated/floor/tiled/techfloor, @@ -2536,9 +2520,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_sh) "XX" = ( -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_sh) "Yd" = ( diff --git a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm index 8e2a11a3d9..3371c0c6c0 100644 --- a/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm +++ b/maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm @@ -490,7 +490,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -580,7 +580,7 @@ icon_state = "1-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "generic_shuttle_docker"; name = "interior access button"; @@ -636,7 +636,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "generic_shuttle_docker"; name = "exterior access button"; @@ -700,7 +700,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/generic_shuttle/eng) "bz" = ( diff --git a/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm b/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm index a889e376d4..748762c818 100644 --- a/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm +++ b/maps/templates/shuttles/overmaps/generic/hybridshuttle.dmm @@ -49,11 +49,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/blue_fo) "aj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, diff --git a/maps/templates/shuttles/overmaps/generic/itglight.dmm b/maps/templates/shuttles/overmaps/generic/itglight.dmm index dee2b9c973..1388889c0f 100644 --- a/maps/templates/shuttles/overmaps/generic/itglight.dmm +++ b/maps/templates/shuttles/overmaps/generic/itglight.dmm @@ -465,7 +465,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew4) "cv" = ( @@ -512,7 +512,7 @@ dir = 8 }, /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/wood, /area/itglight/captain) "cU" = ( @@ -690,7 +690,7 @@ /area/itglight/crew1) "ed" = ( /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/carpet, /area/itglight/readyroom) "ei" = ( @@ -1085,7 +1085,7 @@ /area/itglight/captain) "hc" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_1"; name = "port exterior access button"; @@ -1093,7 +1093,7 @@ pixel_y = 65 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_2"; name = "starboard exterior access button"; @@ -1610,7 +1610,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "kH" = ( @@ -1669,7 +1669,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/white, /area/itglight/showers) "kY" = ( @@ -1694,7 +1694,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/afthall) "li" = ( @@ -1927,7 +1927,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/porthighsec) "na" = ( @@ -2249,7 +2249,7 @@ /obj/fiftyspawner/phoron, /obj/fiftyspawner/phoron, /obj/structure/closet/crate, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor, /area/itglight/starboardengi) "pm" = ( @@ -2314,7 +2314,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "pU" = ( @@ -2637,7 +2637,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/shuttle/floor/black, /area/shuttle/itglightshuttle) "sQ" = ( @@ -3270,7 +3270,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/itglight/portdocking) "xM" = ( @@ -3361,7 +3361,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_port"; name = "interior access button"; @@ -3470,7 +3470,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/structure/catwalk, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/itglight/starboarddocking) "yZ" = ( @@ -3561,7 +3561,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "zM" = ( @@ -3694,7 +3694,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/monotile, /area/itglight/forehall) "AK" = ( @@ -3752,7 +3752,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/monotile, /area/itglight/lockers) "Bj" = ( @@ -3855,7 +3855,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew1) "BW" = ( @@ -3919,7 +3919,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_1"; name = "exterior access button"; @@ -4039,7 +4039,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_dock_1"; name = "interior access button"; @@ -4273,7 +4273,7 @@ id_tag = "itglight_dock_2_inner" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_dock_2"; name = "interior access button"; @@ -4351,7 +4351,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_dock_2"; name = "exterior access button"; @@ -4580,7 +4580,7 @@ }, /obj/map_helper/airlock/door/int_door, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "itglight_starboard"; name = "interior access button"; @@ -4999,7 +4999,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/shuttlebay) "IN" = ( @@ -5031,7 +5031,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/portcargo) "Jg" = ( @@ -5046,7 +5046,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_starboard"; name = "exterior access button"; @@ -5164,7 +5164,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew3) "JT" = ( @@ -5211,7 +5211,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardcargo) "Kj" = ( @@ -5269,7 +5269,7 @@ /obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor, /area/itglight/portengi) "KG" = ( @@ -5443,7 +5443,7 @@ }, /obj/structure/bed/double/padded, /obj/item/bedsheet/browndouble, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/carpet/turcarpet, /area/itglight/crew2) "Ml" = ( @@ -5750,7 +5750,7 @@ /area/itglight/lockers) "NY" = ( /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "Oc" = ( @@ -5760,7 +5760,7 @@ /obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/itglight/passengersleeping) "Oe" = ( @@ -6065,7 +6065,7 @@ /obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) "Qi" = ( @@ -6931,7 +6931,7 @@ /obj/structure/table/wooden_reinforced, /obj/random/plushie, /obj/structure/cable/pink, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/common) "WN" = ( @@ -6958,7 +6958,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "itglight_port"; name = "exterior access button"; @@ -7018,7 +7018,7 @@ /obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/itglight/restrooms) "Xn" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm index 0e989ae641..9434d598e3 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm @@ -734,7 +734,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc) "TG" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm index c7adc3dd5e..3cd9e90a85 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm @@ -122,7 +122,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_hc_skel_eng) "fI" = ( @@ -384,8 +384,7 @@ /turf/simulated/floor/reinforced, /area/shuttle/mackerel_hc_skel) "ut" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /obj/machinery/light, @@ -514,7 +513,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/plating, /area/shuttle/mackerel_hc_skel) "Dl" = ( @@ -706,8 +705,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; +/obj/machinery/fire_alarm/alarms_hidden/east_mount{ pixel_x = -26 }, /obj/structure/railing/grey, @@ -1014,7 +1012,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_hc_skel_cockpit) "ZJ" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm index a854ec53bc..046ffc1caa 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm @@ -279,7 +279,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc) "sL" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm b/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm index 7211465bfe..2703ad23b7 100644 --- a/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm +++ b/maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm @@ -287,7 +287,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_sh) "sL" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm b/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm index 182bc628b8..03b2879a5b 100644 --- a/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm @@ -43,7 +43,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/mercbase/airlock) "ag" = ( @@ -254,10 +254,7 @@ /turf/simulated/floor/plating, /area/mercbase/panels) "de" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/dock) "dD" = ( @@ -276,7 +273,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/power) "fM" = ( @@ -531,7 +528,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/command) "gT" = ( @@ -579,7 +576,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalOR) "ha" = ( @@ -858,7 +855,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/hydrant{ pixel_x = -32 }, @@ -965,7 +962,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/eqroom) "hV" = ( @@ -1173,7 +1170,7 @@ /area/mercbase/medicalstorage) "is" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/barracks) "iw" = ( @@ -1436,14 +1433,14 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalstorage) "jk" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/hall) "jl" = ( @@ -1477,7 +1474,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/engineering) "jo" = ( @@ -1677,7 +1674,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/mercbase/atmos) "jN" = ( @@ -1833,14 +1830,14 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/mercbase/airlock) "kh" = ( /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/mercbase/fuel) "ki" = ( @@ -2200,10 +2197,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor, /area/mercbase/fuel) "kY" = ( @@ -2222,10 +2216,7 @@ /turf/simulated/floor, /area/mercbase/atmos) "lB" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/closet/secure_closet/chemical{ req_access = list(150) }, @@ -2236,10 +2227,7 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/medicalstorage) "lC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/power/terminal, /obj/structure/cable, /obj/structure/table/reinforced, @@ -2448,10 +2436,7 @@ /area/mercbase/medical) "lZ" = ( /obj/structure/bed/padded, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/barracks) "ma" = ( @@ -2506,7 +2491,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/dock) "mu" = ( @@ -2572,7 +2557,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "mD" = ( @@ -2880,61 +2865,37 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "nq" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medical) "nr" = ( /obj/machinery/optable, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/medicalOR) "ns" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/power) "nt" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/solar) "nu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/engineering) "nv" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/hall) "nw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor, /area/mercbase/atmos) "nx" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "ny" = ( @@ -3281,10 +3242,7 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/roid) "oJ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 32 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/mercbase/command) "oK" = ( diff --git a/maps/templates/shuttles/overmaps/generic/mercship.dmm b/maps/templates/shuttles/overmaps/generic/mercship.dmm index 4834347830..70068fe29b 100644 --- a/maps/templates/shuttles/overmaps/generic/mercship.dmm +++ b/maps/templates/shuttles/overmaps/generic/mercship.dmm @@ -33,9 +33,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine1) "ag" = ( @@ -167,7 +165,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine1) "aw" = ( @@ -307,7 +305,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/mercenary/barracks) "aO" = ( @@ -419,7 +417,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hangar) "bb" = ( @@ -519,9 +517,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bm" = ( @@ -602,9 +598,7 @@ /obj/machinery/button/remote/blast_door{ id = "mercblast" }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/bridge) "bv" = ( @@ -853,7 +847,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bT" = ( @@ -1038,7 +1032,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med1) "ck" = ( @@ -1084,7 +1078,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineeringcntrl) "cq" = ( @@ -1107,7 +1101,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/northairlock) "cs" = ( @@ -1302,8 +1296,7 @@ /area/ship/mercenary/hangar) "cL" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -1450,7 +1443,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall1) "cY" = ( @@ -1484,7 +1477,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/bridge) "db" = ( @@ -1756,7 +1749,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/southairlock) "dC" = ( @@ -1811,7 +1804,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/air) "dI" = ( @@ -1856,7 +1849,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/med) "dM" = ( @@ -2012,7 +2005,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineering) "ef" = ( @@ -2088,9 +2081,7 @@ }, /obj/fiftyspawner/uranium, /obj/fiftyspawner/uranium, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineeringcntrl) "ep" = ( @@ -2236,7 +2227,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall2) "eK" = ( @@ -2542,7 +2533,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 10 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/ship/mercenary/engine) "fm" = ( @@ -2646,8 +2637,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/plating, @@ -2692,8 +2682,7 @@ dir = 9 }, /obj/machinery/meter, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -2874,7 +2863,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/fighter) "fU" = ( @@ -3041,7 +3030,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/mercenary/armoury) "gi" = ( @@ -3149,7 +3138,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/atmos) "gw" = ( @@ -3228,9 +3217,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/hall2) "gC" = ( @@ -3352,8 +3339,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -3374,8 +3360,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -3424,9 +3409,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/engineering) "gW" = ( @@ -3459,8 +3442,7 @@ dir = 5 }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/white, @@ -3615,8 +3597,7 @@ /area/ship/mercenary/engineering) "hp" = ( /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -3743,8 +3724,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorblack, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, diff --git a/maps/templates/shuttles/overmaps/generic/salamander.dmm b/maps/templates/shuttles/overmaps/generic/salamander.dmm index f008eb20e9..4446ef757c 100644 --- a/maps/templates/shuttles/overmaps/generic/salamander.dmm +++ b/maps/templates/shuttles/overmaps/generic/salamander.dmm @@ -79,7 +79,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_galley) "bK" = ( @@ -155,7 +155,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_head) "cC" = ( @@ -398,7 +398,7 @@ /obj/structure/bed/chair/bay/comfy{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_cockpit) "gC" = ( @@ -651,15 +651,15 @@ dir = 4; req_one_access = list(160) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_cockpit) "ks" = ( @@ -1069,7 +1069,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_q2) "qu" = ( @@ -1165,6 +1165,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_engineering) "ub" = ( @@ -1284,7 +1290,7 @@ dir = 8; pixel_x = -32 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_q2) "Bf" = ( @@ -1325,6 +1331,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_cockpit) "DK" = ( @@ -1722,7 +1731,7 @@ /obj/structure/handrail{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_engineering) "Vs" = ( @@ -1771,12 +1780,12 @@ name = "Salamander Engineering Bay"; req_one_access = list(160) }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_engineering) "WP" = ( @@ -1878,7 +1887,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) diff --git a/maps/templates/shuttles/overmaps/generic/screebarge.dmm b/maps/templates/shuttles/overmaps/generic/screebarge.dmm index fde4851e54..6002ab613b 100644 --- a/maps/templates/shuttles/overmaps/generic/screebarge.dmm +++ b/maps/templates/shuttles/overmaps/generic/screebarge.dmm @@ -158,7 +158,7 @@ /area/shuttle/screebarge/fore) "aw" = ( /obj/structure/cable/cyan, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/reinforced, /area/shuttle/screebarge/fore) "ax" = ( @@ -396,7 +396,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/screebarge/mid) "bg" = ( @@ -459,7 +459,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/plating, /area/shuttle/screebarge/aft) "bo" = ( diff --git a/maps/templates/shuttles/overmaps/generic/shelter_5.dmm b/maps/templates/shuttles/overmaps/generic/shelter_5.dmm index 684cbd11ed..912e1e3267 100644 --- a/maps/templates/shuttles/overmaps/generic/shelter_5.dmm +++ b/maps/templates/shuttles/overmaps/generic/shelter_5.dmm @@ -124,7 +124,7 @@ "n" = ( /obj/machinery/door/airlock/external, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "escapepod_shuttle_docker"; pixel_x = -5; @@ -149,7 +149,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "escapepod_shuttle_docker"; name = "exterior access button"; @@ -190,7 +190,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/deployable/escapepod) "u" = ( diff --git a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm index d35c63663f..27cf678002 100644 --- a/maps/templates/shuttles/overmaps/generic/shelter_6.dmm +++ b/maps/templates/shuttles/overmaps/generic/shelter_6.dmm @@ -511,7 +511,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tabiranth_airlock"; name = "exterior access button"; @@ -649,7 +649,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tabiranth_airlock"; pixel_x = 5; @@ -667,7 +667,7 @@ req_one_access = list(101) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "tabiranth_docker"; pixel_x = -5; @@ -1034,7 +1034,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/shuttle/tabiranth) "aY" = ( @@ -1666,7 +1666,7 @@ }, /obj/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "tabiranth_docker"; name = "exterior access button"; diff --git a/maps/templates/shuttles/overmaps/generic/vespa.dmm b/maps/templates/shuttles/overmaps/generic/vespa.dmm index e78ec4dbb1..a41bc490c8 100644 --- a/maps/templates/shuttles/overmaps/generic/vespa.dmm +++ b/maps/templates/shuttles/overmaps/generic/vespa.dmm @@ -8,7 +8,7 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/firealarm{ +/obj/machinery/fire_alarm{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -16,8 +16,7 @@ "ac" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -243,7 +242,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor, /area/ship/expe/atmospherics) "aP" = ( @@ -380,7 +379,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/maintenancerim) "bn" = ( @@ -534,9 +533,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seccells) "bE" = ( @@ -628,7 +625,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/northairlock) "bO" = ( @@ -782,7 +779,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/maintenance2) "cq" = ( @@ -882,7 +879,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin1) @@ -902,7 +899,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin2) @@ -921,7 +918,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin3) @@ -940,7 +937,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin4) @@ -960,7 +957,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin5) @@ -980,7 +977,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin6) @@ -999,7 +996,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin7) @@ -1018,7 +1015,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin8) @@ -1038,7 +1035,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin9) @@ -1102,7 +1099,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/maintenance1) "dk" = ( @@ -1493,8 +1490,7 @@ /turf/simulated/wall/rpshull, /area/ship/expe/corridor1) "em" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1513,8 +1509,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin1) "ep" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1532,8 +1527,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin2) "es" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1552,8 +1546,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin3) "ev" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1571,8 +1564,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin4) "ey" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1591,8 +1583,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin5) "eB" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1610,8 +1601,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin6) "eE" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1630,8 +1620,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin7) "eH" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1649,8 +1638,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/cabin8) "eK" = ( -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -1784,7 +1772,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) "fg" = ( @@ -2014,7 +2002,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor4) "fD" = ( @@ -2089,7 +2077,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/bridge) "fM" = ( @@ -2456,8 +2444,7 @@ icon_state = "1-4" }, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -2741,10 +2728,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor3) "gU" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/power/terminal, /obj/structure/cable, /obj/effect/floor_decal/techfloor, @@ -2756,8 +2740,7 @@ /area/ship/expe/corridor3) "gW" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -2941,7 +2924,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor1) "ht" = ( @@ -3114,7 +3097,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineeringstorage) "hN" = ( @@ -3248,7 +3231,7 @@ }, /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/yellow/bordercorner, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineering) "hU" = ( @@ -3312,8 +3295,7 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/yellow/border, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -3436,7 +3418,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/sm) "ie" = ( @@ -3743,7 +3725,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seceq) "iH" = ( @@ -3793,7 +3775,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/secmain) "iL" = ( @@ -3847,9 +3829,7 @@ /turf/simulated/wall/rpshull, /area/ship/expe/medicalchem) "iP" = ( -/obj/machinery/firealarm{ - pixel_y = 28 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -3894,7 +3874,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalchem) "iT" = ( @@ -4662,7 +4642,6 @@ dir = 9 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -4755,7 +4734,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineeringpower) "kJ" = ( @@ -5250,7 +5229,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 5 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/engineeringequipment) "lN" = ( @@ -5776,8 +5755,7 @@ "mL" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/yellow/border, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -5790,8 +5768,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -6190,8 +6167,7 @@ icon_state = "1-4" }, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -6233,10 +6209,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/sechall) "nG" = ( @@ -6358,8 +6331,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -6405,11 +6377,7 @@ /turf/simulated/floor/tiled/white, /area/ship/expe/medicalmain) "nY" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/power/terminal{ dir = 8 }, @@ -6722,7 +6690,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor6) "oB" = ( @@ -6911,7 +6879,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby2) "oY" = ( @@ -6988,7 +6956,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalmain) "pf" = ( @@ -7025,8 +6993,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -7323,7 +7290,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/expedition) "pQ" = ( @@ -7368,7 +7335,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangar) "pU" = ( @@ -7396,7 +7363,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seccells) "pW" = ( @@ -7430,10 +7397,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby) "pZ" = ( @@ -7446,7 +7410,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/sechall) "qa" = ( @@ -7456,10 +7420,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 6 }, -/obj/machinery/firealarm/alarms_hidden{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/alarms_hidden/east_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby2) "qb" = ( @@ -7719,11 +7680,7 @@ /area/ship/expe/smstorage) "qD" = ( /obj/machinery/power/emitter, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 32 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/power/terminal{ dir = 1 }, @@ -7771,7 +7728,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/captqua) "qK" = ( @@ -8153,7 +8110,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor, /area/ship/expe/corridor4) "rJ" = ( @@ -8483,7 +8440,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 9 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/seclobby) "sv" = ( @@ -8536,9 +8493,7 @@ /turf/simulated/floor/tiled/white, /area/ship/expe/medical) "sz" = ( -/obj/machinery/firealarm{ - pixel_y = 31 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/bed/chair, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -8611,7 +8566,7 @@ dir = 9 }, /obj/item/storage/box/freezer, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medicalsur) "sF" = ( @@ -8730,9 +8685,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medical1) "sN" = ( @@ -8995,8 +8948,7 @@ }, /obj/structure/table/reinforced, /obj/item/storage/firstaid/surgery, -/obj/machinery/firealarm/alarms_hidden{ - dir = 8; +/obj/machinery/fire_alarm/alarms_hidden/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -9034,7 +8986,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/white, /area/ship/expe/medical1) "tN" = ( @@ -9144,7 +9096,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor5) "tY" = ( @@ -9489,10 +9441,7 @@ /turf/simulated/floor/tiled/white, /area/ship/expe/medical) "uP" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/power/terminal, /obj/structure/cable, /obj/structure/bed/chair{ @@ -9512,7 +9461,6 @@ dir = 6 }, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -9660,8 +9608,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; +/obj/machinery/fire_alarm/alarms_hidden/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -9994,7 +9941,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor2) "wf" = ( @@ -10304,9 +10251,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm/alarms_hidden{ - pixel_y = 23 - }, +/obj/machinery/fire_alarm/alarms_hidden/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/corridor2) "wT" = ( @@ -10489,7 +10434,7 @@ /area/ship/expe/maintenancerim) "xH" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/southairlock) "xI" = ( @@ -10539,7 +10484,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/alarms_hidden/north_bump, +/obj/machinery/power/apc/alarms_hidden/north_mount, /turf/simulated/floor, /area/ship/expe/engines) "xZ" = ( diff --git a/maps/tether/engines.dm b/maps/tether/engines.dm index 6d739a471a..1ace0522c5 100644 --- a/maps/tether/engines.dm +++ b/maps/tether/engines.dm @@ -9,11 +9,11 @@ suffix = "rust.dmm" display_name = list("Budget Star", "Bane of Synthetics", "Glowy Field", "Funny Spinny EM Field", "Protean Rarity Enforcement") -/datum/map_template/engine/tether/singulo +/*/datum/map_template/engine/tether/singulo name = "ProcEngine_Tether_Singulo" desc = "Lord Singuloth" suffix = "singulo.dmm" - display_name = list("Hypnosis Swirls", "Lord Singuloth", "The Devourer of Stations", "Contained Black Hole", "The Forbidden Succ") + display_name = list("Hypnosis Swirls", "Lord Singuloth", "The Devourer of Stations", "Contained Black Hole", "The Forbidden Succ")*/ /datum/map_template/engine/tether/supermatter name = "ProcEngine_Tether_Supermatter" diff --git a/maps/tether/engines/rust.dmm b/maps/tether/engines/rust.dmm index 04fc0efe6a..457bdf0cb2 100644 --- a/maps/tether/engines/rust.dmm +++ b/maps/tether/engines/rust.dmm @@ -88,7 +88,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "an" = ( /turf/simulated/floor/reinforced, @@ -104,9 +104,8 @@ /turf/simulated/floor, /area/engineering/engine_room) "ar" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "as" = ( @@ -334,7 +333,7 @@ /turf/simulated/floor/reinforced, /area/engineering/engine_room) "bc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "bd" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, @@ -370,11 +369,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "bj" = ( @@ -587,22 +582,19 @@ /turf/space, /area/space) "bM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "bN" = ( @@ -698,22 +690,19 @@ /turf/space, /area/space) "bZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + opacity = 0; dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "ca" = ( @@ -789,19 +778,16 @@ /turf/space, /area/space) "ck" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cl" = ( @@ -969,15 +955,11 @@ /obj/machinery/camera/network/engine{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "cG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "cH" = ( /turf/simulated/floor, @@ -1030,9 +1012,7 @@ /area/engineering/engine_room) "cO" = ( /obj/machinery/door/blast/regular{ - dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/door/firedoor/glass, @@ -1198,7 +1178,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "dk" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -1235,11 +1215,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, @@ -1248,8 +1224,7 @@ "dp" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor, @@ -1271,13 +1246,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineEmitterPortWest2"; - name = "Engine Room Blast Doors"; - pixel_x = 25; - req_one_access = list(11,24) - }, /turf/simulated/floor, /area/engineering/engine_gas) "dt" = ( @@ -1286,18 +1254,16 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "du" = ( /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; + id = "EngineEmitterPortWest"; name = "Engine Gas Storage" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/template_noop) "dv" = ( @@ -1306,11 +1272,16 @@ icon_state = "1-2" }, /obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; + id = "EngineEmitterPortWest"; name = "Engine Gas Storage" }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine control room blast doors."; + id = "EngineEmitterPortWest2"; + name = "Engine Room Blast Doors"; + pixel_x = 25; + req_one_access = list(11,24) + }, /turf/simulated/floor/tiled/steel_grid, /area/template_noop) "dw" = ( @@ -1359,6 +1330,17 @@ /obj/machinery/power/smes/buildable/engine/rust, /turf/template_noop, /area/template_noop) +"Cy" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + id = "EngineEmitterPortWest"; + name = "Engine Gas Storage" + }, +/turf/simulated/floor, +/area/engineering/engine_gas) +"YO" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) (1,1,1) = {" aa @@ -1684,20 +1666,20 @@ aa aa ai aj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO +YO bM bZ ck @@ -1716,7 +1698,7 @@ aa aa ai ab -ak +YO an an an @@ -1748,7 +1730,7 @@ aa aa ai ab -ak +YO an an an @@ -1780,7 +1762,7 @@ aa aa aj aj -ak +YO an an an @@ -1799,7 +1781,7 @@ cc cn cy cJ -cO +Cy cH dg dm @@ -1844,7 +1826,7 @@ aa aa aj aj -ak +YO an aA an @@ -1876,7 +1858,7 @@ aa aa ai ab -ak +YO an aA an @@ -1908,7 +1890,7 @@ aa aa ai ab -ak +YO an aA an @@ -1929,7 +1911,7 @@ cA cL cP cY -ak +YO aa aa aa @@ -1940,7 +1922,7 @@ aa aa ai aj -ak +YO ao ag ao @@ -1961,7 +1943,7 @@ cB cM cQ cZ -ak +YO aa aa aa @@ -1972,7 +1954,7 @@ aa aa aj ab -ak +YO aU aC aJ @@ -1993,7 +1975,7 @@ bT ce cR da -ak +YO aa aa aa @@ -2004,7 +1986,7 @@ aa aa ai ab -ak +YO af aD aK @@ -2036,7 +2018,7 @@ aa aa ai aj -ak +YO ar aE ar @@ -2057,7 +2039,7 @@ cC cg cs dc -ak +YO aa aa aa @@ -2068,7 +2050,7 @@ aa aa ai ab -ak +YO as aq aL @@ -2089,7 +2071,7 @@ cD ch ct dd -ak +YO aa aa aa @@ -2100,7 +2082,7 @@ aa aa aj ab -ak +YO at aq aq @@ -2121,7 +2103,7 @@ cE bk cS aq -ak +YO aa aa aa @@ -2132,7 +2114,7 @@ aa aa ai ab -ak +YO au aq aM @@ -2153,7 +2135,7 @@ cF cN cT de -ak +YO aa aa aa @@ -2165,11 +2147,11 @@ aa ai aj am -ak -ak -ak -ak -ak +YO +YO +YO +YO +YO bc bc bc diff --git a/maps/tether/engines/singulo.dmm b/maps/tether/engines/singulo.dmm index 7c4506fb7f..43d250292f 100644 --- a/maps/tether/engines/singulo.dmm +++ b/maps/tether/engines/singulo.dmm @@ -116,7 +116,7 @@ /area/space) "at" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_north_airlock"; name = "exterior access button"; @@ -170,7 +170,7 @@ /area/engineering/engine_room) "aw" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_north_airlock"; name = "interior access button"; @@ -224,11 +224,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor, /area/engineering/engine_gas) "az" = ( @@ -323,7 +319,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -399,11 +394,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "aO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -449,7 +440,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -552,7 +542,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -750,11 +739,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -1132,7 +1117,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, @@ -1276,7 +1260,7 @@ /area/space) "ct" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_south_airlock"; name = "exterior access button"; @@ -1329,7 +1313,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_south_airlock"; name = "interior access button"; @@ -1438,7 +1422,6 @@ dir = 2; icon_state = "pdoor0"; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door"; opacity = 0 }, diff --git a/maps/tether/engines/sme.dmm b/maps/tether/engines/sme.dmm index ebafa4928f..96b254410c 100644 --- a/maps/tether/engines/sme.dmm +++ b/maps/tether/engines/sme.dmm @@ -107,14 +107,14 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "au" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "av" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "aw" = ( /obj/machinery/atmospherics/portables_connector{ @@ -208,11 +208,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "aL" = ( @@ -249,20 +245,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 2; + dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -354,20 +340,7 @@ }, /area/engineering/engine_room) "aZ" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - dir = 2; - id = "SupermatterPort"; - layer = 3.3; - name = "Reactor Blast Door" - }, -/turf/simulated/floor, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "ba" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central4{ @@ -493,18 +466,10 @@ }, /area/engineering/engine_room) "bk" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 2; + dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -551,21 +516,10 @@ /area/engineering/engine_room) "br" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 4; + dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -580,21 +534,10 @@ /turf/simulated/floor/reinforced, /area/engineering/engine_room) "bt" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, +/obj/spawner/window/borosillicate/reinforced/full, /obj/machinery/door/blast/regular{ - dir = 4; + dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -661,7 +604,6 @@ /area/template_noop) "bB" = ( /obj/machinery/computer/general_air_control/supermatter_core{ - dir = 1; input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; @@ -802,22 +744,19 @@ /turf/space, /area/space) "bP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "bQ" = ( @@ -922,22 +861,19 @@ /turf/simulated/floor, /area/engineering/engine_room) "ce" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + opacity = 0; dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cf" = ( @@ -1013,19 +949,16 @@ /turf/space, /area/space) "cp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; - opacity = 0 + opacity = 0; + dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_room) "cq" = ( @@ -1180,15 +1113,11 @@ /obj/machinery/camera/network/engine{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/engineering/engine_room) "cJ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "cK" = ( /turf/simulated/floor, @@ -1200,7 +1129,6 @@ id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; pixel_y = -25; - req_access = null; req_one_access = list(11,24) }, /obj/machinery/camera/network/engine{ @@ -1248,7 +1176,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/door/firedoor/glass, @@ -1309,7 +1236,6 @@ id = "EngineEmitterPortWest"; name = "Engine Room Blast Doors"; pixel_y = 25; - req_access = null; req_one_access = list(11,24) }, /turf/simulated/floor, @@ -1407,7 +1333,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "dn" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -1444,11 +1370,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, @@ -1457,8 +1379,7 @@ "ds" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor, @@ -1480,14 +1401,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineEmitterPortWest2"; - name = "Engine Room Blast Doors"; - pixel_x = 25; - req_access = null; - req_one_access = list(11,24) - }, /turf/simulated/floor, /area/engineering/engine_gas) "dw" = ( @@ -1496,14 +1409,13 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) "dx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest2"; - layer = 3.3; name = "Engine Gas Storage" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1518,9 +1430,15 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "EngineEmitterPortWest2"; - layer = 3.3; name = "Engine Gas Storage" }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine control room blast doors."; + id = "EngineEmitterPortWest2"; + name = "Engine Room Blast Doors"; + pixel_x = 25; + req_one_access = list(11,24) + }, /turf/simulated/floor/tiled/steel_grid, /area/template_noop) "ge" = ( @@ -1871,13 +1789,13 @@ ad ad ad ad -as -as +aZ +aZ bP ce cp at -as +aZ cJ cJ cJ @@ -1900,10 +1818,10 @@ ac ac ac at -as -as -as -as +aZ +aZ +aZ +aZ bC bQ cf @@ -1931,7 +1849,7 @@ ab ab ab ab -as +aZ aL aW bh @@ -1995,7 +1913,7 @@ ab ab ab ab -as +aZ aN aY bj @@ -2025,11 +1943,11 @@ ac ad ac ac -as -as -as -aO aZ +aZ +aZ +aO +bk bk as bG @@ -2057,7 +1975,7 @@ ae ao ae ao -as +aZ aw aG aP @@ -2089,7 +2007,7 @@ af af af af -as +aZ ax aC aQ @@ -2104,7 +2022,7 @@ cE cO cS db -as +aZ aa aa aa @@ -2121,7 +2039,7 @@ ag ag ag ag -as +aZ ay aH aR @@ -2136,7 +2054,7 @@ cF cP cT dc -as +aZ aa aa aa @@ -2153,7 +2071,7 @@ af af af af -as +aZ az az aS @@ -2168,7 +2086,7 @@ bX cj cU dd -as +aZ aa aa aa @@ -2232,7 +2150,7 @@ bZ cl cx df -as +aZ aa aa aa @@ -2249,7 +2167,7 @@ ak ak ak ak -as +aZ aC aJ aT @@ -2264,7 +2182,7 @@ cG cm cy dg -as +aZ aa aa aa @@ -2281,7 +2199,7 @@ af af af af -as +aZ aD aD aE @@ -2296,7 +2214,7 @@ cH cb cV aE -as +aZ aa aa aa @@ -2313,7 +2231,7 @@ ag ag ag ag -as +aZ aE aK aU @@ -2328,7 +2246,7 @@ cI cQ cW dh -as +aZ aa aa aa @@ -2353,7 +2271,7 @@ aV av bz bz -aa +bz bz bz av diff --git a/maps/tether/engines/tesla.dmm b/maps/tether/engines/tesla.dmm index fc4236fdec..937505d3fb 100644 --- a/maps/tether/engines/tesla.dmm +++ b/maps/tether/engines/tesla.dmm @@ -15,10 +15,10 @@ /turf/space, /area/space) "ae" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "af" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "ag" = ( /obj/machinery/atmospherics/portables_connector{ @@ -116,7 +116,7 @@ /area/space) "at" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_north_airlock"; name = "exterior access button"; @@ -171,7 +171,7 @@ /area/engineering/engine_room) "aw" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_north_airlock"; name = "interior access button"; @@ -225,11 +225,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor, /area/engineering/engine_gas) "az" = ( @@ -278,7 +274,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "aD" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -407,11 +403,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "aO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -523,25 +515,6 @@ }, /turf/simulated/floor/airless, /area/space) -"aY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/turf/simulated/floor, -/area/submap/pa_room) "aZ" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -576,20 +549,15 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "bd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; + id = "SupermatterPort"; + name = "Reactor Blast Door"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "be" = ( @@ -610,10 +578,10 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/submap/pa_room) "bi" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/submap/pa_room) "bj" = ( /obj/structure/cable/cyan{ @@ -656,24 +624,8 @@ /turf/simulated/floor/tiled, /area/engineering/engine_room) "bm" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/template_noop) -"bn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/submap/pa_room) "bo" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 5 @@ -708,11 +660,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -778,12 +726,10 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "bC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bD" = ( @@ -808,22 +754,18 @@ /turf/simulated/floor/airless, /area/space) "bF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; + id = "SupermatterPort"; + name = "Reactor Blast Door"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bG" = ( @@ -869,9 +811,6 @@ /turf/simulated/floor/tiled, /area/submap/pa_room) "bL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -881,6 +820,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bM" = ( @@ -936,9 +876,6 @@ /turf/template_noop, /area/template_noop) "bP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -946,9 +883,7 @@ name = "Engine Radiator Viewport Shutter"; opacity = 0 }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/submap/pa_room) "bQ" = ( @@ -1160,20 +1095,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_room) -"cm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "EngineRadiatorViewport"; - name = "Engine Radiator Viewport Shutter"; - opacity = 0 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor, -/area/submap/pa_room) "cn" = ( /obj/structure/cable/cyan{ icon_state = "2-4" @@ -1239,7 +1160,7 @@ /area/space) "ct" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_south_airlock"; name = "exterior access button"; @@ -1293,7 +1214,7 @@ icon_state = "4-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_south_airlock"; name = "interior access button"; @@ -1374,23 +1295,18 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room) "cC" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/space) "cE" = ( /obj/machinery/door/blast/regular{ density = 0; - dir = 2; + dir = 4; icon_state = "pdoor0"; id = "SupermatterPort"; name = "Reactor Blast Door"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/engineering/engine_room) "cF" = ( @@ -1560,7 +1476,7 @@ ab ab ab ab -ad +ac ab aa "} @@ -1592,7 +1508,7 @@ ab ab ab ad -ad +ac ab aa "} @@ -1963,12 +1879,12 @@ aB ab ab ab -aY -bn -bn +bd +bd +bd bF -bn -bn +bd +bd bd ab ab @@ -2001,7 +1917,7 @@ bw bQ bW bX -cm +bP ab ab ab @@ -2033,7 +1949,7 @@ bx bG bR ca -cm +bP ab ab ab diff --git a/maps/tether/levels/midpoint.dmm b/maps/tether/levels/midpoint.dmm index 405d046691..3e10839ea8 100644 --- a/maps/tether/levels/midpoint.dmm +++ b/maps/tether/levels/midpoint.dmm @@ -15,11 +15,32 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"ak" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/air_alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "aP" = ( /obj/effect/blocker, /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b, /area/tether/transit) +"aS" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "bq" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -27,6 +48,9 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"bS" = ( +/turf/simulated/open, +/area/tether/elevator) "bU" = ( /obj/structure/cable{ icon_state = "2-8" @@ -58,6 +82,49 @@ }, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"dz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/green/bordercorner, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"eB" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"gm" = ( +/turf/simulated/open, +/area/tether/elevator/two) +"gH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "gQ" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -65,81 +132,96 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"hh" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ +"hi" = ( +/turf/simulated/wall/prepainted, +/area/maintenance/tether_midpoint) +"il" = ( +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"in" = ( +/obj/machinery/air_alarm{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced{ +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) -"hi" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/tether_midpoint) -"ht" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +"iR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) -"il" = ( -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/maintenance/tether_midpoint) -"ir" = ( -/turf/simulated/sky/virgo3b, -/area/tether/transit) "jC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"ku" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "kY" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) "lq" = ( /turf/simulated/floor/wood, /area/tether/midpoint) -"lw" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/midpoint) +"mr" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/blocker, +/turf/simulated/sky/virgo3b, +/area/tether/transit) "mP" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/midpoint) -"ns" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) -"nz" = ( -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) "nM" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -176,6 +258,12 @@ /obj/machinery/vending/boozeomat, /turf/simulated/floor/wood, /area/tether/midpoint) +"oZ" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/blocker, +/turf/simulated/sky/virgo3b, +/area/tether/transit) "pc" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -184,10 +272,26 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "qm" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) +"qp" = ( +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) +"rh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "sg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -204,11 +308,8 @@ /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) "sx" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -236,11 +337,17 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"vf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" +"tk" = ( +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, +/turf/simulated/sky/virgo3b, +/area/tether/transit) +"uz" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -271,37 +378,42 @@ /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b, /area/tether/transit) -"yj" = ( -/obj/machinery/holoposter{ - pixel_y = -30 +"yx" = ( +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "yF" = ( -/obj/machinery/air_alarm{ - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "zk" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "zm" = ( /obj/machinery/light/small{ @@ -335,6 +447,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/tether_midpoint) +"AL" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "AM" = ( /obj/structure/table/woodentable, /obj/machinery/camera/network/civilian{ @@ -356,6 +480,28 @@ /obj/structure/disposalpipe/up, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"Ch" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"CE" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "CI" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -383,18 +529,10 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "DG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) -"DO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "Ea" = ( /obj/structure/table/woodentable, @@ -430,19 +568,49 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"Hx" = ( +"Hl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Hu" = ( +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Hx" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) "Id" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -453,15 +621,34 @@ /obj/machinery/disposal, /turf/simulated/floor/wood, /area/tether/midpoint) +"Ix" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "IR" = ( /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/tether/midpoint) +"Jc" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) "Ji" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monodark, /area/tether/midpoint) "Jt" = ( /obj/machinery/light{ @@ -469,11 +656,7 @@ }, /obj/structure/flora/pottedplant/unusual, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/tether/midpoint) "Ke" = ( @@ -482,6 +665,15 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Kf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Kk" = ( /obj/structure/table/gamblingtable, /obj/item/reagent_containers/food/drinks/shaker, @@ -493,6 +685,23 @@ /obj/random/plushie, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"LU" = ( +/obj/machinery/holoposter{ + pixel_y = -30 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "NI" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/catering/bar_soft{ @@ -513,28 +722,15 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) -"Ov" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +"PV" = ( /obj/machinery/light{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/tether/midpoint) -"PV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) @@ -556,17 +752,99 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "Rd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Rk" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"So" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"Sy" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"SE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) -"TB" = ( -/turf/simulated/wall/r_wall, +"SY" = ( +/obj/machinery/fire_alarm/north_mount, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) "TY" = ( /obj/structure/disposalpipe/segment{ @@ -577,16 +855,42 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"UI" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Vk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"VH" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "VM" = ( /obj/machinery/light, /turf/simulated/floor/wood, /area/tether/midpoint) +"Wh" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Wz" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -594,6 +898,28 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Xf" = ( +/turf/simulated/wall/prepainted, +/area/tether/transit) +"XL" = ( +/obj/structure/aquarium/prefilled, +/turf/simulated/floor/tiled/monodark, +/area/tether/midpoint) +"XM" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) +"XU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "XZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -603,6 +929,29 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/tether_midpoint) +"Ya" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Yc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -620,12 +969,46 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"YH" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"YS" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/computer/timeclock/premade/east, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"YT" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "YW" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 }, /turf/simulated/floor/wood, /area/tether/midpoint) +"Zf" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 5 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) "Zy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -647,7 +1030,18 @@ /turf/simulated/floor/wood, /area/tether/midpoint) "ZM" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, +/area/tether/midpoint) +"ZQ" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner, +/turf/simulated/floor/tiled/dark, /area/tether/midpoint) (1,1,1) = {" @@ -23218,10 +23612,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm il hi @@ -23412,10 +23806,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm vA hi @@ -23606,10 +24000,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm vA hi @@ -23800,10 +24194,10 @@ yi hi sg qm -kY -kY -kY -kY +bS +bS +bS +bS qm LL hi @@ -24184,18 +24578,18 @@ yi yi yi yi -yi -TB +Xf +ZM yF -Ov -vf -vf -vf +PV +Id +Id +Id Id PV -yj -TB -yi +Kf +ZM +Xf yi yi yi @@ -24378,18 +24772,18 @@ yi yi yi yi -TB -TB +mP +UI Rd Ji -ns -nz -nz +zk +zk +zk zk DG Hx -TB -TB +Kf +mP yi yi yi @@ -24572,18 +24966,18 @@ yi yi yi yi -ht -CN -Og -bY -ZM -Ke -PZ -ZM -Vk -bU -Jt -ht +mP +uz +rh +Jc +XL +XL +XL +XL +ku +qp +YT +mP yi yi yi @@ -24766,18 +25160,18 @@ yi yi yi yi -ht -YW -Og -sR -ZM -ZM -ZM -ZM -ZA -lq -YW -ht +mP +uz +rh +qp +qp +qp +qp +qp +qp +qp +YT +mP yi yi yi @@ -24960,18 +25354,18 @@ yi yi yi yi -ht -Ea -Og -bY -AV -sQ -sQ -ad -Vk -lq -AM -ht +ZM +ak +dz +Wh +Wh +Wh +Wh +AL +Wh +YH +YT +ZM yi yi yi @@ -25154,18 +25548,18 @@ yi yi yi yi -ht -As -Og -bY -IR -IR -IR -IR -Vk -lq -As -ht +mP +uz +Hu +XM +XM +CE +CE +XM +XM +yx +YT +mP yi yi yi @@ -25349,16 +25743,16 @@ yi yi yi mP -ZL -Og -jC -aj -lq -lq -sM -oe -lq -ZL +uz +Sy +XM +gm +gm +gm +gm +XM +uz +YT mP yi yi @@ -25543,16 +25937,16 @@ yi yi yi mP -YW -Og -IR -He -IR -IR -NS -IR -lq -YW +uz +Sy +XM +gm +gm +gm +gm +XM +uz +YT mP yi yi @@ -25736,18 +26130,18 @@ yi yi yi yi -mP -sQ -Og -QN -pc -Kk -QN -nM -QN -lq -sQ -mP +ZM +eB +Sy +XM +gm +gm +gm +gm +XM +uz +VH +ZM yi yi yi @@ -25931,16 +26325,16 @@ yi yi yi mP -As -bq -vu -gQ -lq -lq -lq -QG -lq -As +Zf +Ya +XM +gm +gm +gm +gm +XM +ZQ +aS mP yi yi @@ -26124,18 +26518,18 @@ yi yi yi yi -lw -hh -hh -TB -TY -lq -lq -VM -TB -hh -hh -DO +ZM +ZM +iR +XM +XM +XM +XM +XM +XM +Rk +ZM +ZM yi yi yi @@ -26318,18 +26712,18 @@ yi yi yi yi -yi -yi -yi -mP -Io -Wz -NI -oo -mP -yi -yi -yi +ZM +ZM +in +Ch +gH +gH +gH +gH +SE +LU +ZM +ZM yi yi yi @@ -26512,18 +26906,18 @@ yi yi yi yi -yi -yi -yi -lw -hh -hh -hh -hh -DO -yi -yi -yi +ZM +ZM +SY +Ix +XU +Wh +Wh +YS +Hl +So +ZM +ZM yi yi yi @@ -26706,18 +27100,18 @@ yi yi yi yi -yi -yi -yi -ir -ir -ir -ir -ir -ir -yi -yi -yi +mP +CN +Og +bY +ZM +Ke +PZ +ZM +Vk +bU +Jt +mP yi yi yi @@ -26900,18 +27294,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +YW +Og +sR +ZM +ZM +ZM +ZM +ZA +lq +YW +mP yi yi yi @@ -27094,18 +27488,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +Ea +Og +bY +AV +sQ +sQ +ad +Vk +lq +AM +mP yi yi yi @@ -27288,18 +27682,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +As +Og +bY +IR +IR +IR +IR +Vk +lq +As +mP yi yi yi @@ -27482,18 +27876,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +ZL +Og +jC +aj +lq +lq +sM +oe +lq +ZL +mP yi yi yi @@ -27676,18 +28070,18 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mP +YW +Og +IR +He +IR +IR +NS +IR +lq +YW +mP yi yi yi @@ -27860,34 +28254,34 @@ yi yi yi aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP -aP +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +mP +sQ +Og +QN +pc +Kk +QN +nM +QN +lq +sQ +mP +yi +yi +yi +yi +yi +yi aP yi yi @@ -28053,6 +28447,7 @@ yi yi yi yi +mr yi yi yi @@ -28063,26 +28458,25 @@ yi yi yi yi +mP +As +bq +vu +gQ +lq +lq +lq +QG +lq +As +mP yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28247,6 +28641,7 @@ yi yi yi yi +mr yi yi yi @@ -28257,26 +28652,25 @@ yi yi yi yi +mP +mP +mP +ZM +TY +lq +lq +VM +ZM +mP +mP +mP yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28441,6 +28835,7 @@ yi yi yi yi +mr yi yi yi @@ -28454,6 +28849,12 @@ yi yi yi yi +mP +Io +Wz +NI +oo +mP yi yi yi @@ -28463,14 +28864,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28635,6 +29029,7 @@ yi yi yi yi +mr yi yi yi @@ -28648,6 +29043,12 @@ yi yi yi yi +mP +mP +mP +mP +mP +mP yi yi yi @@ -28657,14 +29058,7 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi +mr yi yi yi @@ -28829,6 +29223,7 @@ yi yi yi yi +mr yi yi yi @@ -28838,6 +29233,7 @@ yi yi yi yi +tk yi yi yi @@ -28856,9 +29252,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29023,6 +29417,7 @@ yi yi yi yi +mr yi yi yi @@ -29032,6 +29427,7 @@ yi yi yi yi +tk yi yi yi @@ -29050,9 +29446,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29217,6 +29611,7 @@ yi yi yi yi +mr yi yi yi @@ -29226,6 +29621,7 @@ yi yi yi yi +tk yi yi yi @@ -29244,9 +29640,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29411,6 +29805,7 @@ yi yi yi yi +mr yi yi yi @@ -29420,6 +29815,7 @@ yi yi yi yi +tk yi yi yi @@ -29438,9 +29834,7 @@ yi yi yi yi -yi -yi -yi +mr yi yi yi @@ -29570,62 +29964,32 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd +xd yi yi yi @@ -29635,6 +29999,36 @@ yi yi yi yi +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +oZ +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr +mr yi yi yi @@ -29809,19 +30203,19 @@ yi yi yi yi +tk +tk +tk +tk yi yi yi yi yi yi -yi -yi -yi -yi -yi -yi -yi +tk +tk +tk yi yi yi @@ -30003,19 +30397,19 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -30781,23 +31175,23 @@ yi yi yi yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -yi -xd -xd -xd -xd -yi -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -30986,10 +31380,10 @@ yi yi yi yi -xd -xd -xd -xd +yi +yi +yi +yi yi yi yi @@ -31163,7 +31557,20 @@ xd xd xd xd -xd +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +tk +yi yi yi yi @@ -31171,19 +31578,6 @@ yi yi yi yi -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd yi yi yi @@ -31357,27 +31751,6 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd yi yi yi @@ -31390,6 +31763,27 @@ yi yi yi yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi yi yi yi @@ -31551,29 +31945,29 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk yi yi yi @@ -31745,27 +32139,27 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi yi yi yi @@ -31939,30 +32333,30 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +tk +yi xd xd xd @@ -32133,30 +32527,30 @@ xd xd xd xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd -xd +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi +yi xd xd xd diff --git a/maps/tether/levels/mining.dmm b/maps/tether/levels/mining.dmm index 1e84a5724b..93b16abbdd 100644 --- a/maps/tether/levels/mining.dmm +++ b/maps/tether/levels/mining.dmm @@ -3,9 +3,6 @@ /obj/effect/floor_decal/rust/steel_decals_rusted1, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored) -"aA" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/outpost/mining_main/passage) "aS" = ( /turf/simulated/mineral/virgo3b, /area/mine/explored) @@ -28,18 +25,12 @@ "bo" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/outpost/mining_main/secondary_gear_storage) -"bz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "bC" = ( -/obj/machinery/door/airlock/glass/mining, +/obj/spawner/window/low_wall/borosillicate/full, /obj/machinery/door/firedoor/glass{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) "bE" = ( /obj/machinery/door/firedoor/glass{ @@ -94,10 +85,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/outpost/mining_main/airlock) "dl" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -210,7 +198,9 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "fA" = ( -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 2 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "gG" = ( @@ -408,12 +398,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) -"jk" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "jz" = ( /obj/structure/railing, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -570,20 +554,12 @@ /obj/spawner/window/low_wall/borosillicate/full, /turf/simulated/floor/plating, /area/outpost/mining_main/airlock) -"nP" = ( -/obj/machinery/door/firedoor/glass, -/obj/spawner/window/low_wall/borosillicate/full, -/turf/simulated/floor/plating, -/area/outpost/mining_main/secondary_gear_storage) "nR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "nS" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/camera/network/mining{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, @@ -594,12 +570,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/airlock) -"oF" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "oN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -808,11 +778,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "tE" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -835,6 +801,9 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/light, +/obj/machinery/camera/network/mining{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "uP" = ( @@ -906,12 +875,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"wP" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "wV" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1044,7 +1007,7 @@ /area/outpost/mining_main/secondary_gear_storage) "zb" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "mining_outpost_airlock"; name = "Mining Outpost Access Button"; @@ -1188,6 +1151,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, +/obj/item/multitool, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "Df" = ( @@ -1197,11 +1161,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = 12; @@ -1349,11 +1309,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1390,27 +1346,21 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"IK" = ( -/obj/machinery/hyperpad/centre{ - map_pad_id = "lavaland_station"; - map_pad_link_id = "lavaland_away"; - newcolor = "#fcba03" - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "IS" = ( /obj/machinery/telecomms/relay/preset/mining, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"Jc" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "Jz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/camera/network/mining{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "JW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -1450,10 +1400,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -1511,26 +1458,11 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) -"La" = ( -/obj/machinery/camera/network/mining{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/secondary_gear_storage) "Lm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/outpost/mining_main/dorms) "LA" = ( @@ -1554,11 +1486,7 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "MT" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -1601,7 +1529,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "mining_outpost_airlock"; name = "Mining Outpost Access Button"; @@ -1645,20 +1573,11 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) -"Rh" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "RF" = ( /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) @@ -1694,11 +1613,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/mine/explored) "SM" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = 12; @@ -1738,10 +1653,7 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "SR" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = 10; @@ -1786,7 +1698,9 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/machinery/mining/drill, +/obj/machinery/mining/drill{ + drill_id = 1 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "Ud" = ( @@ -1807,8 +1721,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1904,10 +1817,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "Wc" = ( @@ -1934,12 +1844,6 @@ }, /turf/simulated/floor/bluegrid, /area/outpost/mining_main/airlock) -"WA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/outpost/mining_main/secondary_gear_storage) "WD" = ( /obj/structure/railing{ dir = 4 @@ -2037,6 +1941,7 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) "ZF" = ( +/obj/effect/step_trigger/teleporter/from_mining, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/passage) "ZO" = ( @@ -13297,10 +13202,10 @@ xE jJ jJ jJ -YL -YL -YL -bo +OH +OH +OH +OH OH OH OH @@ -13491,10 +13396,10 @@ Xe zi Vg vw -Jz -WA -Rh -nP +OH +OH +OH +OH OH OH OH @@ -13685,10 +13590,10 @@ rG rn pW vw -bz -IK -Jc -nP +OH +OH +OH +OH OH HX KJ @@ -13879,10 +13784,10 @@ rG rn AF vw -oF -jk -wP -nP +OH +OH +OH +OH OH HX iT @@ -14073,9 +13978,9 @@ rG rn LA vw -OQ bC -OQ +bC +bC bo bo HX @@ -14268,9 +14173,9 @@ Qe hF vw Dv -Ud -La df +df +Jz bm FZ Wb @@ -26699,9 +26604,9 @@ mk OH OH OH -aA -aA -aA +us +us +us ZF "} (128,1,1) = {" @@ -26893,10 +26798,10 @@ OH OH mk OH -aA -aA -aA us +us +us +ZF "} (129,1,1) = {" Se @@ -27087,10 +26992,10 @@ mk OH OH mk -aA -aA -aA us +us +us +ZF "} (130,1,1) = {" Se @@ -27281,10 +27186,10 @@ OH OH OH mk -aA -aA -aA us +us +us +ZF "} (131,1,1) = {" Se @@ -27475,10 +27380,10 @@ mk OH OH OH -aA -aA -aA us +us +us +ZF "} (132,1,1) = {" Se @@ -27669,10 +27574,10 @@ OH OH OH mk -aA -aA -aA us +us +us +ZF "} (133,1,1) = {" Se @@ -27863,10 +27768,10 @@ OH OH OH OH -aA -aA -aA us +us +us +ZF "} (134,1,1) = {" Se @@ -28057,10 +27962,10 @@ mk OH OH mk -aA -aA -aA us +us +us +ZF "} (135,1,1) = {" Se @@ -28251,10 +28156,10 @@ OH OH OH OH -aA -aA -aA us +us +us +ZF "} (136,1,1) = {" Se @@ -28445,10 +28350,10 @@ OH OH OH OH -aA -aA -aA us +us +us +ZF "} (137,1,1) = {" Se diff --git a/maps/tether/levels/misc.dmm b/maps/tether/levels/misc.dmm index a660ce24a9..2a9ac6e0ce 100644 --- a/maps/tether/levels/misc.dmm +++ b/maps/tether/levels/misc.dmm @@ -4,7 +4,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "ag" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/bottle/biomass{ @@ -29,7 +29,7 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "ah" = ( /turf/space/transit/south, /area/space) @@ -41,28 +41,37 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"am" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "at" = ( /obj/machinery/light, /obj/structure/bed/chair/wood/wings{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "aw" = ( /obj/structure/bed/chair/holochair{ dir = 1 }, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"aA" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm4) "aB" = ( /obj/machinery/door/window/holowindoor{ dir = 8; name = "Red Team" }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_emptycourt) "aF" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -82,14 +91,14 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "aH" = ( /obj/structure/sign/warning/nosmoking_2, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "aM" = ( /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm5) "aN" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -98,7 +107,7 @@ name = "Green Team" }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_emptycourt) "aT" = ( /obj/machinery/camera/network/crescent{ dir = 1 @@ -107,7 +116,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "aY" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -116,11 +125,30 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "bc" = ( /obj/machinery/ntnet_relay, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) +"bl" = ( +/turf/simulated/floor/holofloor/desert, +/area/holodeck/source_picnicarea) +"bn" = ( +/obj/item/clothing/glasses/sunglasses, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) +"bq" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"bv" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "bw" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -132,14 +160,14 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "bz" = ( /turf/space/basic, /area/space) "bB" = ( /obj/structure/sign/warning/docking_area, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "bC" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/space/transit/east, @@ -148,25 +176,25 @@ /obj/structure/table/standard, /obj/item/material/ashtray/plastic, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "bJ" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "bO" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "bV" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/tele_pad, /turf/simulated/shuttle/floor/voidcraft, -/area/space) +/area/unknown/dorm5) "bW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -178,22 +206,22 @@ pixel_y = 30 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "bY" = ( /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "cb" = ( /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "cf" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "ch" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloorblack{ @@ -204,7 +232,7 @@ }, /obj/item/material/ashtray/plastic, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ck" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ @@ -214,17 +242,23 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"cm" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "cq" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "cu" = ( /obj/item/inflatable_duck, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) "cB" = ( /obj/effect/transit/light{ dir = 4 @@ -243,7 +277,7 @@ "cK" = ( /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "cN" = ( /obj/machinery/transhuman/resleever, /obj/effect/floor_decal/borderfloorwhite{ @@ -253,7 +287,7 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "cS" = ( /obj/structure/bed/chair{ dir = 8 @@ -262,16 +296,19 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"cX" = ( +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "cY" = ( /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) "dg" = ( /obj/machinery/computer/card{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "dj" = ( /obj/effect/floor_decal/transit/orange{ dir = 4 @@ -287,12 +324,16 @@ /turf/space, /turf/space/internal_edge/bottomright, /area/space) +"dm" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dn" = ( /obj/machinery/vending/sovietsoda{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "ds" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -312,60 +353,70 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "dx" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "dI" = ( /obj/machinery/vending/cigarette{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "dU" = ( /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "dX" = ( /obj/structure/table/marble, /obj/item/storage/box/donut, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) +"dY" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "dZ" = ( /obj/structure/closet/crate/bin, /obj/machinery/camera/network/crescent, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "ed" = ( /obj/structure/flora/pottedplant/smalltree, /obj/machinery/camera/network/crescent{ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "ee" = ( /obj/effect/floor_decal/industrial/warning/dust/corner, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "eg" = ( /obj/effect/overlay/coconut, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"ei" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "en" = ( /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "et" = ( /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "eu" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 }, /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "ev" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloorblack{ @@ -375,11 +426,20 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"ey" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) +"eA" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "eB" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) "eF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -390,7 +450,19 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/meatballspagetti, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"eL" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "eM" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 8 @@ -406,24 +478,30 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "eT" = ( /obj/effect/overlay/palmtree_l, /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) "eY" = ( /obj/structure/sign/department/operational, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/medical) "fa" = ( /obj/machinery/tele_projector, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm4) +"fj" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "fk" = ( /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "fn" = ( /obj/effect/transit/light{ dir = 4 @@ -443,17 +521,17 @@ /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/head/pin/flower, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_theatre) "fu" = ( /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm2) "fx" = ( /obj/effect/floor_decal/corner/green/full{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "fy" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -464,12 +542,12 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "fA" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "fF" = ( /obj/structure/table/reinforced, /obj/item/melee/baton/loaded, @@ -477,7 +555,7 @@ /obj/item/gun/energy/taser, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "fG" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" @@ -486,18 +564,18 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "fJ" = ( /obj/structure/bed/chair, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) "fK" = ( /obj/structure/table/glass, /obj/machinery/chemical_dispenser/ert, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "fL" = ( /obj/structure/closet/walllocker, /obj/effect/floor_decal/borderfloorblack{ @@ -507,7 +585,11 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"fN" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_courtroom) "fO" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -516,13 +598,17 @@ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "fW" = ( /obj/effect/floor_decal/carpet{ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"fX" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "fY" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -532,7 +618,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "fZ" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 @@ -547,7 +633,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "ga" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -558,12 +644,12 @@ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "gc" = ( /obj/structure/table/standard, /obj/item/stack/nanopaste, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "gj" = ( /obj/structure/table/holotable, /obj/item/clothing/head/helmet/thunderdome, @@ -574,7 +660,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "gk" = ( /obj/effect/step_trigger/lost_in_space/tram, /obj/effect/floor_decal/transit/orange{ @@ -605,47 +691,50 @@ /obj/item/towel/random, /obj/item/towel/random, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm5) "gq" = ( /obj/effect/floor_decal/corner/green/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"gv" = ( +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) +"gx" = ( +/turf/unsimulated/floor/steel, +/area/centcom/control) "gy" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "gz" = ( /obj/machinery/computer/operating{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "gA" = ( /obj/item/bedsheet/rddouble, /obj/structure/bed/double/padded, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "gC" = ( /obj/machinery/computer/crew{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "gM" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 1 - }, -/obj/machinery/fitness/punching_bag/clown{ - dir = 4; - layer = 3.4 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/bathroom) "gP" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -654,13 +743,13 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "gQ" = ( /obj/item/perfect_tele_beacon{ tele_name = "Transfer" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "gR" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -692,7 +781,7 @@ name = "Shuttle Hatch" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "gY" = ( /obj/structure/table/steel, /obj/item/surgical/scalpel, @@ -700,14 +789,14 @@ /obj/item/surgical/cautery, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "gZ" = ( /obj/effect/floor_decal/rust/part_rusted3, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "ha" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -720,7 +809,7 @@ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "hb" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 8 @@ -729,12 +818,12 @@ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "hh" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/surgery, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "hi" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -742,19 +831,22 @@ icon_state = "right" }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "hk" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) +"hl" = ( +/turf/simulated/floor/tiled, +/area/shuttle/escape) "hp" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, -/area/space) +/area/centcom/simulated/terminal) "hr" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -764,36 +856,56 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "hs" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "hu" = ( /turf/simulated/floor/outdoors/beach/sand/desert, /area/space) +"hy" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hz" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "hG" = ( /obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "hI" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"hJ" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "hK" = ( /obj/structure/prop/alien/dispenser, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm2) "hL" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 }, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm5) +"hU" = ( +/obj/item/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "ic" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -805,10 +917,10 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ie" = ( /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "ig" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/hotdog, @@ -817,7 +929,7 @@ pixel_y = -3 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "in" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -826,7 +938,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "iq" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -838,24 +950,24 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "iv" = ( /turf/unsimulated/floor{ icon_state = "dark" }, -/area/space) +/area/centcom/suppy) "ix" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/large_escape_pod2/centcom) "iA" = ( /obj/structure/signpost, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "iB" = ( /obj/structure/bed/chair/comfy/black, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm4) "iI" = ( /obj/structure/window/reinforced{ dir = 8 @@ -865,20 +977,32 @@ "iJ" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"iL" = ( +/obj/structure/sign/warning{ + name = "\improper STAND AWAY FROM TRACK EDGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"iN" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_courtroom) "iO" = ( /obj/effect/floor_decal/rust/mono_rusted3, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "iT" = ( /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) +"iY" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm2) "ja" = ( /obj/structure/bed/double/padded, /obj/item/bedsheet/hopdouble, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm6) "jo" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -887,7 +1011,7 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "jr" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -898,7 +1022,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "jt" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -908,7 +1032,13 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) +"jv" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "jz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -921,34 +1051,68 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "jA" = ( /obj/machinery/door/window/brigdoor/southright{ name = "holding cell" }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) +"jD" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"jH" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm1) +"jI" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "jJ" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"jK" = ( +/obj/effect/wingrille_spawn/reinforced/crescent, +/turf/simulated/floor/plating, +/area/centcom/simulated/restaurant) +"jM" = ( +/obj/machinery/door/window/holowindoor{ + dir = 8; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "jN" = ( /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"jO" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"jQ" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_meetinghall) "jX" = ( /obj/structure/sign/hangar/two{ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "jY" = ( /obj/structure/toilet, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm3) "kb" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 @@ -957,13 +1121,13 @@ pixel_y = -32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "kc" = ( /obj/machinery/door/airlock/security{ name = "Tram Security" }, /turf/simulated/floor/tiled/red, -/area/space) +/area/shuttle/escape) "kg" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -979,7 +1143,7 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "kn" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -988,31 +1152,43 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "kp" = ( /turf/simulated/floor/holofloor/lino, -/area/space) +/area/holodeck/source_meetinghall) "kq" = ( /turf/unsimulated/beach/coastline, -/area/space) +/area/beach) "ku" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"kz" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) +"kB" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) "kI" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, /obj/machinery/light, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "kJ" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "kL" = ( /obj/item/paper{ info = "You're not supposed to be here."; @@ -1021,7 +1197,7 @@ /turf/unsimulated/floor{ icon_state = "dark" }, -/area/space) +/area/centcom/suppy) "kS" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -1030,17 +1206,20 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"kT" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm5) "lc" = ( /obj/structure/closet/alien, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "ld" = ( /obj/machinery/vending/snack{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "lh" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -1049,16 +1228,44 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) +"lk" = ( +/obj/effect/floor_decal/corner/green/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"ll" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "lr" = ( /obj/item/chess/wbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "lv" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/pastatomato, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "lw" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1067,27 +1274,38 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "ly" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "lC" = ( /turf/unsimulated/floor{ icon_state = "sandwater" }, -/area/space) +/area/beach) "lI" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) +"lN" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/holofloor/desert, +/area/holodeck/holodorm/source_desert) "lP" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) +"lR" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "lS" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 @@ -1100,7 +1318,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "lV" = ( /obj/machinery/light{ dir = 1 @@ -1113,16 +1331,20 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "lX" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_picnicarea) +"lY" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "lZ" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/meatsteak, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "md" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-22" @@ -1131,13 +1353,25 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "mn" = ( /obj/landmark{ name = "Holocarp Spawn" }, /turf/simulated/floor/holofloor/reinforced, -/area/space) +/area/holodeck/source_wildlife) +"mp" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"mq" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "mr" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -1146,7 +1380,7 @@ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "mt" = ( /obj/effect/shuttle_landmark{ base_area = /area/centcom/simulated/evac; @@ -1155,16 +1389,21 @@ name = "Centcom Recovery Area" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "my" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) +"mG" = ( +/obj/machinery/door/window/holowindoor{ + name = "Entrance 1" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "mH" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/medical) "mJ" = ( /turf/space, /turf/space/internal_edge/bottomleft, @@ -1174,13 +1413,13 @@ tele_name = "Unknown" }, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm6) "mL" = ( /obj/machinery/light{ dir = 8 }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "mM" = ( /obj/machinery/status_display{ pixel_y = -30 @@ -1193,7 +1432,7 @@ }, /obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "mO" = ( /turf/space/transit/west, /area/space) @@ -1202,17 +1441,27 @@ initial_flooring = null }, /area/space) +"mS" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "mT" = ( /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "mU" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_picnicarea) "mV" = ( /obj/item/chess/wpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"mW" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) "mZ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1226,7 +1475,7 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/kitsuneudon, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "ng" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -1235,58 +1484,79 @@ /turf/simulated/floor/holofloor/carpet{ dir = 8 }, -/area/space) +/area/holodeck/source_meetinghall) "nm" = ( /obj/machinery/camera/network/crescent{ dir = 8 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "nq" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) +"nr" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "ns" = ( /obj/landmark{ name = "endgame_exit" }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "nv" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "nx" = ( /obj/machinery/vending/cola{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"ny" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/living) "nz" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_boxingcourt) "nC" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"nD" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "nG" = ( /obj/structure/bed/chair, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"nM" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "nO" = ( /obj/effect/floor_decal/corner/green{ dir = 9 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "nQ" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ @@ -1296,7 +1566,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "nU" = ( /obj/structure/sink{ dir = 4; @@ -1307,23 +1577,27 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"nX" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/source_beach) "nZ" = ( /obj/machinery/camera/network/crescent{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "ob" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_theatre) "oc" = ( /obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "oh" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1332,7 +1606,11 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) +"oi" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "oj" = ( /obj/structure/sink{ dir = 4; @@ -1343,7 +1621,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "on" = ( /obj/structure/holohoop{ dir = 1 @@ -1352,7 +1630,14 @@ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"oo" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "oA" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1368,7 +1653,10 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"oG" = ( +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) "oI" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -1381,7 +1669,10 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"oK" = ( +/turf/unsimulated/wall, +/area/beach) "oL" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 @@ -1390,7 +1681,7 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "oN" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 @@ -1404,7 +1695,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "oP" = ( /obj/structure/closet/walllocker, /obj/effect/floor_decal/borderfloorblack{ @@ -1414,13 +1705,22 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "oQ" = ( /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "oR" = ( /turf/space/transit/north, /area/space) +"pa" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "pb" = ( /obj/effect/step_trigger/teleporter/random, /turf/space, @@ -1448,7 +1748,7 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "pj" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -1457,12 +1757,16 @@ initial_flooring = null }, /area/space) +"pl" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "po" = ( /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "pt" = ( /obj/effect/step_trigger/lost_in_space/tram, /turf/simulated/floor/tiled/techfloor/grid{ @@ -1472,21 +1776,24 @@ "pw" = ( /obj/machinery/telecomms/allinone, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) +"py" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "pD" = ( /obj/machinery/door/airlock/medical{ name = "Tram Medical" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "pF" = ( /obj/item/chess/bqueen, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "pG" = ( /obj/machinery/telecomms/server/presets/centcomm, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "pI" = ( /obj/effect/floor_decal/carpet{ dir = 5 @@ -1501,19 +1808,30 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) +"pN" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) +"pO" = ( +/obj/effect/floor_decal/rust/part_rusted3, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "pP" = ( /obj/structure/table/standard, /obj/item/reagent_containers/food/snacks/bagged/chips, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "pQ" = ( /obj/machinery/chemical_dispenser/catering/bar_coffee{ dir = 8 }, /obj/structure/table/marble, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "pS" = ( /obj/machinery/computer/rdservercontrol{ badmin = 1; @@ -1521,13 +1839,13 @@ name = "Master R&D Server Controller" }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "pV" = ( /obj/landmark{ name = "Holocarp Spawn Random" }, /turf/simulated/floor/holofloor/space, -/area/space) +/area/holodeck/source_space) "pX" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/catering/bar_soft, @@ -1535,13 +1853,13 @@ dir = 1 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "qb" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "qc" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -1553,7 +1871,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "qd" = ( /obj/structure/table/glass{ desc = "It's a table, it has some scracthes..they say 'Mlem'." @@ -1565,20 +1883,23 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "qf" = ( /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "qh" = ( /obj/machinery/light, /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "qk" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) +"qm" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_seating) "qn" = ( /obj/effect/floor_decal/carpet{ dir = 1 @@ -1590,18 +1911,21 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) +"qo" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "qs" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "qy" = ( /obj/item/beach_ball/holoball, /obj/effect/floor_decal/corner/red{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "qC" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1617,14 +1941,23 @@ name = "Shuttle Hatch" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"qD" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "qE" = ( /obj/machinery/oxygen_pump/anesthetic, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/medical) "qF" = ( /turf/unsimulated/beach/water, -/area/space) +/area/beach) +"qG" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "qI" = ( /obj/structure/table/glass, /obj/item/storage/firstaid/adv, @@ -1638,7 +1971,10 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"qK" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) "qQ" = ( /turf/space, /area/space) @@ -1649,7 +1985,7 @@ }, /obj/item/chess/bknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "qX" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -1663,7 +1999,7 @@ id = "QMLoad2" }, /turf/simulated/shuttle/plating, -/area/space) +/area/shuttle/supply) "qZ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -1672,42 +2008,56 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"ra" = ( +/obj/effect/floor_decal/corner/green/full, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "rb" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ pixel_y = 5 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) +"rc" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "ri" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) +"rk" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) "ro" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "rp" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/flask/barflask, /obj/item/reagent_containers/glass/rag, /obj/item/reagent_containers/food/drinks/flask/vacuumflask, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "rt" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/toastedsandwich{ pixel_y = 10 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "ry" = ( /obj/effect/floor_decal/transit/orange{ dir = 4 @@ -1716,19 +2066,26 @@ initial_flooring = null }, /area/space) +"rz" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "rJ" = ( /obj/structure/bed/chair/holochair{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"rS" = ( +/turf/simulated/floor/holofloor/desert, +/area/holodeck/source_desert) "rT" = ( /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/living) "rU" = ( /obj/machinery/vending/coffee, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "rW" = ( /turf/simulated/sky/virgo3b/south, /area/space) @@ -1737,7 +2094,15 @@ id = "crematorium-cc" }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) +"sa" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) +"sc" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "sf" = ( /obj/machinery/atmospherics/component/unary/cryo_cell, /obj/effect/floor_decal/borderfloorwhite{ @@ -1747,7 +2112,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "sh" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/large, @@ -1762,7 +2127,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "sm" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloorblack{ @@ -1772,11 +2137,11 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "su" = ( /obj/machinery/telecomms/relay/preset/tether, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "sw" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -1792,12 +2157,12 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "sy" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "sA" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloor/corner{ @@ -1807,19 +2172,20 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "sB" = ( -/obj/machinery/fitness/punching_bag/clown{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/main_hall) "sC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/space) +/area/centcom/simulated/terminal) +"sI" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "sJ" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 9 @@ -1830,34 +2196,54 @@ /obj/effect/floor_decal/borderfloor/corner, /obj/structure/bed/chair, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "sL" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"sP" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "sR" = ( /obj/structure/flora/tree/dead, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "sU" = ( /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "sX" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "td" = ( /turf/simulated/wall/thull, -/area/space) +/area/shuttle/escape) +"ti" = ( +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"tl" = ( +/turf/unsimulated/floor/steel, +/area/centcom/simulated/main_hall) +"to" = ( +/turf/unsimulated/wall, +/area/centcom/suppy) "tp" = ( /obj/effect/floor_decal/corner/green{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"tq" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "tt" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -1866,15 +2252,22 @@ dir = 8 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"tv" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) "tw" = ( /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "tB" = ( /obj/structure/table/standard, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"tG" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_theatre) "tH" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_r" @@ -1883,40 +2276,44 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) "tI" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "tM" = ( /obj/machinery/sleeper/survival_pod, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm4) +"tO" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) "tR" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/catering/bar_alc, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "tT" = ( /obj/effect/overlay/palmtree_r, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) "tW" = ( /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "tY" = ( /turf/simulated/floor/holofloor/reinforced, -/area/space) +/area/holodeck/source_wildlife) "tZ" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "uf" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -1929,11 +2326,22 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"ug" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"um" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) +"us" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "uu" = ( /obj/structure/flora/pottedplant/small, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "uw" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1943,7 +2351,7 @@ "ux" = ( /obj/effect/floor_decal/rust/part_rusted3, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "uA" = ( /turf/space, /turf/space/internal_edge/topright, @@ -1956,7 +2364,7 @@ dir = 9 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "uJ" = ( /obj/machinery/door/window/holowindoor{ dir = 1; @@ -1975,7 +2383,7 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "uK" = ( /obj/machinery/status_display{ pixel_y = -30 @@ -1989,7 +2397,7 @@ /obj/structure/medical_stand, /obj/structure/medical_stand, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "uL" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 8 @@ -2001,14 +2409,17 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"uN" = ( +/turf/simulated/floor/tiled/white, +/area/shuttle/escape) "uP" = ( /obj/structure/medical_stand, /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "uQ" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -2016,34 +2427,80 @@ }, /obj/item/chess/bpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"uS" = ( +/obj/structure/bed/double/padded, +/obj/item/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "uX" = ( /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) +"vb" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/holodorm/source_garden) "vf" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "vg" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_boxingcourt) "vm" = ( /obj/machinery/light{ dir = 1 }, /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "vr" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/window/brigdoor/eastleft{ name = "CC-Cell 1" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) +"vs" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"vu" = ( +/turf/simulated/floor/holofloor/beach/water, +/area/holodeck/holodorm/source_beach) +"vw" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"vx" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"vB" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "vC" = ( /obj/effect/transit/light{ dir = 8 @@ -2058,14 +2515,14 @@ "vD" = ( /obj/structure/table/glass, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "vF" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "vG" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -2073,35 +2530,43 @@ }, /obj/item/chess/wbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "vK" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_theatre) "vL" = ( /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) +"vO" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "vP" = ( /turf/unsimulated/beach/sand{ icon_state = "beach" }, -/area/space) +/area/holodeck/source_beach) "vS" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"vW" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "wc" = ( /obj/structure/flora/pottedplant/minitree, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/main_hall) "wf" = ( /obj/structure/table/standard, /obj/random/carp_plushie, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "wg" = ( /obj/structure/window/reinforced, /turf/unsimulated/wall, @@ -2115,19 +2580,33 @@ }, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"wi" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "wk" = ( /obj/machinery/door/airlock{ name = "Unit 1" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"wr" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"ws" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "wu" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "ww" = ( /obj/structure/table/steel, /obj/item/sleevemate, @@ -2137,7 +2616,7 @@ pixel_y = 7 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "wx" = ( /obj/structure/table/woodentable{ dir = 5 @@ -2146,7 +2625,13 @@ pixel_y = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"wy" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "wA" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/drinks/cup{ @@ -2186,21 +2671,28 @@ dir = 1 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "wB" = ( /obj/machinery/light/small{ dir = 4 }, /obj/structure/bed/chair, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) "wC" = ( /obj/machinery/conveyor{ dir = 4; id = "QMLoad2" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) +"wF" = ( +/obj/machinery/door/window/holowindoor{ + dir = 8; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "wJ" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donut, @@ -2209,21 +2701,25 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "wK" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) +"wM" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "wN" = ( /obj/item/beach_ball, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/source_beach) "wO" = ( /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "wQ" = ( /obj/structure/shuttle/engine/propulsion, /obj/effect/shuttle_landmark{ @@ -2236,13 +2732,17 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) "wR" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) +"wS" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "wU" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -2251,10 +2751,10 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "wV" = ( /turf/simulated/floor/holofloor/space, -/area/space) +/area/holodeck/source_space) "wW" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -2273,14 +2773,18 @@ "xa" = ( /obj/item/chess/bpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"xb" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/holodorm/source_basic) "xd" = ( /obj/machinery/button/crematorium{ id = "creamtorium-cc"; pixel_x = -28 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "xh" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2299,19 +2803,19 @@ "xj" = ( /obj/machinery/light, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "xr" = ( /obj/structure/bed/chair/shuttle{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "xs" = ( /obj/structure/closet{ name = "Evidence Closet" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "xw" = ( /obj/machinery/optable, /obj/machinery/light{ @@ -2319,7 +2823,17 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"xC" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "xD" = ( /obj/structure/bed/chair, /obj/landmark{ @@ -2330,28 +2844,40 @@ name = "Woodrat" }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"xF" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "xI" = ( /obj/structure/sign/hangar/one{ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "xJ" = ( /obj/structure/bed/chair/wood/wings{ dir = 8 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "xM" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/meatballsoup, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "xV" = ( /obj/structure/bed/holobed, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/holodorm/source_basic) +"xX" = ( +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"xZ" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_emptycourt) "ya" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2360,19 +2886,22 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "yb" = ( /obj/effect/floor_decal/corner/red{ dir = 9 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"yc" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "yd" = ( /obj/landmark{ name = "Wolfgirl Spawn" }, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) "yf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2381,7 +2910,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "yg" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -2394,13 +2923,13 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "yi" = ( /obj/machinery/camera/network/crescent{ dir = 6 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "ym" = ( /obj/structure/window/reinforced{ dir = 4 @@ -2422,7 +2951,7 @@ pixel_y = 28 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "yu" = ( /obj/structure/table/glass, /obj/item/defib_kit/loaded, @@ -2433,19 +2962,33 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "yy" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"yB" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"yD" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "yE" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-21" }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "yF" = ( /obj/structure/bed/chair{ dir = 8 @@ -2454,34 +2997,30 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "yG" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "yI" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "yJ" = ( -/obj/machinery/vending/fitness{ - dir = 8 - }, -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) "yL" = ( /obj/machinery/light/small{ dir = 4 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "yQ" = ( /turf/simulated/floor/maglev, /area/space) @@ -2490,7 +3029,7 @@ name = "\improper STAND AWAY FROM TRACK EDGE" }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/restaurant) "yX" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2511,23 +3050,37 @@ id = "Tram_Sec" }, /turf/simulated/floor, -/area/space) +/area/shuttle/escape) "zd" = ( /obj/item/stool/padded, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "zi" = ( /obj/structure/flora/grass/brown, /obj/structure/flora/tree/dead, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) +"zl" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"zn" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"zr" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "zw" = ( /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "zy" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -2547,14 +3100,14 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "zA" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "zC" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -2567,10 +3120,10 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "zF" = ( /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "zH" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 8 @@ -2584,28 +3137,28 @@ /obj/structure/bed/padded, /obj/item/bedsheet, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "zI" = ( /obj/structure/fans, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm3) "zK" = ( /obj/machinery/door/airlock/alien/public, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm1) "zM" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "zO" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/airless, -/area/space) +/area/shuttle/supply) "zQ" = ( /obj/structure/closet/walllocker/emerglocker/east, /obj/effect/floor_decal/borderfloor/corner{ @@ -2615,23 +3168,29 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) +"zS" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) "zU" = ( /obj/machinery/computer/secure_data{ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "zX" = ( /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "zY" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "Aa" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -2640,21 +3199,14 @@ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "Ac" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 1 - }, -/obj/machinery/fitness/punching_bag/clown{ - dir = 8; - layer = 3.4 - }, -/turf/simulated/floor/wood, -/area/space) +/turf/unsimulated/wall, +/area/centcom/simulated/living) "Ae" = ( /obj/item/chess/wking, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Af" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -2664,10 +3216,19 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"Ag" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm2) "Al" = ( /turf/space/internal_edge/right, /area/space) +"Ao" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) "Ap" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 9 @@ -2678,7 +3239,7 @@ /obj/effect/floor_decal/borderfloor, /obj/structure/bed/chair, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "As" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -2687,19 +3248,44 @@ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "At" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Av" = ( /obj/effect/floor_decal/corner/green{ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"Aw" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) +"Ay" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"AA" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"AI" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"AK" = ( +/turf/unsimulated/wall, +/area/centcom/control) "AO" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/cheeseburger{ @@ -2708,14 +3294,29 @@ }, /obj/item/reagent_containers/food/snacks/cheeseburger, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"AW" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"AX" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"Ba" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "Bb" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 }, /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Bc" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -2728,14 +3329,14 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "Bd" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Bf" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -2747,50 +3348,94 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) +"Bh" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/living) "Bi" = ( /obj/machinery/door/window/holowindoor{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "Bj" = ( /obj/effect/overlay/palmtree_r, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"Bl" = ( +/obj/structure/bed/double/padded, +/obj/item/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"Bq" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "Bw" = ( /obj/machinery/optable, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "By" = ( /obj/effect/blocker, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/living) "Bz" = ( /obj/effect/floor_decal/sign/c, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "BA" = ( /obj/structure/table/woodentable, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "BB" = ( /turf/space/transit/east, /area/space) +"BC" = ( +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "BH" = ( /obj/machinery/door/airlock/multi_tile/metal, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "BK" = ( /turf/simulated/shuttle/wall, -/area/space) +/area/unknown/dorm6) "BM" = ( /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) +"BN" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"BP" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "BR" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 @@ -2799,7 +3444,7 @@ icon_state = "plant-10" }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "BS" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -2808,26 +3453,55 @@ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) +"Ca" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"Cc" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "Cd" = ( /obj/structure/flora/grass/green, /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/holodorm/source_snow) +"Ci" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"Cj" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"Cn" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Cp" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"Cq" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "Cv" = ( /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Cz" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "CD" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "CG" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2852,7 +3526,7 @@ name = "CC-Cell 2" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "CM" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -2862,20 +3536,29 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) +"CO" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_theatre) "CU" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 8 }, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "CV" = ( /obj/structure/morgue{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) +"CX" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "CY" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 @@ -2884,12 +3567,12 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Db" = ( /obj/structure/table/standard, /obj/random/toy, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "Dc" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -2900,21 +3583,30 @@ }, /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Dd" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Dk" = ( /obj/structure/closet/secure_closet/medical2, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Dm" = ( -/obj/machinery/fitness/heavy/lifter{ - dir = 4 +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"Dr" = ( +/obj/effect/floor_decal/corner/green{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/space) +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"Dt" = ( +/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/centcom/simulated/terminal) "Dw" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -2927,19 +3619,31 @@ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Dz" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_meetinghall) +"DA" = ( +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/bathroom) +"DD" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"DE" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "DH" = ( /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "DM" = ( /obj/effect/floor_decal/sign/b, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "DO" = ( /obj/structure/table/reinforced, /obj/item/camera, @@ -2948,7 +3652,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "DX" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 @@ -2957,7 +3661,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "DY" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2967,6 +3671,18 @@ }, /turf/simulated/sky/virgo3b/south, /area/space) +"Ea" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"Ec" = ( +/obj/item/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Ef" = ( +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "Eg" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -2976,7 +3692,11 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"Eh" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "Ei" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -2988,17 +3708,17 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Ej" = ( /obj/structure/closet/secure_closet/nanotrasen_security, /obj/item/storage/box/handcuffs, /obj/item/gun/energy/gun, /obj/item/shield/riot, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "Ek" = ( /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "Em" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -3007,13 +3727,19 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "En" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) +"Eo" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "Eq" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -3021,18 +3747,18 @@ pixel_y = 3 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Es" = ( /obj/effect/floor_decal/sign/a, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_chess) "EB" = ( /obj/effect/floor_decal/carpet, /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "EH" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3052,24 +3778,24 @@ id = "Tram_Med" }, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) "EM" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "EP" = ( /obj/structure/table/woodentable/holotable, /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "ER" = ( /obj/machinery/status_display/supply_display, /turf/unsimulated/wall, -/area/space) +/area/centcom/suppy) "ET" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -3078,18 +3804,29 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "Fa" = ( /obj/structure/table/reinforced, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) +"Fb" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"Fd" = ( +/obj/machinery/door/window/holowindoor{ + dir = 1; + name = "Entrance 2" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "Ff" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "Fg" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 @@ -3098,14 +3835,20 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"Fh" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "Fi" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "Fk" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/bottle/grenadine, @@ -3113,7 +3856,7 @@ dir = 8 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Fl" = ( /obj/structure/table/glass, /obj/item/healthanalyzer/improved, @@ -3124,7 +3867,7 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Fo" = ( /obj/machinery/clonepod/transhuman/full, /obj/effect/floor_decal/borderfloorwhite{ @@ -3134,7 +3877,7 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Fu" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3150,7 +3893,7 @@ name = "Shuttle Hatch" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Fz" = ( /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, @@ -3160,20 +3903,20 @@ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "FB" = ( /turf/space, /turf/space/internal_edge/topleft, /area/space) "FC" = ( /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "FG" = ( /obj/effect/floor_decal/corner/red{ dir = 9 }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/holodorm/source_boxing) "FK" = ( /obj/machinery/light{ dir = 4 @@ -3188,7 +3931,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "FL" = ( /turf/simulated/floor/tiled/steel_grid, /area/space) @@ -3196,12 +3939,15 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"FR" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/holodorm/source_off) "FS" = ( /obj/machinery/light/small, /obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "FW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -3213,18 +3959,18 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "FX" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "FZ" = ( /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Ga" = ( /obj/effect/overlay/palmtree_l, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Gb" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3235,11 +3981,15 @@ }, /turf/simulated/floor/maglev, /area/space) +"Gd" = ( +/obj/structure/window/reinforced/holowindow, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_boxingcourt) "Ge" = ( /obj/effect/overlay/palmtree_r, /obj/effect/overlay/coconut, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Gf" = ( /obj/machinery/shower{ pixel_y = 13 @@ -3249,7 +3999,20 @@ dir = 5 }, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm3) +"Gg" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"Gl" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Gs" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Gz" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3260,6 +4023,10 @@ }, /turf/space/transit/north, /area/space) +"GA" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "GB" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -3272,31 +4039,37 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "GC" = ( /obj/structure/flora/pottedplant/large, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "GE" = ( /obj/structure/sign/greencross, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/medical) +"GH" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "GL" = ( /obj/machinery/smartfridge/drinks, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "GN" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/bigbiteburger, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "GO" = ( /obj/machinery/camera/network/crescent, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "GT" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3309,7 +4082,7 @@ dir = 6 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "GW" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -3317,17 +4090,17 @@ name = "HIGH VOLTAGE" }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "GZ" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/space) +/area/centcom/simulated/restaurant) "Hc" = ( /obj/structure/window/reinforced/holowindow/disappearing, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Hg" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -3335,22 +4108,44 @@ }, /obj/structure/grille, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) +"Hh" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"Hj" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) "Hn" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow{ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Ho" = ( /obj/structure/closet/secure_closet/brig, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) +"Hp" = ( +/obj/machinery/camera/network/crescent, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) "Hr" = ( /obj/item/chess/wrook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Hs" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -3358,29 +4153,29 @@ dir = 8 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Ht" = ( /obj/item/chess/wknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Hu" = ( /obj/structure/prop/alien/computer{ dir = 8 }, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm1) "Hz" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "HA" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "HF" = ( /obj/structure/sink{ dir = 4; @@ -3388,7 +4183,7 @@ pixel_y = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "HG" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3412,14 +4207,14 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "HP" = ( /obj/machinery/account_database{ dir = 1; name = "CentComm Accounts database" }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "HQ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -3428,17 +4223,20 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "HR" = ( /obj/machinery/door/firedoor{ dir = 8 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/terminal) +"Ib" = ( +/turf/simulated/shuttle/wall, +/area/shuttle/supply) "Ic" = ( /obj/machinery/telecomms/receiver/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Id" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -3448,13 +4246,26 @@ dir = 4 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/terminal) +"Ie" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"If" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Ij" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/organ_printer/flesh, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Im" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -3478,7 +4289,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Io" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3491,14 +4302,14 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Iq" = ( /obj/structure/sink{ dir = 8; pixel_x = -12 }, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Ir" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -3511,42 +4322,54 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Is" = ( /obj/effect/floor_decal/corner_steel_grid/diagonal, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/large_escape_pod2/centcom) +"Iw" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) "Iz" = ( /obj/structure/table/woodentable, /obj/machinery/cash_register/civilian, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "IA" = ( /obj/structure/sign/double/barsign{ dir = 8 }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/restaurant) "IB" = ( /obj/effect/floor_decal/corner/red{ dir = 10 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) +"IC" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "ID" = ( /obj/item/stool/padded, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "IE" = ( /obj/machinery/cryopod/robot/door/dorms, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "IH" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_courtroom) "II" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet, @@ -3557,13 +4380,13 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "IL" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "IM" = ( /obj/machinery/turretid/stun{ check_access = 0; @@ -3575,7 +4398,7 @@ req_one_access = list(101) }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "IO" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -3589,11 +4412,11 @@ }, /obj/structure/grille, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) "IP" = ( /obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "IT" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -3601,7 +4424,7 @@ }, /obj/item/chess/wqueen, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "IU" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -3616,20 +4439,20 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"IX" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) "Jb" = ( -/obj/machinery/vending/fitness{ - dir = 4 - }, -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/space) +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm1) "Jc" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) "Jf" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -3638,35 +4461,49 @@ pixel_y = -32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"Jl" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"Jm" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "Jn" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_desert) "Jw" = ( /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) "Jz" = ( /obj/machinery/light, /obj/structure/table/marble, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "JB" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 }, /obj/effect/floor_decal/corner/red, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "JH" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "JI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"JL" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "JN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -3679,7 +4516,10 @@ }, /obj/effect/floor_decal/sign/dock/three, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) +"JV" = ( +/turf/simulated/floor/holofloor/space, +/area/holodeck/holodorm/source_space) "JX" = ( /obj/structure/table/glass, /obj/item/backup_implanter{ @@ -3693,7 +4533,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Ka" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove{ @@ -3701,11 +4541,16 @@ item_state = "boxinggreen" }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_boxingcourt) "Kd" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Ke" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -3715,22 +4560,38 @@ tag_door = "supply_shuttle_hatch" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) +"Kh" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "Km" = ( /obj/effect/overlay/palmtree_l, /turf/simulated/floor/holofloor/beach/sand, -/area/space) +/area/holodeck/holodorm/source_beach) +"Kx" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "KA" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/roastbeef, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"KD" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"KP" = ( +/turf/simulated/shuttle/wall, +/area/unknown/dorm3) "KQ" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/borderfloorwhite/corner, /obj/effect/floor_decal/corner/paleblue/bordercorner, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "KR" = ( /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, @@ -3739,7 +4600,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) "KS" = ( /obj/machinery/bodyscanner{ dir = 8 @@ -3748,7 +4609,11 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"KT" = ( +/obj/effect/floor_decal/rust/mono_rusted3, +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "KU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3758,17 +4623,22 @@ "KW" = ( /obj/structure/closet, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "KZ" = ( /obj/machinery/telecomms/hub/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "La" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"Le" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm1) "Lf" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -3786,13 +4656,19 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Lj" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) +"Ln" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/centcom/simulated/restaurant) "Lp" = ( /obj/structure/table/standard, /obj/item/reagent_containers/food/drinks/cans/cola, @@ -3802,7 +4678,7 @@ /obj/item/reagent_containers/food/drinks/cans/cola, /obj/item/reagent_containers/food/drinks/cans/cola, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Lq" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -3810,24 +4686,24 @@ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Ls" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "Lu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/restaurant) "Lx" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Ly" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -3835,7 +4711,7 @@ }, /obj/item/chess/wrook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Lz" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -3843,17 +4719,24 @@ }, /obj/structure/grille, /turf/simulated/floor/plating/eris/under, -/area/space) +/area/shuttle/escape) +"LA" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"LH" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/holodorm/source_boxing) "LI" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 26 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "LJ" = ( /turf/simulated/shuttle/wall/alien, -/area/space) +/area/unknown/dorm2) "LK" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -3868,20 +4751,68 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "LP" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"LT" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"LV" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "LX" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/landmark{ name = "Catgirl Spawn" }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/holodorm/source_garden) +"LY" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) +"LZ" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "Mc" = ( /obj/structure/window/reinforced/holowindow/disappearing{ dir = 1 @@ -3890,21 +4821,27 @@ dir = 1 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) +"Mf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) "Mn" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) "Mr" = ( /obj/structure/flora/pottedplant/tall, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "Mt" = ( /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "Mx" = ( /obj/structure/table/standard, /obj/item/storage/box/gloves{ @@ -3913,7 +4850,7 @@ }, /obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "My" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -3927,11 +4864,25 @@ /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/fries, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"MB" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"MC" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/source_snowfield) +"MG" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "MH" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall/thull, -/area/space) +/area/shuttle/escape) "MK" = ( /obj/structure/filingcabinet/chestdrawer{ name = "Medical Forms" @@ -3943,11 +4894,11 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "MM" = ( /obj/machinery/door/airlock, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "MO" = ( /obj/structure/window/reinforced/holowindow, /obj/machinery/door/window/holowindoor{ @@ -3956,20 +4907,24 @@ }, /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "MV" = ( /obj/machinery/door/firedoor{ dir = 8 }, /obj/machinery/door/blast/regular/open, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"MW" = ( +/obj/effect/floor_decal/rust/part_rusted3, +/turf/simulated/floor/tiled/steel, +/area/shuttle/large_escape_pod2/centcom) "MY" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "MZ" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -3980,37 +4935,43 @@ dir = 6 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) +"Na" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "Nb" = ( /obj/machinery/conveyor{ dir = 4; id = "QMLoad" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "Nj" = ( /obj/structure/table/standard, /obj/item/material/ashtray/plastic, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "No" = ( /obj/structure/holohoop, /obj/effect/floor_decal/corner/red{ dir = 5 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Ns" = ( /obj/structure/flora/pottedplant/overgrown, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Nt" = ( /obj/machinery/porta_turret/crescent{ density = 1 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Nv" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4018,7 +4979,7 @@ }, /obj/item/chess/bbishop, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Nx" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4026,7 +4987,7 @@ }, /obj/item/chess/brook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Ny" = ( /obj/machinery/atmospherics/component/unary/freezer, /obj/effect/floor_decal/borderfloorwhite{ @@ -4036,13 +4997,16 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"Nz" = ( +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/security) "ND" = ( /obj/structure/fake_stairs/north/bottom{ _stair_tag = "stairtest" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "NL" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -4054,35 +5018,41 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"NM" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/evac) "NP" = ( /obj/item/chess/brook, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "NQ" = ( /obj/machinery/telecomms/broadcaster/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "NT" = ( /obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_emptycourt) "NX" = ( /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"NZ" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/centcom/simulated/terminal) "Ob" = ( /obj/structure/table/alien, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm5) "Oc" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 10 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Od" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -4096,21 +5066,27 @@ pixel_y = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Oe" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"Oh" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/main_hall) "Ol" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass, /turf/unsimulated/floor/steel{ icon_state = "white" }, -/area/space) +/area/centcom/simulated/medical) "Ou" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -4122,28 +5098,35 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "Oz" = ( /obj/structure/bed/chair/wood/wings{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "OA" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor/plating, -/area/space) +/area/centcom/simulated/medical) "OB" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) +"OD" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_courtroom) "OF" = ( /obj/machinery/recharge_station, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm4) +"OG" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "OK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -4152,21 +5135,21 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "OL" = ( /obj/structure/flora/pottedplant/shoot, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "OO" = ( /obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "OP" = ( /obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "OW" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -4184,7 +5167,7 @@ dir = 9 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "OY" = ( /obj/structure/closet/walllocker/emerglocker/west, /obj/effect/floor_decal/borderfloorwhite{ @@ -4194,11 +5177,17 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "OZ" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/holodorm/source_garden) +"Pa" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "Pb" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -4207,36 +5196,36 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Pc" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_meetinghall) "Pd" = ( /obj/structure/bed/chair/holochair{ dir = 8 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/holodorm/source_basic) "Pl" = ( /obj/effect/floor_decal/corner/green{ dir = 6 }, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/holodorm/source_boxing) "Pm" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "Po" = ( /obj/machinery/door/airlock/security{ name = "Security" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "Pr" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -4248,7 +5237,7 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "Ps" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -4258,7 +5247,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Pt" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 9 @@ -4271,11 +5260,11 @@ }, /obj/structure/bed/chair, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Pv" = ( /obj/item/beach_ball, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Px" = ( /obj/machinery/vending/medical, /obj/effect/floor_decal/borderfloorwhite{ @@ -4285,12 +5274,12 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Py" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/drinks/bottle/cola, /turf/simulated/floor/lino, -/area/space) +/area/centcom/simulated/restaurant) "PG" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -4302,7 +5291,7 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "PJ" = ( /obj/machinery/transhuman/synthprinter, /obj/effect/floor_decal/borderfloorwhite{ @@ -4312,13 +5301,17 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "PK" = ( /obj/effect/floor_decal/rust/steel_decals_rusted2, /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) +"PL" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "PN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -4330,18 +5323,50 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"PO" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) +"PP" = ( +/obj/effect/wingrille_spawn/reinforced/crescent, +/turf/simulated/floor/plating, +/area/centcom/simulated/security) "PQ" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/stewedsoymeat, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"PT" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/security) +"PU" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "PV" = ( /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"PX" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) +"PY" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"Qb" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/source_plating) "Qd" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l" @@ -4350,7 +5375,7 @@ /turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/area/space) +/area/shuttle/supply) "Qh" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -4358,13 +5383,13 @@ dir = 8 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "Qi" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "Qk" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -4376,7 +5401,11 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"Qp" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/holofloor/desert, +/area/holodeck/holodorm/source_desert) "Qq" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -4385,32 +5414,32 @@ dir = 6 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Qs" = ( /obj/machinery/vending/coffee{ dir = 1 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Qt" = ( /obj/machinery/door/blast/regular{ dir = 4 }, /turf/unsimulated/wall, -/area/space) +/area/centcom/simulated/terminal) "Qu" = ( /obj/machinery/light{ dir = 1 }, /obj/structure/flora/pottedplant/aquatic, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Qw" = ( /obj/structure/table/standard, /obj/machinery/light, /obj/item/surgical/bioregen, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "QA" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4418,7 +5447,7 @@ }, /obj/item/chess/wknight, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "QC" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4430,7 +5459,7 @@ /area/space) "QI" = ( /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "QK" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -4446,11 +5475,11 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "QL" = ( /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "QO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -4460,35 +5489,41 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"QQ" = ( +/turf/unsimulated/mineral/virgo3b, +/area/centcom/simulated/terminal) "QS" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3" }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "QU" = ( /turf/unsimulated/beach/coastline{ density = 1; opacity = 1 }, -/area/space) +/area/beach) "QV" = ( /obj/machinery/sleeper{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "QW" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Ra" = ( /obj/machinery/door/airlock/alien/blue/public, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm6) +"Rd" = ( +/turf/simulated/shuttle/wall, +/area/unknown/dorm4) "Rj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -4510,7 +5545,7 @@ name = "endgame_exit" }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "RB" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/borderfloor{ @@ -4520,18 +5555,18 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "RD" = ( /obj/machinery/door/airlock{ name = "Unit 3" }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "RH" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "RS" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4554,34 +5589,34 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "RU" = ( /obj/structure/closet/crate/bin, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/bathroom) "RW" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /obj/effect/floor_decal/borderfloorblack, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "RX" = ( /obj/structure/closet/crate, /turf/unsimulated/floor{ icon_state = "dark" }, -/area/space) +/area/centcom/suppy) "RY" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Sa" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/simulated/floor/carpet/blue, -/area/space) +/area/centcom/simulated/security) "Sb" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -4591,14 +5626,22 @@ name = "Shuttle Hatch" }, /turf/simulated/shuttle/floor, -/area/space) +/area/shuttle/supply) "Sc" = ( /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/holodorm/source_desert) +"Sf" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm3) "Sg" = ( /obj/machinery/r_n_d/server/centcom, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) +"Sj" = ( +/turf/unsimulated/wall, +/area/centcom/simulated/restaurant) "Sk" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow, @@ -4606,13 +5649,16 @@ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "Sn" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"So" = ( +/turf/simulated/floor/wood, +/area/holodeck/source_boxingcourt) "Sp" = ( /obj/structure/bed/chair/shuttle{ dir = 4 @@ -4624,14 +5670,17 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Sq" = ( /obj/machinery/cryopod/robot/door/gateway, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"Sr" = ( +/turf/simulated/floor/holofloor/beach/sand, +/area/holodeck/holodorm/source_beach) "St" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4640,7 +5689,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Sx" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -4649,29 +5698,38 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/space) +/area/centcom/simulated/terminal) "Sy" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/restaurant) "SB" = ( /obj/structure/fake_stairs/south/top{ _stair_tag = "stairtest" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"SC" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) +"SE" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_meetinghall) "SI" = ( /obj/machinery/camera/network/crescent{ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "SL" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "SS" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -4680,13 +5738,25 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ST" = ( /turf/unsimulated/beach/water{ density = 1; opacity = 1 }, -/area/space) +/area/beach) +"SU" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) "SV" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -4705,13 +5775,20 @@ initial_flooring = null }, /area/space) +"Tc" = ( +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/living) "Tl" = ( /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/terminal) +"Ts" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "Tt" = ( /obj/structure/bed/chair, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Tv" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 @@ -4727,7 +5804,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "Tx" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -4735,26 +5812,50 @@ }, /obj/item/chess/wpawn, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) +"TF" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"TG" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/centcom/simulated/medical) "TI" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "Tram_Med" }, /turf/simulated/floor, -/area/space) +/area/shuttle/escape) +"TO" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "TS" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"TT" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"TX" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "Ua" = ( /obj/machinery/telecomms/bus/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Ub" = ( /turf/simulated/shuttle/wall/alien/hard_corner, -/area/space) +/area/unknown/dorm5) "Ui" = ( /obj/structure/bed/chair/shuttle, /obj/effect/floor_decal/borderfloor/corner, @@ -4762,7 +5863,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "Uk" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -4787,23 +5888,28 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "Uq" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm3) "Ux" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/bed/chair{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) +"UD" = ( +/turf/unsimulated/beach/sand{ + icon_state = "beach" + }, +/area/holodeck/holodorm/source_beach) "UI" = ( /obj/structure/table/steel, /obj/item/storage/box/bodybags, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "UL" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data{ @@ -4819,7 +5925,7 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "UP" = ( /obj/machinery/light{ dir = 8 @@ -4834,7 +5940,10 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) +"UQ" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "UU" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -4856,20 +5965,29 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/space) +/area/centcom/simulated/security) +"UW" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/holodorm/source_seating) "UY" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) "UZ" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 }, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_basketball) "Vf" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4885,7 +6003,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "Vj" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -4909,12 +6027,16 @@ intercept = 1 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Vq" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/lasagna, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"Vr" = ( +/obj/machinery/door/blast/regular, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/terminal) "Vs" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -4927,7 +6049,7 @@ dir = 5 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Vt" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -4940,7 +6062,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Vv" = ( /obj/structure/table/standard, /obj/item/clothing/under/color/rainbow, @@ -4949,45 +6071,71 @@ pixel_y = 5 }, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) "Vw" = ( /obj/machinery/door/airlock/medical{ name = "Operating Theatre"; req_access = list(45) }, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/centcom/simulated/medical) "Vx" = ( /turf/unsimulated/wall, /area/space) "Vy" = ( /obj/structure/table/alien/blue, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm4) +"VH" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu11, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu13, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu10, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/menu9, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/storage/single_use/mre/random, +/obj/item/towel/random, +/obj/item/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "VK" = ( /obj/structure/bed/chair/shuttle{ dir = 1 }, /obj/effect/floor_decal/borderfloorblack/corner, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "VP" = ( /obj/machinery/camera/network/crescent, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "VQ" = ( /obj/structure/table/glass, /obj/machinery/chemical_dispenser/full, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) +"VR" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "VV" = ( /obj/structure/bed/chair/holochair{ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/holodorm/source_basic) "VW" = ( /obj/effect/shuttle_landmark{ landmark_tag = "escape_transit"; @@ -5008,7 +6156,7 @@ dir = 8 }, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/simulated/main_hall) "Wd" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -5017,7 +6165,20 @@ dir = 5 }, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) +"Wg" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/holofloor/snow, +/area/holodeck/holodorm/source_snow) +"Wi" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"Wl" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/tele_pad, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm6) "Wn" = ( /obj/effect/floor_decal/corner/white/full, /obj/effect/floor_decal/corner/white{ @@ -5025,17 +6186,26 @@ }, /obj/item/chess/bking, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_chess) "Wo" = ( /obj/machinery/telecomms/processor/preset_cent, /turf/unsimulated/floor/steel, -/area/space) +/area/centcom/control) "Wr" = ( /obj/effect/floor_decal/carpet{ dir = 8 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) +"Ws" = ( +/obj/item/perfect_tele_beacon{ + tele_name = "Unknown" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"Wt" = ( +/turf/simulated/floor/maglev, +/area/centcom/simulated/terminal) "Wv" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow{ @@ -5045,17 +6215,17 @@ dir = 1 }, /turf/simulated/floor/holofloor/wood, -/area/space) +/area/holodeck/source_courtroom) "WB" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, -/area/space) +/area/holodeck/source_desert) "WC" = ( /obj/machinery/door/airlock/security{ name = "Security" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "WH" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -5065,7 +6235,7 @@ }, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled, -/area/space) +/area/shuttle/escape) "WI" = ( /obj/machinery/door/airlock/medical{ name = "Operating Theatre"; @@ -5073,7 +6243,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "WJ" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -5098,7 +6268,14 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) +"WO" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "WV" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -5113,23 +6290,29 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "WW" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, -/area/space) +/area/holodeck/source_picnicarea) +"WY" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "Xf" = ( /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Xk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Security" }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Xn" = ( /obj/effect/step_trigger/lost_in_space/tram, /turf/simulated/floor/maglev, @@ -5157,7 +6340,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/space) +/area/centcom/simulated/security) "Xq" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/blast/regular{ @@ -5170,7 +6353,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/space) +/area/centcom/simulated/security) "Xr" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 @@ -5179,11 +6362,11 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Xs" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "Xv" = ( /obj/effect/step_trigger/lost_in_space/tram, /obj/effect/floor_decal/transit/orange{ @@ -5196,34 +6379,38 @@ "XD" = ( /turf/space/internal_edge/top, /area/space) +"XE" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "XF" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor/snow, -/area/space) +/area/holodeck/source_snowfield) "XG" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "XI" = ( /turf/unsimulated/beach/sand{ density = 1; opacity = 1 }, -/area/space) +/area/beach) "XM" = ( /obj/structure/table/holotable, /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/holofloor/tiled, -/area/space) +/area/holodeck/source_thunderdomecourt) "XR" = ( /obj/structure/bed/chair/holochair, /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "XV" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -5239,7 +6426,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_theatre) "XW" = ( /obj/structure/table/standard, /obj/item/reagent_containers/spray/cleaner{ @@ -5249,7 +6436,7 @@ pixel_y = 2 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "XZ" = ( /obj/structure/bed/chair/holochair{ dir = 4 @@ -5258,19 +6445,19 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_courtroom) "Yb" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/grilledcheese, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Yd" = ( /obj/structure/table/bench/steel, /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Ye" = ( /obj/effect/floor_decal/rust/steel_decals_rusted2, /obj/effect/floor_decal/industrial/warning/dust, @@ -5278,23 +6465,23 @@ pixel_y = 32 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Yg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/security) "Yh" = ( /turf/simulated/floor/holofloor/beach/water, -/area/space) +/area/holodeck/source_beach) "Yi" = ( /turf/unsimulated/mineral/virgo3b, /area/space) "Yj" = ( /obj/structure/holostool, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Yk" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -5308,7 +6495,10 @@ id = "QMLoad" }, /turf/simulated/shuttle/plating, -/area/space) +/area/shuttle/supply) +"Yl" = ( +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "Yp" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/OMinus, @@ -5318,7 +6508,7 @@ /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Yr" = ( /obj/effect/floor_decal/carpet{ dir = 5 @@ -5333,7 +6523,7 @@ dir = 10 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) "Yw" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -5342,12 +6532,23 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "Yy" = ( /obj/landmark/costume/random, /obj/structure/table/rack/holorack_legacy, /turf/simulated/floor/holofloor/tiled/dark, -/area/space) +/area/holodeck/source_theatre) +"Yz" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_theatre) "YC" = ( /obj/structure/table/standard, /obj/random/plushie, @@ -5358,13 +6559,13 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "YE" = ( /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "YH" = ( /turf/space/internal_edge/left, /area/space) @@ -5373,13 +6574,13 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/evac) "YK" = ( /obj/machinery/computer/teleporter{ dir = 1 }, /turf/simulated/shuttle/floor/alienplating, -/area/space) +/area/unknown/dorm1) "YM" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 8 @@ -5391,7 +6592,13 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) +"YN" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/centcom/simulated/evac) "YQ" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 1 @@ -5403,48 +6610,59 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/shuttle/escape) +"YW" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "Zb" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ dir = 1 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/source_meetinghall) +"Zh" = ( +/obj/structure/holostool, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_meetinghall) "Zi" = ( /obj/effect/floor_decal/borderfloor/shifted, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "Zk" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/department/medbay, /turf/unsimulated/floor{ name = "plating" }, -/area/space) +/area/centcom/simulated/medical) "Zn" = ( /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Zr" = ( /obj/structure/bed/chair/wood/wings, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Zs" = ( /obj/machinery/light, /turf/simulated/floor/wood, -/area/space) +/area/centcom/simulated/restaurant) "Zt" = ( /obj/machinery/door/firedoor, /turf/unsimulated/floor/steel{ icon_state = "white" }, -/area/space) +/area/centcom/simulated/medical) "Zu" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/main_hall) "Zv" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 @@ -5453,13 +6671,13 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/terminal) "Zw" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "Zx" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -5481,10 +6699,19 @@ }, /turf/space/transit/east, /area/space) +"ZD" = ( +/obj/effect/floor_decal/corner/green{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) +"ZH" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) "ZI" = ( /obj/structure/table/survival_pod, /turf/simulated/shuttle/floor/alien, -/area/space) +/area/unknown/dorm2) "ZL" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -5493,20 +6720,20 @@ dir = 4 }, /turf/simulated/floor/holofloor/carpet, -/area/space) +/area/holodeck/holodorm/source_seating) "ZO" = ( /obj/machinery/body_scanconsole, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) "ZQ" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/shuttle/escape) "ZS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -5515,16 +6742,24 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space) +/area/centcom/simulated/living) "ZT" = ( /obj/structure/table/standard, /obj/random/action_figure, /turf/simulated/floor/tiled/techfloor, -/area/space) +/area/shuttle/escape) "ZV" = ( /obj/item/clothing/head/collectable/paper, /turf/unsimulated/beach/sand, -/area/space) +/area/beach) +"ZW" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"ZX" = ( +/obj/machinery/tele_projector, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "ZZ" = ( /obj/structure/table/standard, /obj/item/healthanalyzer, @@ -5532,7 +6767,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/space) +/area/centcom/simulated/medical) (1,1,1) = {" bz @@ -15846,26 +17081,26 @@ Zx Fz Zx qQ -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK Yi Yi Yi @@ -16040,7 +17275,7 @@ Zx Zx Zx qQ -Vx +oK XI XI XI @@ -16059,7 +17294,7 @@ XI QU ST ST -Vx +oK Yi Yi Yi @@ -16234,7 +17469,7 @@ Zx Zx Zx qQ -Vx +oK XI FZ Ga @@ -16253,7 +17488,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -16428,7 +17663,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -16447,7 +17682,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -16622,7 +17857,7 @@ Zx Fz Zx qQ -Vx +oK XI iA FZ @@ -16641,7 +17876,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -16816,7 +18051,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -16835,43 +18070,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -Ub -LJ -Ub -LJ -LJ -LJ -LJ -LJ -LJ -Ub -LJ -LJ -Ub +jH +Jb +jH +Jb +Jb +Jb +Jb +Jb +Jb +jH +Jb +Jb +jH Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP Yi Yi Yi @@ -17010,7 +18245,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -17029,43 +18264,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -OF -Ub -tM -ZI +Jb +XE +jH +ug +vO lc Hu -Uq -Uq -Ub +wS +wS +jH Ek -bV -LJ +Le +Jb Yi Yi Yi Yi Yi -BK -OF -BK -tM -ZI -lc -Ek +KP +Eh +KP +YW +ws +TO +qo Uq Uq -BK -Ek -bV -BK +KP +qo +Sf +KP Yi Yi Yi @@ -17204,7 +18439,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -17223,43 +18458,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -aM +Jb +jD zK Ek -aM -mK -aM -aM +jD +Ws +jD +jD Ek zK Ek -fa -LJ +Ay +Jb Yi Yi Yi Yi Yi -BK -aM -Ra -Ek -aM -mK -aM -aM -Ek -Ra -Ek -fa -BK +KP +Cc +Kh +qo +Cc +AA +Cc +Cc +qo +Kh +qo +ZX +KP Yi Yi Yi @@ -17398,7 +18633,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -17417,43 +18652,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -jY -Ub -zI -aM -aM -aM -aM -hL -Ub +Jb +fX +jH +vw +jD +jD +jD +jD +Eo +jH Ek YK -LJ +Jb Yi Yi Yi Yi Yi -BK +KP jY -BK +KP zI -aM -aM -aM -aM -hL -BK -Ek -YK -BK +Cc +Cc +Cc +Cc +xF +KP +qo +Hh +KP Yi Yi Yi @@ -17592,7 +18827,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -17611,43 +18846,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -LJ -Gf -LJ -gl +Jb +yB +Jb +vx Ek gA -hK -iB -Ob -LJ +vs +AW +Ba +Jb Ek -fu -LJ +PU +Jb Yi Yi Yi Yi Yi -BK +KP Gf -BK -gl -Ek -ja -hK -iB -Vy -BK -Ek -fu -BK +KP +ll +qo +Bl +zl +eA +GA +KP +qo +oi +KP Yi Yi Yi @@ -17786,7 +19021,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -17805,43 +19040,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -Ub -LJ -Ub -LJ -LJ -LJ -LJ -LJ -LJ -Ub -LJ -LJ -Ub +jH +Jb +jH +Jb +Jb +Jb +Jb +Jb +Jb +jH +Jb +Jb +jH Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP Yi Yi Yi @@ -17980,7 +19215,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -17999,7 +19234,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18174,7 +19409,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -18193,7 +19428,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18368,7 +19603,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -18387,7 +19622,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18562,7 +19797,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -18581,7 +19816,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18756,7 +19991,7 @@ Zx Fz Zx qQ -Vx +oK XI KW FZ @@ -18775,7 +20010,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -18950,7 +20185,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -18969,7 +20204,7 @@ lC kq qF ST -Vx +oK Yi Yi Yi @@ -19144,7 +20379,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -19163,43 +20398,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi -Ub +iY LJ -Ub +iY LJ LJ LJ LJ LJ LJ -Ub +iY LJ LJ -Ub +iY Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd Yi Yi Yi @@ -19338,7 +20573,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -19357,43 +20592,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi LJ -OF -Ub -tM +Fb +iY +ZW ZI -lc -Hu -Uq -Uq -Ub -Ek -bV +wM +Pa +LV +LV +iY +Kx +Ag LJ Yi Yi Yi Yi Yi -BK +Rd OF -BK +Rd tM -ZI -lc -Ek -Uq -Uq -BK -Ek -bV -BK +qD +dY +ZH +sP +sP +Rd +ZH +aA +Rd Yi Yi Yi @@ -19532,7 +20767,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ FZ @@ -19551,43 +20786,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi LJ -aM -zK -Ek -aM -mK -aM -aM -Ek -zK -Ek -fa +nr +Ea +Kx +nr +wi +nr +nr +Kx +Ea +Kx +JL LJ Yi Yi Yi Yi Yi -BK -aM -Ra -Ek -aM -mK -aM -aM -Ek -Ra -Ek +Rd +nM +hz +ZH +nM +Cp +nM +nM +ZH +hz +ZH fa -BK +Rd Yi Yi Yi @@ -19726,7 +20961,7 @@ Zx Fz Zx qQ -Vx +oK XI FZ Ge @@ -19745,43 +20980,43 @@ lC kq qF ST -Vx +oK Yi Yi Yi Yi Yi LJ -jY -Ub -zI -aM -aM -aM -aM -hL -Ub -Ek -YK +vB +iY +dm +nr +nr +nr +nr +mS +iY +Kx +Jm LJ Yi Yi Yi Yi Yi -BK -jY -BK -zI -aM -aM -aM -aM -hL -BK -Ek -YK -BK +Rd +am +Rd +OG +nM +nM +nM +nM +PY +Rd +ZH +wy +Rd Yi Yi Yi @@ -19920,7 +21155,7 @@ Zx Fz Zx qQ -Vx +oK XI XI XI @@ -19939,23 +21174,23 @@ XI QU ST ST -Vx +oK Yi Yi Yi Yi Yi LJ -Gf +LT LJ -gl -Ek -gA +VH +Kx +hU hK -iB -Ob +Cq +IC LJ -Ek +Kx fu LJ Yi @@ -19963,19 +21198,19 @@ Yi Yi Yi Yi -BK -Gf -BK -gl -Ek -ja -hK +Rd +xC +Rd +LZ +ZH +uS +VR iB Vy -BK -Ek -fu -BK +Rd +ZH +sI +Rd Yi Yi Yi @@ -20114,62 +21349,62 @@ Zx Zx Zx qQ -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK +oK Yi Yi Yi Yi Yi -Ub +iY LJ -Ub +iY LJ LJ LJ LJ LJ LJ -Ub +iY LJ LJ -Ub +iY Yi Yi Yi Yi Yi -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd Yi Yi Yi @@ -21498,17 +22733,17 @@ Yi Yi Yi Ub -LJ +kT Ub -LJ -LJ -LJ -LJ -LJ -LJ +kT +kT +kT +kT +kT +kT Ub -LJ -LJ +kT +kT Ub Yi Yi @@ -21691,36 +22926,36 @@ Yi Yi Yi Yi -LJ -OF +kT +BP Ub -tM -ZI -lc -Hu -Uq -Uq +Ie +TT +tO +KD +Wi +Wi Ub -Ek +Gl bV -LJ +kT Yi Yi Yi Yi Yi BK -OF +TX BK -tM -ZI -lc -Ek -Uq -Uq +hy +zn +lY +py +yD +yD BK -Ek -bV +py +Wl BK Yi Yi @@ -21885,36 +23120,36 @@ Yi Yi Yi Yi -LJ +kT aM -zK -Ek +Ca +Gl aM -mK +mq aM aM -Ek -zK -Ek -fa -LJ +Gl +Ca +Gl +rz +kT Yi Yi Yi Yi Yi BK -aM +DD Ra -Ek -aM +py +DD mK -aM -aM -Ek +DD +DD +py Ra -Ek -fa +py +LA BK Yi Yi @@ -22079,36 +23314,36 @@ Yi Yi Yi Yi -LJ -jY +kT +Gg Ub -zI +Cn aM aM aM aM hL Ub -Ek -YK -LJ +Gl +WY +kT Yi Yi Yi Yi Yi BK -jY +Ts BK -zI -aM -aM -aM -aM -hL +PL +DD +DD +DD +DD +fj BK -Ek -YK +py +bv BK Yi Yi @@ -22273,36 +23508,36 @@ Yi Yi Yi Yi -LJ -Gf -LJ +kT +jI +kT gl -Ek -gA -hK -iB +Gl +Ec +mW +tv Ob -LJ -Ek -fu -LJ +kT +Gl +jO +kT Yi Yi Yi Yi Yi BK -Gf +lR BK -gl -Ek +BN +py ja -hK -iB -Vy +pl +vW +Jl BK -Ek -fu +py +Dm BK Yi Yi @@ -22468,17 +23703,17 @@ Yi Yi Yi Ub -LJ +kT Ub -LJ -LJ -LJ -LJ -LJ -LJ +kT +kT +kT +kT +kT +kT Ub -LJ -LJ +kT +kT Ub Yi Yi @@ -27846,15 +29081,15 @@ bz "} (116,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS Jn Dw wV @@ -28040,16 +29275,16 @@ bz "} (117,1,1) = {" wg -Sc -Sc +rS +rS WB -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS Dw wV wV @@ -28234,16 +29469,16 @@ bz "} (118,1,1) = {" wg -Sc -Sc -Sc -Sc +rS +rS +rS +rS Jn -Sc -Sc +rS +rS WB -Sc -Sc +rS +rS Dw wV wV @@ -28429,15 +29664,15 @@ bz (119,1,1) = {" wg Jn -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS Dw wV pV @@ -28622,15 +29857,15 @@ bz "} (120,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS WB Dw wV @@ -28816,16 +30051,16 @@ bz "} (121,1,1) = {" wg -Sc -Sc -Sc +rS +rS +rS Jn -Sc -Sc +rS +rS WB -Sc -Sc -Sc +rS +rS +rS Dw wV wV @@ -29010,16 +30245,16 @@ bz "} (122,1,1) = {" wg -Sc -Sc -Sc -Sc +rS +rS +rS +rS Jn -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS Dw wV wV @@ -29204,16 +30439,16 @@ bz "} (123,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS +rS +rS Dw wV wV @@ -29398,16 +30633,16 @@ bz "} (124,1,1) = {" wg -Sc +rS WB -Sc -Sc -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS +rS +rS Dw wV pV @@ -29592,15 +30827,15 @@ bz "} (125,1,1) = {" wg -Sc -Sc -Sc -Sc -Sc -Sc +rS +rS +rS +rS +rS +rS Jn -Sc -Sc +rS +rS WB Dw wV @@ -29981,26 +31216,26 @@ bz (127,1,1) = {" wg qs -OZ +rk CD -OZ -OZ -OZ -OZ +rk +rk +rk +rk CD -OZ +rk qs Dw -cY -cY -cY -cY -cY -cY -cY -eB -cY -cY +oG +oG +oG +oG +oG +oG +oG +MC +oG +oG eF qQ qQ @@ -30176,25 +31411,25 @@ bz wg kJ CD -OZ +rk CD CD CD CD -OZ +rk CD kJ Dw -cY +oG tw -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG XF -cY +oG eF Yi Yi @@ -30369,26 +31604,26 @@ bz (129,1,1) = {" wg qs -OZ +rk TS Oe Oe Oe Oe sL -OZ +rk qs Dw -cY -cY -cY +oG +oG +oG sR -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG eF Yi Yi @@ -30398,16 +31633,16 @@ Yi Yi Yi Yi -Vx -Vx -oc -oc -oc -oc -oc -Vx -Vx -Yi +yJ +yJ +Vr +Vr +Vr +Vr +Vr +yJ +yJ +QQ Yi Yi Yi @@ -30565,24 +31800,24 @@ wg kJ CD WW -Sc -Sc -Sc -Sc +bl +bl +bl +bl bO CD kJ Dw -cY -cY -cY -cY +oG +oG +oG +oG XF -cY -cY -cY +oG +oG +oG sR -cY +oG eF Yi Yi @@ -30592,16 +31827,16 @@ Yi Yi Yi Yi -Vx +yJ ee -Vh -Vh -Vh -Vh -Vh +DE +DE +DE +DE +DE Fg -Vx -Yi +yJ +QQ Yi Yi Yi @@ -30757,36 +31992,36 @@ bz (131,1,1) = {" wg qs -OZ +rk sy mU lX lX mU Fi -OZ +rk qs Dw -cY -cY -cY +oG +oG +oG wO -cY -cY +oG +oG tw -cY -cY -eB +oG +oG +MC eF Yi -Vx -Vx -Vx -Vx -Vx -Vx +sB +sB +sB +sB +sB +sB Yi -Vx +yJ Ye gZ QI @@ -30794,36 +32029,36 @@ QI QI QI Jf -Vx +yJ bB -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ GW -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ GW -Vx -Vx -Vx -Vx -Vx -Vx -yR +yJ +yJ +yJ +yJ +yJ +yJ +iL Yi Yi Yi @@ -30961,34 +32196,34 @@ bO CD qs Dw -cY -cY -cY -cY -cY -cY -cY -eB -cY -cY +oG +oG +oG +oG +oG +oG +oG +MC +oG +oG eF Yi -Vx -QI +sB +lI SB Qi NX -Vx +sB Yi -Vx -DH +yJ +Cj ux QI -ix -ix +wr +wr QI -Qi -Vx +Gs +yJ Qt EM in @@ -31145,36 +32380,36 @@ bz (133,1,1) = {" wg kJ -OZ +rk Mn -Sc -Sc -Sc -Sc +bl +bl +bl +bl Ls -OZ +rk kJ Dw -cY +oG tw -cY -cY -cY -cY +oG +oG +oG +oG sR -cY +oG XF -cY +oG eF Yi -Vx -Vx -Vx +sB +sB +sB Qi qh -Vx +sB Yi -Vx +yJ ro QI iO @@ -31182,7 +32417,7 @@ QI QI QI kI -Vx +yJ Qt Mt Mt @@ -31340,43 +32575,43 @@ bz wg qs CD -Sc -Sc +bl +bl cf jJ -Sc -Sc +bl +bl CD qs Dw -cY -cY -cY -cY -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG +oG +oG +oG +oG eF Yi -Vx -Vx -Vx +sB +sB +sB Qi NX -Vx +sB Yi -Vx -DH +yJ +Cj QI QI QI QI -Is -Qi -Vx +BC +Gs +yJ Qt Mt Mt @@ -31533,72 +32768,72 @@ bz (135,1,1) = {" wg kJ -OZ -Sc +rk +bl cf gy vF jJ -Sc +bl CD kJ Dw -cY -cY +oG +oG wO -cY +oG XF -cY -cY -cY +oG +oG +oG sR -cY +oG eF Yi -Vx +sB ND -QI +lI Qi NX -Vx +sB Yi -Vx -DH +yJ +Cj QI -ix +wr QI QI QI -Aa -Vx +If +yJ Qt -yQ -yQ -yQ +Wt +Wt +Wt td MH Ui ri kc -QI -QI -QI -QI +xX +xX +xX +xX nC Nj hs -QI -QI -QI -QI +xX +xX +xX +xX pD OY mM td td -yQ -yQ -yQ +Wt +Wt +Wt Qt Yi Yi @@ -31728,43 +32963,43 @@ bz wg qs CD -Sc +bl Ls Oe Oe Mn -Sc -OZ +bl +rk qs Dw -cY -cY -cY -cY -cY -cY +oG +oG +oG +oG +oG +oG tw -cY -cY -eB +oG +oG +MC eF Yi -Vx -Vx -Vx -Vx -Vx -Vx +sB +sB +sB +sB +sB +sB Yi -Vx -DH +yJ +Cj QI QI QI QI QI -Qi -Vx +Gs +yJ Qt Mt Mt @@ -31776,13 +33011,13 @@ St td td nC -QI +xX MY MY MY MY MY -QI +xX VK td td @@ -31950,15 +33185,15 @@ Yi Yi Yi Yi -Vx -DH -ix +yJ +Cj +wr QI QI QI QI -Qi -Vx +Gs +yJ Qt Mt Mt @@ -31973,7 +33208,7 @@ nC Cz xr xr -oQ +ti xr xr Zi @@ -32115,26 +33350,26 @@ bz (138,1,1) = {" wg ft -mT -mT +tG +tG vK -qf -qf -qf -qf -qf +CO +CO +CO +CO +CO ob Dw Pc -dU -dU -mT -mT -mT -mT -mT -mT -mT +jQ +jQ +SE +SE +SE +SE +SE +SE +SE eF Yi qQ @@ -32144,30 +33379,30 @@ qQ qQ qQ Yi -Vx -DH +yJ +Cj QI QI -Is +BC QI -ix +wr OB -Vx +yJ Qt Mt Mt td Ap jA -Tl -Tl +hl +hl jz zc nC Cz ZT bH -oQ +ti bH Db Zi @@ -32176,8 +33411,8 @@ TI FW UY DX -sU -sU +uN +uN EK Mt Mt @@ -32309,19 +33544,19 @@ bz (139,1,1) = {" wg Yy -mT -mT +tG +tG vK -qf -qf -qf -qf -qf -qf +CO +CO +CO +CO +CO +CO Dw -dU -dU -dU +jQ +jQ +jQ kp kp kp @@ -32338,15 +33573,15 @@ qQ qQ qQ Yi -Vx -DH +yJ +Cj QI QI QI QI QI -Qi -Vx +Gs +yJ Qt Mt Mt @@ -32361,7 +33596,7 @@ nC Cz wR wR -oQ +ti wR wR Zi @@ -32503,24 +33738,24 @@ bz (140,1,1) = {" wg Yy -mT -mT +tG +tG vK -Bf +LY Ff Ff Ff -fy -qf +Yz +CO Dw -dU -dU -dU +jQ +jQ +jQ kp Ir -Ff -Ff -Ff +Zh +Zh +Zh fy kp eF @@ -32532,15 +33767,15 @@ qQ qQ qQ Yi -Vx +yJ ro QI -ix +wr QI QI QI kI -Vx +yJ Qt Mt Mt @@ -32552,13 +33787,13 @@ Io td td nC -QI +xX ZQ ZQ ZQ ZQ ZQ -QI +xX kn td td @@ -32697,17 +33932,17 @@ bz (141,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ QK Dz kp @@ -32726,43 +33961,43 @@ qQ qQ qQ Yi -Vx -DH +yJ +Cj QI QI QI QI -Is -Qi -Vx +BC +Gs +yJ Qt -yQ -yQ -yQ +Wt +Wt +Wt td MH sA zQ kc -QI -QI -QI -QI +xX +xX +xX +xX nC wf hs -QI -QI -QI -QI +xX +xX +xX +xX pD lh uK td td -yQ -yQ -yQ +Wt +Wt +Wt Qt Yi Yi @@ -32891,17 +34126,17 @@ bz (142,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ EB Dz kp @@ -32920,7 +34155,7 @@ qQ qQ qQ Yi -Vx +yJ hb Oc QI @@ -32928,7 +34163,7 @@ mt QI LP kb -Vx +yJ Qt Mt Mt @@ -33085,17 +34320,17 @@ bz (143,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ EB Dz kp @@ -33114,15 +34349,15 @@ qQ qQ qQ Yi -Vx +yJ QI -YI -SL +AI +mp Ps Vt lS In -Vx +yJ Qt Mt Mt @@ -33279,17 +34514,17 @@ bz (144,1,1) = {" wg Yy -mT -mT +tG +tG vK -po -Yj -Yj -Yj -lP -qf +Na +us +us +us +qG +CO Dw -dU +jQ EB Dz kp @@ -33308,15 +34543,15 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx +yJ +yJ +yJ +yJ +yJ MV MV MV -Vx +yJ Qt wK Sx @@ -33473,17 +34708,17 @@ bz (145,1,1) = {" wg Yy -mT -mT +tG +tG vK Pr zA zA zA MZ -qf +CO Dw -dU +jQ kg Dz kp @@ -33494,32 +34729,32 @@ Yj lP kp eF -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Qk -Qk -Qk -Vx -yR -Vx -Vx -Vx -yR +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +eL +eL +eL +yJ +iL +yJ +yJ +yJ +iL hp -FL -FL -FL +NZ +NZ +NZ Tl Tl Tl @@ -33531,14 +34766,14 @@ Tl Tl Tl Tl -FL +NZ Zr FN at yR -Vx -Vx -Vx +Sj +Sj +Sj yR Yi Yi @@ -33667,40 +34902,40 @@ bz (146,1,1) = {" wg Yy -mT -mT +tG +tG vK -qf -qf -qf -qf -qf -qf +CO +CO +CO +CO +CO +CO Dw -dU -dU -dU +jQ +jQ +jQ kp Vs -zA -zA +hJ +hJ ng II kp eF -Vx -QI -QI +sB +lI +lI PV -QI -QI -QI -QI +lI +lI +lI +lI PV -QI -QI -QI -Vx +lI +lI +lI +sB xI QI QI @@ -33733,7 +34968,7 @@ Lx ie Iq wA -Vx +Sj Yi Yi Yi @@ -33861,8 +35096,8 @@ bz (147,1,1) = {" wg Yy -mT -mT +tG +tG OW oh oh @@ -33871,9 +35106,9 @@ oh XV pI Dw -dU -dU -dU +jQ +jQ +jQ kp Yr Yr @@ -33882,19 +35117,19 @@ kp kp kp eF -Vx -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -Vx +sB +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +sB Qu QI QI @@ -33911,12 +35146,12 @@ Tl Tl Tl aH -Vx +yJ HR HR HR -Vx -Vx +yJ +Sj Zn Zn Zn @@ -33927,7 +35162,7 @@ dX ie ie Jz -Vx +Sj Yi Yi Yi @@ -34076,25 +35311,25 @@ ym ym ym Vx -Vx +sB Zu -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx -QI +lI +sB +sB +sB +sB +sB +sB +sB +lI xj -Vx +sB jX QI QI nZ QI -YE +SC QI QI Zv @@ -34104,7 +35339,7 @@ cS yF Jc yE -GZ +Dt md Qk VZ @@ -34121,7 +35356,7 @@ fA ie ie pQ -Vx +Sj Yi Yi Yi @@ -34248,8 +35483,8 @@ bz "} (149,1,1) = {" wg -Dz -dU +fN +OD uJ Ou mr @@ -34257,9 +35492,9 @@ mr mr mr uf -Dz +fN GT -hk +zS yb yb yb @@ -34270,52 +35505,52 @@ nO nO QL eF -Vx -QI -QI -Vx +sB +lI +lI +sB FB YH YH YH mJ -Vx -QI -QI -Vx -oc -oc -oc -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +sB +lI +lI +sB +Vr +Vr +Vr +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ +yJ Zu -QI -QI -QI +lI +lI +lI xj -Vx -Vx -Vx +Sj +Sj +Sj IA -Zn +Ln Kd -Vx -Vx +Sj +Sj MM -Vx -Vx -Vx +Sj +Sj +Sj Yi Yi Yi @@ -34442,8 +35677,8 @@ bz "} (150,1,1) = {" wg -Dz -dU +fN +OD eu IU XZ @@ -34451,7 +35686,7 @@ XZ XZ XZ zC -Dz +fN GT Dx qf @@ -34464,41 +35699,41 @@ qf qf tp eF -Vx -QI -QI -Vx +sB +lI +lI +sB XD JN KU KU KU BH -QI -QI -Vx -Vx +lI +lI +sB Vx Vx Vx +AK Ic -rT +gx HP -Vx +PT Ej Ej -Vx +PT KR zU dg Xq Nt -QI -QI -QI -QI -QI -Vx +lI +lI +lI +lI +lI +Sj Zn tt Wd @@ -34508,7 +35743,7 @@ ID Fk ie GL -Vx +Sj Yi Yi Yi @@ -34636,8 +35871,8 @@ bz "} (151,1,1) = {" wg -Dz -dU +fN +OD Wv Hn Hn @@ -34647,7 +35882,7 @@ Hn Hn Hn GT -hk +zS yb Dx qf @@ -34658,41 +35893,41 @@ tp nO QL eF -Vx -QI -QI -Vx +sB +lI +lI +sB XD fr Rj Rj Rj -Rj -QI -QI -Vx +Mf +lI +lI +sB Yi Yi Yi -Vx +AK Ua -rT +gx KZ -Vx +PT LI -QI +Nz WC -QI -QI +Nz +Nz nv UU zX La -QI -QI -QI -QI -OA +lI +lI +lI +lI +jK Zr lv ne @@ -34702,7 +35937,7 @@ ID Py ie Dd -Vx +Sj Yi Yi Yi @@ -34830,11 +36065,11 @@ bz "} (152,1,1) = {" wg -Dz -dU -dU +fN +OD +OD MO -Bf +Hj EP As Wr @@ -34852,40 +36087,40 @@ tp qf on eF -Vx -QI -QI -Vx +sB +lI +lI +sB uA Al Al Al dl -Vx -QI -QI -Vx +sB +lI +lI +sB Yi Yi Yi -Vx +AK NQ -rT +gx su -Vx +PT LI FX -Vx -QI -QI +PT +Nz +Nz Yg zy zX et -QI -QI -QI -QI +lI +lI +lI +lI Lu Zr eG @@ -34896,7 +36131,7 @@ ID Iz ie pX -Vx +Sj Yi Yi Yi @@ -35024,62 +36259,62 @@ bz "} (153,1,1) = {" wg -Dz -dU -Dz +fN +OD +fN Hs po -Xs +Ao rJ zF rJ aw GT hI -GV +TF Dx qf IB Av qf tp -NT -FA +Dr +lk eF -Vx +sB Zu -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx -QI +lI +sB +sB +sB +sB +sB +sB +sB +lI xj -Vx +sB Yi Yi Yi -Vx +AK Wo -rT +gx pS -Vx +PT fF -QI -Vx +Nz +PT IM DO aT Xq Nt -QI -QI -QI -QI -QI +lI +lI +lI +lI +lI Sy Zn xJ @@ -35090,7 +36325,7 @@ ID Pm ie tR -Vx +Sj Yi Yi Yi @@ -35218,8 +36453,8 @@ bz "} (154,1,1) = {" wg -Dz -dU +fN +OD Cv my po @@ -35240,41 +36475,41 @@ qf qf tp eF -Vx -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -QI -Vx +sB +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +sB Yi Yi Yi -Vx +AK pG -rT +gx Sg -Vx -Vx +PT +PT WC -Vx -Vx -Vx -Vx -Vx -Vx -QI -QI -QI -QI -QI -OA +PT +PT +PT +PT +PT +PT +lI +lI +lI +lI +lI +jK Zn Zn Zn @@ -35284,7 +36519,7 @@ ID rt ie rp -Vx +Sj Yi Yi Yi @@ -35412,63 +36647,63 @@ bz "} (155,1,1) = {" wg -Dz -dU -Dz +fN +OD +fN Sk po -Xs +Ao rJ zF rJ aw GT hI -GV -GV -GV +TF +TF +TF UZ gq -NT -NT -NT -FA +Dr +Dr +Dr +lk eF -Vx -QI -QI -YE -QI -QI -QI -QI -YE -QI -QI -QI -Vx +sB +lI +lI +Oh +lI +lI +lI +lI +Oh +lI +lI +lI +sB Yi Yi Yi -Vx +AK Vl -rT +gx pw -Vx +PT OP -QI +Nz uu -QI -QI +Nz +Nz GC FS -Vx +PT Zu -QI -QI -QI +lI +lI +lI xj -OA +jK Zn vf vf @@ -35478,7 +36713,7 @@ ID BA ie ie -Vx +Sj Yi Yi Yi @@ -35606,11 +36841,11 @@ bz "} (156,1,1) = {" wg -Dz -dU -dU +fN +OD +OD Dc -Pr +SU oB kS fW @@ -35619,50 +36854,50 @@ Bc GT Bb Bb -aB +wF Bb Bb Bb Bb -aN +pa Bb Bb eF -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB Yi Yi Yi -Vx -Vx +AK +AK bc -Vx -Vx +AK +PT wJ -QI -QI -QI -QI -QI -QI +Nz +Nz +Nz +Nz +Nz +Nz Xk -QI -QI -QI -QI -QI -OA +lI +lI +lI +lI +lI +jK Zr Mz ig @@ -35672,7 +36907,7 @@ Zn Zn Zn Zs -Vx +Sj Yi Yi Yi @@ -35811,16 +37046,16 @@ hi IH BR GT -JH -JH -mT -JH -JH -JH -JH -mT -JH -JH +Ci +Ci +UQ +Ci +Ci +Ci +Ci +UQ +Ci +Ci eF pb pb @@ -35838,25 +37073,25 @@ pb Yi Yi Yi -Vx -Vx -Vx -Vx -Vx +PT +PT +PT +PT +PT zM -QI -QI +Nz +Nz fJ Fa Fa Sa -Vx -QI -QI -QI -QI -QI -OA +PT +lI +lI +lI +lI +lI +jK Zr AO GN @@ -35866,7 +37101,7 @@ Zn Zn Zn Qs -Vx +Sj Yi Yi Yi @@ -35994,62 +37229,62 @@ bz "} (158,1,1) = {" wg -qf -qf -qf -qf -qf -qf -qf -qf -qf -qf +iN +iN +iN +iN +iN +iN +iN +iN +iN +iN GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +UQ +UQ +UQ +UQ +UQ +UQ +UQ +UQ +UQ +UQ eF pb -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +to +to +to +to +to +to +to +to +to +to +to pb Yi Yi Yi -Vx +PT eM Xp zH -Vx +PT rb -QI -QI +Nz +Nz wB Fa qk Sa -Vx -QI -QI -QI -QI -QI +PT +lI +lI +lI +lI +lI Lu Zn xJ @@ -36060,7 +37295,7 @@ vf Zn Zn dn -Vx +Sj Yi Yi Yi @@ -36211,7 +37446,7 @@ ym ym Vx pb -Vx +to RX RX iv @@ -36221,29 +37456,29 @@ RX iv RX RX -Vx +to pb Yi Yi Yi -Vx +PT tZ BM QS -Vx -Vx +PT +PT WC -Vx -Vx -Vx -Vx -Vx -Vx +PT +PT +PT +PT +PT +PT Zu -QI -QI -QI -QI +lI +lI +lI +lI Sy Zn Zn @@ -36254,7 +37489,7 @@ KA Oz Zn ld -Vx +Sj Yi Yi Yi @@ -36405,7 +37640,7 @@ Yh Yh eF pb -Vx +to iv iv iv @@ -36415,30 +37650,30 @@ iv iv iv iv -Vx +to pb Yi Yi Yi -Vx -OA +PT +PP vr -OA -Vx -QI -QI -QI +PP +PT +Nz +Nz +Nz Ho -Vx +PT BM xs -Vx -QI -QI -QI -QI -QI -OA +PT +lI +lI +lI +lI +lI +jK Zn Zn Zn @@ -36448,7 +37683,7 @@ lZ Oz Zn nx -Vx +Sj Yi Yi Yi @@ -36599,7 +37834,7 @@ Yh Yh eF pb -Vx +to RX RX iv @@ -36609,30 +37844,30 @@ RX iv RX RX -Vx +to pb Yi Yi Yi -Vx -QI -QI +PT +Nz +Nz FX -Vx +PT ac -QI -QI +Nz +Nz Ho -Vx +PT VP xs -Vx -QI -QI -QI -QI -QI -Vx +PT +lI +lI +lI +lI +lI +Sj dZ yy Zn @@ -36642,7 +37877,7 @@ xJ yy nm dI -Vx +Sj Yi Yi Yi @@ -36782,7 +38017,7 @@ tY tY GT uX -tT +nX uX uX uX @@ -36808,35 +38043,35 @@ pb Yi Yi Yi -Vx +PT yi -QI -QI +Nz +Nz WC -QI -QI -QI -QI +Nz +Nz +Nz +Nz Po BM xs -Vx -QI -QI -QI -QI -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +PT +lI +lI +lI +lI +lI +sB +gM +gM +gM +gM +gM +gM +gM +gM +gM +gM Yi Yi Yi @@ -36987,50 +38222,50 @@ Yh Yh eF pb -BK -BK -BK +Ib +Ib +Ib qX Sb -BK +Ib Sb Yk -BK -BK -BK +Ib +Ib +Ib pb pb Yi Yi -Vx -QI -QI +PT +Nz +Nz FX -Vx +PT cK cK cK Yd -Vx +PT IL xs -Vx +PT Zu -QI -QI -QI -QI +lI +lI +lI +lI Mr -Vx +gM RU Lj OL -sU -sU +DA +DA ed Lj RU -Vx +gM Yi Yi Yi @@ -37181,7 +38416,7 @@ Yh Yh eF pb -BK +Ib FC mL wC @@ -37190,41 +38425,41 @@ Ke FC Nb mL -BK -BK +Ib +Ib Qd pb Yi Yi -Vx -OA +PT +PP CH -OA -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -QI -QI -QI -QI -QI -QI +PP +PT +PT +PT +PT +PT +PT +PT +PT +PT +lI +lI +lI +lI +lI +lI HA -sU -sU -sU -sU -sU -sU -sU -sU -Vx +DA +DA +DA +DA +DA +DA +DA +DA +gM Yi Yi Yi @@ -37375,7 +38610,7 @@ Yh Yh eF pb -BK +Ib FC FC wC @@ -37390,35 +38625,35 @@ nq pb Yi Yi -Vx +PT cq BM QS -Vx -ee +PT +MG Vh Vh Vh Vh Vh XG -Vx -QI -QI -QI -QI -QI +sB +lI +lI +lI +lI +lI Ux -Vx +gM cb -sU -Vx +DA +gM wk -Vx +gM bJ -Vx +gM RD -Vx +gM Yi Yi Yi @@ -37559,7 +38794,7 @@ tY GT uX uX -iT +bn uX uX uX @@ -37569,7 +38804,7 @@ Yh Yh eF pb -BK +Ib FC FC wC @@ -37584,35 +38819,35 @@ wQ pb Yi Yi -Vx +PT Tv fZ oN -Vx +PT PK -gZ -QI -QI -QI -QI -Qi -Vx -QI -QI -QI -QI -QI +pO +cX +cX +cX +cX +Aw +sB +lI +lI +lI +lI +lI Ux -Vx +gM nU oj -Vx +gM ak -Vx +gM ak -Vx +gM yL -Vx +gM Yi Yi Yi @@ -37763,7 +38998,7 @@ Yh Yh eF pb -BK +Ib FC FC FC @@ -37778,39 +39013,39 @@ nq pb Yi Yi -Vx -Vx -Vx -Vx -Vx +PT +PT +PT +PT +PT DH -ux -QI +MW +cX ix ix -QI -Qi -Vx +cX +Aw +sB Zu -QI -QI -QI +lI +lI +lI xj -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +sB +gM +gM +gM +gM +gM +gM +gM +gM +gM +gM +mH +mH +mH +mH Yi qQ qQ @@ -37957,7 +39192,7 @@ Yh Yh eF pb -BK +Ib FC En FC @@ -37966,8 +39201,8 @@ FC FC FC En -BK -BK +Ib +Ib tH pb Yi @@ -37976,35 +39211,35 @@ Yi Yi Yi Yi -Vx -ro -QI -iO -QI -QI -QI -kI -Vx -QI -QI -QI -QI -QI -Vx +NM +tq +cX +KT +cX +cX +cX +oo +sB +lI +lI +lI +lI +lI +mH sU sU JX gC IP -Vx +mH aF WV oI -Vx +mH gY xd rZ -Vx +mH Yi qQ qQ @@ -38151,17 +39386,17 @@ Yh Yh eF pb -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK -BK +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib qQ pb Yi @@ -38170,35 +39405,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI +cX +cX +cX +cX Is -Qi -Vx -QI -QI -QI -QI -QI +Aw +sB +lI +lI +lI +lI +lI OA Tt sU Fl vS sU -Vx +mH sf dx aY -Vx +mH Bw oQ oQ -Vx +mH Yi qQ qQ @@ -38364,35 +39599,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI +cX ix -QI -QI -QI +cX +cX +cX Aa -Vx -QI -QI -QI -QI -QI +sB +lI +lI +lI +lI +lI Zk sU Qq UL GO SI -Vx +mH Ny JI qb -Vx +mH ww oQ oQ -Vx +mH Yi qQ qQ @@ -38516,26 +39751,26 @@ bz "} (171,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT Qh -yb -yb -yb +MB +MB +MB Hc BS -nO -nO -nO +ZD +ZD +ZD XM eF uw @@ -38558,35 +39793,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI -QI -Qi -Lu -QI -QI -QI -QI -QI +cX +cX +cX +cX +cX +Aw +ey +lI +lI +lI +lI +lI Ol sU sU qd vS sU -Vx +mH sf yG VQ -Vx +mH UI oQ CV -Vx +mH Yi qQ qQ @@ -38710,39 +39945,39 @@ bz "} (172,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT -dU -dU -dU +qK +qK +qK GT -WB +Qp Sc Sc GT -dU -dU -dU +qm +qm +qm eF qQ qQ @@ -38752,35 +39987,35 @@ Yi Yi Yi Yi -Vx +NM DH ix -QI -QI -QI -QI -Qi -Sy -QI -QI -QI -QI -QI +cX +cX +cX +cX +Aw +sa +lI +lI +lI +lI +lI Zt sU sU vD Eq iJ -Vx +mH sh vS OO -Vx +mH oQ oQ CV -Vx +mH Yi qQ qQ @@ -38904,38 +40139,38 @@ bz "} (173,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT VV -dU +qK xV GT Sc Sc -Jn +lN GT Bf -mr +UW fY eF qQ @@ -38946,19 +40181,19 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI +cX +cX Is -QI +cX ix -OB -Vx +gv +sB Zu -QI -QI -QI +lI +lI +lI xj GE sU @@ -38966,15 +40201,15 @@ sU sU sU sU -Vx +mH ck sU fK -Vx +mH oQ oQ CV -Vx +mH Yi qQ qQ @@ -39098,31 +40333,31 @@ bz "} (174,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT -Dz -dU -Dz +xb +qK +xb GT Sc Sc @@ -39130,7 +40365,7 @@ Sc GT XR Xs -aw +kz eF qQ qQ @@ -39140,35 +40375,35 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI -QI -Qi -Vx -QI -QI -QI -QI -QI +cX +cX +cX +cX +cX +Aw +sB +lI +lI +lI +lI +lI OA Tt sU jo sU Ns -Vx -Vx +mH +mH WI -Vx -Vx +mH +mH Vw -Vx -Vx -Vx +mH +mH +mH Yi qQ qQ @@ -39292,39 +40527,39 @@ bz "} (175,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT Pd -dU -dU +qK +qK GT Sc -WB +Qp Sc GT XR Xs -aw +kz eF qQ qQ @@ -39334,34 +40569,34 @@ Yi Yi Yi Yi -Vx -ro -QI +NM +tq +cX ix -QI -QI -QI -kI -Vx -QI -QI -QI -QI -QI +cX +cX +cX +oo +sB +lI +lI +lI +lI +lI OA Tt jo jo jo sU -Vx +mH Px HQ HQ HQ HQ MK -Vx +mH Yi Yi qQ @@ -39486,30 +40721,30 @@ bz "} (176,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT ga -qf -qf -qf +Ef +Ef +Ef tI fO -qf -qf -qf +Ef +Ef +Ef gj GT -Dz -dU +xb +qK xV GT Sc @@ -39528,20 +40763,20 @@ Yi Yi Yi Yi -Vx +NM DH -QI -QI -QI -QI +cX +cX +cX +cX Is -Qi -Vx -QI -QI -QI -QI -QI +Aw +sB +lI +lI +lI +lI +lI OA Tt sU @@ -39555,7 +40790,7 @@ sU KS sU RT -Vx +mH Yi Yi qQ @@ -39680,39 +40915,39 @@ bz "} (177,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT yI -GV -GV -GV +Fh +Fh +Fh Bd Mc -NT -NT -NT +CX +CX +CX Lq GT -Dz -dU -Dz +xb +qK +xb GT -Jn +lN Sc Sc GT -dU -dU -dU +qm +qm +qm eF qQ qQ @@ -39722,34 +40957,34 @@ Yi Yi Yi Yi -Vx +NM CU -Oc -QI -QI -QI -LP +YN +cX +cX +cX +PX Hz -Vx -QI -QI -QI -QI -QI -Vx +sB +lI +lI +lI +lI +lI +mH hG sU Sn sU sU -sU +pN dw sU sU ZO sU -wu -Vx +TG +mH Yi Yi qQ @@ -39874,27 +41109,27 @@ bz "} (178,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT -Bb -Bb -aB -Bb -Bb -Bb -Bb -aN -Bb -Bb +AX +AX +jM +AX +AX +AX +AX +nD +AX +AX eF ym ym @@ -39916,34 +41151,34 @@ Yi Yi Yi Yi -Vx -QI +NM +Yl YI SL JR SL Hz -QI -Vx -QI -QI -QI -QI -QI -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Yl +sB +lI +lI +lI +lI +lI +mH +mH +mH +mH +mH +mH +mH yu sU sU sU sU Ij -Vx +mH Yi Yi qQ @@ -40068,39 +41303,39 @@ bz "} (179,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT -JH -JH -mT -JH -JH -JH -JH -mT -JH -JH +sc +sc +yc +sc +sc +sc +sc +yc +sc +sc GT tT -vP -Yh +UD +vu GT -CD +vb OZ -CD +vb GT -nz -mT -mT +kB +LH +LH eF qQ qQ @@ -40110,34 +41345,34 @@ Yi Yi Yi Yi -Vx -Vx +NM +NM oc oc oc oc oc -Vx -Vx +NM +sB Zu -QI -QI -QI +lI +lI +lI xj -Vx +mH XW gc qE RY Mx -Vx +mH qI sU sU sU sU Od -Vx +mH Yi Yi qQ @@ -40262,34 +41497,34 @@ bz "} (180,1,1) = {" wg -tY -tY -tY -tY -tY -tY -tY -tY -tY -tY +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb +Qb GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc GT -uX -vP -Yh +Sr +UD +vu GT OZ -CD +vb OZ GT FG @@ -40304,34 +41539,34 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac +Ac wc -QI -QI -QI -QI -QI -Vx +lI +lI +lI +lI +lI +mH hh Xf xw QW hh -Vx +mH Li sU sU LL sU Zw -Vx +mH Yi Yi qQ @@ -40479,16 +41714,16 @@ ym ym wg Jw -vP -Yh +UD +vu GT -CD +vb LX -CD +vb GT -mT -mT -mT +LH +LH +LH eF qQ qQ @@ -40498,21 +41733,21 @@ Yi Yi Yi Yi -Vx +Ac WK -KU -KU -KU -KU +ny +ny +ny +ny Af rT -rT -QI -QI -QI -QI -QI -Vx +tl +lI +lI +lI +lI +lI +mH ZZ oL gz @@ -40525,7 +41760,7 @@ sU QV sU RH -Vx +mH Yi Yi qQ @@ -40651,38 +41886,38 @@ bz (182,1,1) = {" wg hk -yb -yb -yb -yb -nO -nO -nO -nO -QL +PO +PO +PO +PO +zr +zr +zr +zr +ra GT nz -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +um +um +um +um +um +um GT iT -vP -Yh +UD +vu GT OZ -CD +vb OZ GT -mT -mT -mT +LH +LH +LH eF qQ qQ @@ -40692,21 +41927,21 @@ Yi Yi Yi Yi -Vx +Ac vm -QI +Tc gQ -QI +Tc sX QO rT -rT -QI -QI -QI -QI -QI -Vx +tl +lI +lI +lI +lI +lI +mH nG HF At @@ -40718,8 +41953,8 @@ sU sU sU sU -wu -Vx +TG +mH Yi Yi qQ @@ -40844,35 +42079,35 @@ bz "} (183,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT nz -mT -mT +um +um vg vg vg vg -mT -mT -mT +um +um +um GT Km -vP -Yh +UD +vu GT -CD +vb OZ -CD +vb GT Pl Pl @@ -40886,34 +42121,34 @@ Yi Yi Yi Yi -Vx +Ac Sq -Rj +Bh ZS OK PN -Vx -Vx -Vx +Ac +Ac +Ac ha Yw Yw Yw qc -Vx -Vx -Vx -cb +Ac +Ac +Ac +Hp sU sU -Vx +mH wh sU sU sU sU RH -Vx +mH Yi Yi qQ @@ -41038,39 +42273,39 @@ bz "} (184,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +bq +bq +bq +bq +um +um +um GT -uX -vP -Yh +Sr +UD +vu GT OZ -CD +vb OZ GT -mT -mT -Ka +LH +LH +Iw eF qQ qQ @@ -41080,34 +42315,34 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac By IE -QI +Tc YE -QI +Tc YE -QI +Tc IE By -Vx +Ac Yp uP Dk -Vx +mH ag pi PJ uL cN Fo -Vx +mH Yi Yi qQ @@ -41232,27 +42467,27 @@ bz "} (185,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT -mT -mT -Ac -sB -sB -yJ -mT +um +um +mG +So +So +So +So +cm vg -mT +um eF ym ym @@ -41274,34 +42509,34 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac +Ac +Ac IE -Vx +Ac IE -Vx +Ac IE -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +mH +mH +mH +mH +mH +mH +mH +mH +mH +mH +mH Yi Yi qQ @@ -41426,39 +42661,39 @@ bz "} (186,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT +um vg -mT -lI -Zn -Zn -mH -mT +Gd +So +So +So +So +cm vg -mT +um GT zi cY -XF +IX GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -41476,13 +42711,13 @@ Yi Yi Yi Yi -Vx +Ac By -Vx +Ac By -Vx +Ac By -Vx +Ac Yi Yi Yi @@ -41620,39 +42855,39 @@ bz "} (187,1,1) = {" wg -Dx -qf -qf -qf -qf -qf -qf -qf -qf -tp +jv +Bq +Bq +Bq +Bq +Bq +Bq +Bq +Bq +rc GT -mT +um vg -mT -lI -Zn -Zn -mH -mT +Gd +So +So +So +So +cm vg -mT +um GT cY yd cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -41670,13 +42905,13 @@ Yi Yi Yi Yi -Vx -Vx -Vx -Vx -Vx -Vx -Vx +Ac +Ac +Ac +Ac +Ac +Ac +Ac Yi Yi Yi @@ -41814,7 +43049,7 @@ bz "} (188,1,1) = {" wg -hI +GH GV GV GV @@ -41825,28 +43060,28 @@ NT NT FA GT -mT +um vg -mT -gM -Dm -Dm -Jb -mT -mT -mT +Gd +So +So +So +So +Fd +um +um GT cY eB cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -42008,39 +43243,39 @@ bz "} (189,1,1) = {" wg -Bb -Bb +WO +WO aB -Bb -Bb -Bb -Bb +WO +WO +WO +WO aN -Bb -Bb +WO +WO GT -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +ei +ei +ei +ei +um +um +um GT cY Cd cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -42204,37 +43439,37 @@ bz wg JH JH -mT +xZ JH JH JH JH -mT +xZ JH JH GT -mT -mT -mT +um +um +um vg vg vg vg -mT -mT +um +um Ka GT cY cY cY GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ @@ -42396,39 +43631,39 @@ bz "} (191,1,1) = {" wg -mT -mT -mT -mT -mT -mT -mT -mT -mT -mT +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ GT -mT -mT -mT -mT -mT -mT -mT -mT -mT +um +um +um +um +um +um +um +um +um Ka GT cY cY -tw +Wg GT -tY -tY -tY +FR +FR +FR GT -wV -wV -wV +JV +JV +JV eF qQ qQ diff --git a/maps/tether/levels/plains.dmm b/maps/tether/levels/plains.dmm index 3996faa553..5d5905c37c 100644 --- a/maps/tether/levels/plains.dmm +++ b/maps/tether/levels/plains.dmm @@ -62,10 +62,6 @@ /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/exploration_shed) -"p" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/outpost/exploration_shed) "r" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, @@ -93,6 +89,7 @@ /area/tether/outpost/exploration_shed) "B" = ( /obj/effect/floor_decal/rust, +/obj/effect/step_trigger/teleporter/from_plains, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/exploration_shed) "D" = ( @@ -111,11 +108,8 @@ /area/tether/outpost/exploration_shed) "G" = ( /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + alarms_hidden = 1 }, /obj/structure/cable/green{ icon_state = "0-2" @@ -22851,11 +22845,11 @@ u b "} (118,1,1) = {" +B O -p E -p -p +O +O F t d @@ -23046,10 +23040,10 @@ b "} (119,1,1) = {" B -p -p -p -p +O +O +O +O Y t d @@ -23240,12 +23234,12 @@ b "} (120,1,1) = {" B -p -p -p -p +O +O +O +O j -p +O d d d @@ -23434,12 +23428,12 @@ b "} (121,1,1) = {" B -p -p -p -p +O +O +O +O k -p +O d d w @@ -23628,9 +23622,9 @@ b "} (122,1,1) = {" B -p -p -p +O +O +O M F l @@ -23822,12 +23816,12 @@ b "} (123,1,1) = {" B -p -p -p -p +O +O +O +O j -p +O d w w @@ -24016,12 +24010,12 @@ b "} (124,1,1) = {" B -p -p -p -p +O +O +O +O k -p +O d d w @@ -24210,10 +24204,10 @@ b "} (125,1,1) = {" B -p -p -p -p +O +O +O +O Y t d @@ -24404,7 +24398,7 @@ b "} (126,1,1) = {" B -p +O m G o diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm index 1f67f7e03f..581d985cda 100644 --- a/maps/tether/levels/station1.dmm +++ b/maps/tether/levels/station1.dmm @@ -124,11 +124,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -177,7 +173,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "aq" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "ar" = ( /obj/machinery/computer/teleporter{ @@ -207,12 +203,9 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "au" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/equipment) "av" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, @@ -263,15 +256,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "aB" = ( @@ -353,7 +346,7 @@ /area/security/customs) "aI" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint/science) "aJ" = ( /obj/machinery/light/small{ @@ -377,6 +370,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; id_tag = "engine_electrical_maintenance"; @@ -384,11 +380,10 @@ name = "Electrical Maintenance"; req_access = list(10) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "aL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/cryo) "aM" = ( /obj/structure/bed/chair{ @@ -410,7 +405,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled, @@ -431,7 +426,9 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -449,13 +446,8 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "aS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted/exploration, +/area/tether/exploration/staircase) "aT" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, @@ -582,7 +574,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "bf" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/substation/spacecommand) "bg" = ( /obj/machinery/light/small, @@ -666,10 +658,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "bo" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -732,6 +721,9 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"bu" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/station/stairs_one) "bv" = ( /obj/structure/table/steel, /obj/random/action_figure, @@ -761,13 +753,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineEmitterPortWest2"; - name = "Engine Room Blast Doors"; - pixel_x = 25; - req_one_access = list(11,24) - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -824,24 +809,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "bC" = ( -/obj/structure/window/reinforced{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/door/window/northright{ - dir = 2; - name = "Atmospherics Hardsuits"; - req_access = list(24) +/obj/machinery/light/small{ + dir = 1 }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/atmos, -/turf/simulated/floor/tiled, -/area/engineering/engine_eva) +/turf/simulated/floor, +/area/constructionsite) "bD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/blue/border, @@ -884,7 +865,9 @@ dir = 1; pixel_y = 32 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "bI" = ( @@ -895,10 +878,6 @@ dir = 8 }, /obj/structure/table/standard, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, /obj/machinery/light{ dir = 8 }, @@ -978,21 +957,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "bW" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/machinery/door/window/northright{ - name = "Engineering Hardsuits"; - req_access = list(11) - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, +/obj/machinery/suit_storage_unit/engineering, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "bX" = ( @@ -1118,6 +1083,7 @@ /obj/structure/table/reinforced, /obj/item/suit_cooling_unit, /obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "cj" = ( @@ -1148,19 +1114,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "cn" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/southleft{ - name = "Jetpack Storage"; - req_access = list(); - req_one_access = list(11,24) - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/item/tank/jetpack/carbondioxide, +/obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "co" = ( @@ -1182,14 +1136,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Engine Access"; req_one_access = list(11) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_airlock) "ct" = ( @@ -1239,7 +1195,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "cx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/workshop) "cy" = ( /obj/machinery/light, @@ -1291,10 +1247,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -1326,22 +1279,21 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "cE" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" + }, /turf/simulated/floor/plating, /area/bridge/secondary) "cF" = ( @@ -1454,13 +1406,15 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "cP" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; id_tag = "engine_airlock_interior"; name = "Engine Airlock Interior"; req_access = list(11) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/engine_airlock) "cR" = ( @@ -1543,18 +1497,16 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "cZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; + dir = 2; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/blueshield) "da" = ( @@ -1643,7 +1595,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/civilian) "dg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1775,7 +1727,6 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "dr" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -1783,14 +1734,11 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "ds" = ( @@ -1849,16 +1797,10 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/table/rack/shelf, /obj/machinery/holoposter{ pixel_x = 30 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "dx" = ( @@ -1926,8 +1868,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "dF" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/shield_gen/external, @@ -1983,11 +1924,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -2023,19 +1960,18 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "dO" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "dP" = ( @@ -2094,14 +2030,14 @@ "dV" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/holoposter{ + pixel_y = -30 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, -/obj/machinery/holoposter{ - pixel_y = -30 +/obj/structure/cable/pink{ + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) @@ -2112,9 +2048,8 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "dX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/crew) "dY" = ( @@ -2134,8 +2069,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 28 }, /obj/structure/cable/green{ @@ -2162,15 +2096,15 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "ed" = ( @@ -2440,7 +2374,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/airlock_sensor{ - command = "cycle_interior"; + command = "cycle_int"; dir = 8; id_tag = "gravity_isensor"; master_tag = "gravity_airlock"; @@ -2508,11 +2442,7 @@ /area/engineering/hallway) "eL" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Hard Storage"; - req_access = list(11); - req_one_access = list() - }, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/storage) "eM" = ( @@ -2572,9 +2502,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) "eR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/gravity_lobby) "eS" = ( @@ -2662,11 +2591,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "fa" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/hallway/station/docks) "fb" = ( @@ -2734,11 +2659,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "fh" = ( @@ -2763,19 +2684,21 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "fi" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1379; - id_tag = "engine_airlock_exterior"; - name = "Engine Airlock Exterior"; - req_access = list(11) - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "engine_airlock_exterior"; + name = "Engine Airlock Exterior"; + req_access = list(11) + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_airlock) "fk" = ( @@ -2792,11 +2715,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Hard Storage"; - req_access = list(11); - req_one_access = list() - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/storage) "fm" = ( @@ -2854,7 +2772,9 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "fv" = ( @@ -2885,7 +2805,7 @@ /turf/simulated/floor/tiled, /area/storage/tools) "fz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/atrium) "fA" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -2979,11 +2899,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "fJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/machinery/air_alarm{ dir = 1; @@ -3014,7 +2930,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "fL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/crew) "fM" = ( /obj/structure/cable{ @@ -3068,8 +2984,7 @@ /turf/simulated/floor/wood, /area/hallway/station/atrium) "fR" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/air_alarm{ @@ -3101,10 +3016,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/staircase) "fU" = ( -/obj/machinery/camera/network/tether{ - dir = 4 - }, -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/hallway/station/docks) "fV" = ( /obj/effect/floor_decal/borderfloor, @@ -3134,6 +3046,12 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) +"fY" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "fZ" = ( /obj/machinery/computer/station_alert/all{ dir = 4 @@ -3187,20 +3105,15 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/hallway) "gf" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA" +/obj/machinery/holoposter{ + pixel_y = -30 }, -/turf/simulated/wall/r_wall, -/area/engineering/engine_room) +/turf/simulated/floor, +/area/constructionsite) "gg" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/tiled/dark, @@ -3267,15 +3180,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "gp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_monitoring) "gq" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -3320,7 +3226,7 @@ /turf/simulated/floor, /area/constructionsite) "gu" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_gas) "gv" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -3365,11 +3271,8 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -3399,19 +3302,18 @@ /area/bridge/meeting_room) "gG" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-8" + }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "gI" = ( @@ -3502,7 +3404,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "gS" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/blueshield) "gT" = ( /obj/structure/disposalpipe/segment{ @@ -3516,9 +3418,6 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "gU" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, /obj/machinery/door/airlock/multi_tile/glass{ @@ -3526,6 +3425,9 @@ name = "Equipment Prep"; req_one_access = list(19,43,67) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "gV" = ( @@ -3563,10 +3465,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/security/customs) "gZ" = ( @@ -3621,12 +3520,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "hf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/tether/exploration/staircase) "hg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3640,7 +3535,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/door/firedoor{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -3666,9 +3561,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) "hj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engineering_monitoring) "hk" = ( @@ -3753,10 +3647,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -3766,9 +3657,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "hr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "hs" = ( @@ -3834,7 +3724,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "hA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/spacecommandmaint) "hB" = ( /obj/structure/disposalpipe/trunk{ @@ -3852,7 +3742,6 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "hC" = ( -/obj/machinery/light/small, /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/atmospherics/portables_connector/fuel{ @@ -3938,14 +3827,10 @@ /obj/machinery/power/terminal{ dir = 8 }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/pink{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "hM" = ( @@ -4024,24 +3909,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) -"hU" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/machinery/door/window/northleft{ - name = "Engineering Hardsuits"; - req_access = list(11) - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/engineering, -/turf/simulated/floor/tiled, -/area/engineering/engine_eva) "hV" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4069,7 +3936,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "hY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload_foyer) "hZ" = ( /obj/structure/toilet{ @@ -4144,11 +4011,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "if" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4164,10 +4027,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/engineering/break_room) "ih" = ( @@ -4196,11 +4056,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/camera/network/tether{ dir = 1 }, @@ -4280,20 +4136,16 @@ /turf/simulated/floor/wood, /area/hallway/station/atrium) "ir" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled/white, /area/tether/exploration/showers) "is" = ( @@ -4342,12 +4194,11 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "iy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/customs) "iz" = ( @@ -4372,7 +4223,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "iD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_cyborg_station) "iE" = ( /obj/machinery/light{ @@ -4453,25 +4304,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"iN" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "ce_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "ce_office" - }, -/turf/simulated/floor, -/area/crew_quarters/heads/chief) "iO" = ( /turf/simulated/floor/wood/broken, /area/maintenance/abandonedlibraryconference) @@ -4548,18 +4380,17 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/window/southright{ - name = "Jetpack Storage"; - req_one_access = list(11,24) - }, /obj/structure/table/rack{ dir = 8; layer = 2.6 }, -/obj/item/tank/jetpack/carbondioxide, /obj/machinery/status_display{ pixel_y = 32 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/hardsuit/industrial, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "iY" = ( @@ -4612,12 +4443,11 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "jf" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/abandonedlibrary) "jg" = ( /obj/machinery/light, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /obj/effect/floor_decal/borderfloor, @@ -4709,11 +4539,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -4730,15 +4556,6 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "jr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -4746,6 +4563,8 @@ name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "js" = ( @@ -4797,7 +4616,6 @@ /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/medivac/general) "jv" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -4807,6 +4625,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/engineering{ name = "Gravity Generator"; req_access = list(11) @@ -4878,39 +4699,13 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"jC" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/checkpoint/science) "jD" = ( /obj/machinery/floodlight, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) "jE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/medivac/general) +/turf/simulated/wall/prepainted/engineering, +/area/engineering/gravity_lobby) "jF" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/cable{ @@ -5080,15 +4875,12 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "jW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted/command, +/area/bridge/secondary) "jX" = ( /obj/machinery/door/airlock/multi_tile/metal{ - name = "Cryogenic Storage"; - dir = 8 + dir = 8; + name = "Cryogenic Storage" }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5130,16 +4922,15 @@ /area/storage/emergency_storage/emergency4) "ka" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kb" = ( @@ -5192,9 +4983,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -5256,7 +5045,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /obj/machinery/door/airlock/glass/engineering{ name = "Break Room"; req_access = list(10) @@ -5264,7 +5055,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/break_room) "kl" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, /turf/simulated/floor/tiled, @@ -5358,11 +5149,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "kw" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5429,13 +5216,12 @@ /turf/simulated/wall/rshull, /area/shuttle/securiship/cockpit) "kE" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "kF" = ( @@ -5505,16 +5291,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/blueshield) "kL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engineering_monitoring) -"kM" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock19"; - name = "Engineering Washroom Toilet 1" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) "kN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5568,9 +5346,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/security/customs) "kR" = ( @@ -5580,19 +5356,8 @@ /turf/simulated/floor/airless, /area/engineering/atmos/backup) "kS" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/engineering/foyer) +/turf/simulated/wall/prepainted/command, +/area/bridge/meeting_room) "kT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5616,15 +5381,13 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/metal/mait{ - name = "Maintenance Access"; - dir = 4 + dir = 4; + name = "Maintenance Access" }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "kX" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "kY" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -5677,9 +5440,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloor{ @@ -5709,18 +5470,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "le" = ( @@ -5927,7 +5688,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "lB" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/station/spacecommandmaint) "lC" = ( /obj/structure/cable{ @@ -5948,18 +5709,16 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "lE" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) "lF" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -6062,6 +5821,7 @@ pixel_x = 4; pixel_y = -28 }, +/obj/item/defib_kit/loaded, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lR" = ( @@ -6207,7 +5967,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "md" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/engineering) "mf" = ( /obj/landmark{ @@ -6257,8 +6017,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/medivac/general) "ml" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -6314,7 +6073,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "mt" = ( /obj/effect/floor_decal/borderfloor{ @@ -6484,7 +6243,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "mI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/gravity_gen) "mJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6551,11 +6310,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "mQ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6622,7 +6377,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "mY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/customs) "mZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -6719,9 +6474,6 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "nk" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -6732,6 +6484,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "nl" = ( @@ -6763,21 +6518,16 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_one) "nn" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/tether/exploration/showers) "no" = ( @@ -6880,11 +6630,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/random/junk, /obj/random/tool, /obj/random/maintenance/clean, @@ -6981,11 +6727,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) @@ -7048,12 +6790,11 @@ name = "Holdings and Transit"; req_one_access = list(38,63) }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/customs) "nR" = ( @@ -7086,7 +6827,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/backup) "nT" = ( /obj/structure/sign/securearea{ @@ -7094,7 +6835,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engine_smes) "nU" = ( /obj/machinery/power/breakerbox/activated{ @@ -7159,7 +6900,7 @@ /area/tether/exploration/showers) "oc" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d1a1"; name = "interior access button"; @@ -7197,7 +6938,7 @@ /area/ai_upload) "of" = ( /obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload_foyer) "og" = ( /obj/machinery/disposal, @@ -7209,7 +6950,7 @@ /area/engineering/break_room) "oh" = ( /obj/machinery/status_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/abandonedlibraryconference) "oi" = ( /obj/machinery/computer/ship/helm{ @@ -7381,14 +7122,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "ox" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted/engineering, +/area/engineering/engine_airlock) "oy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -7406,18 +7141,17 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, /obj/machinery/light{ dir = 1 }, /obj/machinery/holoplant, +/obj/machinery/power/apc/east_mount{ + req_access = list(); + req_one_access = list(11,67) + }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "oA" = ( @@ -7714,15 +7448,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/engineering) -"pf" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/gravity_gen) "pg" = ( /obj/structure/table/woodentable, /obj/machinery/door/blast/shutters{ @@ -7747,12 +7472,7 @@ /turf/simulated/wall/rshull, /area/shuttle/medivac/general) "pj" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/security/customs) "pk" = ( @@ -7763,12 +7483,11 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "pl" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "pm" = ( @@ -7942,7 +7661,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "pF" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engine_monitoring) "pG" = ( /obj/machinery/door/firedoor{ @@ -7974,15 +7693,15 @@ /area/bridge/meeting_room) "pK" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "pL" = ( @@ -8003,15 +7722,8 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "pM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/hallway) "pN" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; @@ -8196,7 +7908,7 @@ /area/hallway/station/atrium) "qa" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d1a1"; name = "exterior access button"; @@ -8270,13 +7982,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/structure/table/rack/shelf, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "qm" = ( @@ -8376,11 +8082,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "qv" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted, +/area/maintenance/abandonedlibraryconference) "qw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8406,7 +8109,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "qx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/gravity_lobby) "qy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -8513,20 +8216,19 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "qL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint/science) "qM" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "qN" = ( @@ -8557,12 +8259,12 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "qQ" = ( @@ -8582,7 +8284,7 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "qT" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/toilet) "qU" = ( /obj/machinery/power/terminal{ @@ -8755,13 +8457,13 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/pink{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "rm" = ( @@ -8863,24 +8565,21 @@ /obj/structure/table/reinforced, /obj/item/folder/white, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "ry" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; + dir = 2; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/meeting_room) "rz" = ( @@ -8964,16 +8663,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "rI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; - name = "Engine Gas Storage" - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/backup) "rJ" = ( @@ -9049,10 +8738,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -9212,7 +8898,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "sg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, /area/engineering/atmos/backup) "sh" = ( /obj/random/trash_pile, @@ -9244,7 +8930,7 @@ /area/engineering/hallway) "sj" = ( /obj/machinery/status_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/abandonedlibrary) "sk" = ( /obj/machinery/recharge_station, @@ -9317,7 +9003,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_lobby) "sp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/hallway) "sq" = ( /turf/simulated/floor/tiled, @@ -9341,9 +9027,8 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "st" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/engine_airlock) "sv" = ( @@ -9410,7 +9095,7 @@ /turf/simulated/floor, /area/maintenance/substation/spacecommand) "sA" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/showers) "sB" = ( /obj/machinery/computer/station_alert, @@ -9434,16 +9119,15 @@ req_one_access = list(19,43,67) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/tether/exploration/showers) "sE" = ( @@ -9486,7 +9170,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ name = "Unisex Showers" }, @@ -9669,20 +9355,15 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "te" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 2; + dir = 4; icon_state = "pdoor0"; id = "securiship blast"; name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/general) "tf" = ( @@ -9713,14 +9394,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ name = "SMES Access"; req_access = list(11) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "ti" = ( @@ -9816,6 +9499,9 @@ "ts" = ( /turf/simulated/floor/wood/broken, /area/maintenance/station/eng_lower) +"tt" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "tu" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -9919,17 +9605,14 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "tG" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/machinery/camera/network/tether{ dir = 9 }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "tH" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -9950,12 +9633,9 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "tL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/break_room) "tM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/railing{ dir = 8 }, @@ -9965,6 +9645,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "tN" = ( @@ -9999,6 +9682,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; id_tag = "engine_electrical_maintenance"; @@ -10006,7 +9692,6 @@ name = "Electrical Maintenance"; req_access = list(10) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "tR" = ( @@ -10086,15 +9771,8 @@ /turf/simulated/wall, /area/tether/station/stairs_one) "ua" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/prepainted/exploration, +/area/maintenance/substation/exploration) "ub" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -10167,21 +9845,13 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "uk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hallway/station/docks) "ul" = ( @@ -10192,7 +9862,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "um" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/medical, /area/hallway/secondary/escape/medical_escape_pod_hallway) "un" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, @@ -10236,19 +9906,14 @@ /turf/simulated/wall/rshull, /area/shuttle/securiship/general) "ut" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/staircase) "uu" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock20"; - name = "Engineering Washroom Toilet 2" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) +/obj/machinery/light/small, +/turf/simulated/floor, +/area/constructionsite) "uv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10416,7 +10081,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "uO" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/station/abandonedholodeck) "uP" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -10492,7 +10157,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "uT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/exploration, /area/maintenance/substation/exploration) "uU" = ( /obj/structure/table/reinforced, @@ -10654,6 +10319,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"vk" = ( +/turf/simulated/wall/prepainted/command, +/area/maintenance/substation/spacecommand) "vl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10726,7 +10394,7 @@ /turf/simulated/floor/wood, /area/hallway/station/atrium) "vr" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_airlock) "vs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -10739,25 +10407,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "vu" = ( -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ +/obj/machinery/atmospherics/pipe/zpipe/up/supply, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, +/obj/structure/cable/pink{ icon_state = "16-0" }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "vw" = ( @@ -10781,7 +10445,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "vx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engineering_airlock) "vz" = ( /obj/structure/bed/chair/comfy/beige{ @@ -10820,11 +10484,11 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/gravity_lobby) "vE" = ( /obj/structure/sign/department/engine, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "vF" = ( /turf/simulated/floor/tiled/eris/dark/violetcorener, @@ -10855,15 +10519,15 @@ /turf/simulated/floor/tiled, /area/security/customs) "vI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "vJ" = ( @@ -10891,7 +10555,7 @@ /area/storage/emergency_storage/emergency4) "vO" = ( /obj/machinery/status_display, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/break_room) "vP" = ( /obj/structure/toilet{ @@ -10929,7 +10593,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /obj/machinery/light, @@ -10998,13 +10661,11 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "wa" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock21"; - name = "Engineering Washroom Toilet 3" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/constructionsite) "wb" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -11045,8 +10706,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -11058,7 +10718,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -11269,7 +10929,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "wy" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/secondary/hallway) "wz" = ( /obj/structure/window/reinforced, @@ -11282,10 +10942,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -11304,9 +10961,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/hallway/station/docks) "wD" = ( @@ -11338,7 +10993,6 @@ /area/tether/exploration/hallway) "wK" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/eris/techmaint_panels, @@ -11347,10 +11001,8 @@ /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "wM" = ( -/obj/spawner/window/low_wall/reinforced/full, -/obj/machinery/door/firedoor{ - dir = 1 - }, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/shield_gen) "wN" = ( @@ -11360,8 +11012,7 @@ /obj/fiftyspawner/steel, /obj/fiftyspawner/steel, /obj/fiftyspawner/steel, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -11391,10 +11042,10 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "wR" = ( -/obj/structure/cable/green{ +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/cable/pink{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "wS" = ( @@ -11460,25 +11111,18 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "wZ" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/machinery/power/sensor{ name = "Powernet Sensor - Exploration Subgrid"; name_tag = "Exploration Subgrid" @@ -11486,11 +11130,17 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, +/obj/structure/cable/pink, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "xa" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -11502,13 +11152,13 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "xc" = ( @@ -11542,12 +11192,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "xf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 2; @@ -11556,6 +11200,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/general) "xg" = ( @@ -11563,7 +11208,7 @@ /turf/simulated/wall/rshull, /area/shuttle/medivac/engines) "xh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/workshop) "xi" = ( /obj/structure/cable/cyan{ @@ -11671,7 +11316,10 @@ dir = 4 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -11712,9 +11360,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "xy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_eva) "xz" = ( @@ -11796,11 +11443,7 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "xF" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11856,11 +11499,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "xN" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/hallway/secondary/escape/medical_escape_pod_hallway) +/turf/simulated/wall/r_wall/prepainted, +/area/maintenance/station/eng_lower) "xP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; @@ -11885,11 +11525,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) @@ -11934,8 +11570,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12036,7 +11671,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "yg" = ( @@ -12111,7 +11748,7 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) "yn" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/heads/chief) "yo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12199,7 +11836,7 @@ /turf/simulated/floor, /area/constructionsite) "yv" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_eva) "yw" = ( /turf/simulated/floor/tiled, @@ -12217,7 +11854,7 @@ dir = 9 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/hallway) @@ -12245,7 +11882,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eng_starboard_airlock"; name = "interior access button"; @@ -12317,14 +11954,14 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "yF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/engineering{ name = "Exploration Substation"; req_one_access = list(11,24,43) }, /obj/machinery/door/firedoor/glass, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "yG" = ( @@ -12339,7 +11976,7 @@ /area/maintenance/abandonedlibrary) "yH" = ( /obj/machinery/holoposter, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/constructionsite) "yI" = ( /obj/machinery/power/breakerbox/activated{ @@ -12405,7 +12042,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "yO" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_smes) "yP" = ( /obj/structure/cable{ @@ -12461,12 +12098,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "yT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/hallway/secondary/escape/medical_escape_pod_hallway) "yV" = ( @@ -12551,11 +12184,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "zd" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -12584,7 +12213,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "zh" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/abandonedlibraryconference) "zi" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, @@ -12606,9 +12235,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "zl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/workshop) "zm" = ( @@ -12654,8 +12282,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -12681,9 +12308,6 @@ "zs" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/purple/bordercorner, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -12693,6 +12317,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "zt" = ( @@ -12804,7 +12431,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "zF" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -12812,16 +12438,13 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "zG" = ( -/turf/simulated/wall/r_wall, -/area/storage/emergency_storage/emergency4) +/turf/simulated/wall/r_wall/prepainted/security, +/area/vacant/vacant_restaurant_lower) "zH" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -12863,8 +12486,7 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/landmark/spawnpoint/latejoin/station/cyborg, @@ -12893,14 +12515,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "zM" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/eng_lower) "zN" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor, /area/maintenance/substation/engineering) "zO" = ( @@ -12960,20 +12579,12 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "zW" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineEmitterPortWest2"; - layer = 3.3; - name = "Engine Gas Storage" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/atmos/backup) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/constructionsite) "zX" = ( /obj/effect/floor_decal/rust, -/turf/simulated/floor, +/turf/simulated/wall/prepainted, /area/constructionsite) "zY" = ( /obj/structure/cryofeed{ @@ -12989,9 +12600,6 @@ /area/crew_quarters/sleep/cryo) "zZ" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -13002,6 +12610,9 @@ name = "Contraband and Security holdings"; req_one_access = list(44) }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "Aa" = ( @@ -13076,10 +12687,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/air_alarm{ dir = 8; @@ -13183,20 +12791,13 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) "Ar" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -13238,12 +12839,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "Aw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engineering_airlock) "Ax" = ( @@ -13257,9 +12854,7 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) "Az" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/hallway/station/docks) "AA" = ( @@ -13273,10 +12868,7 @@ /area/maintenance/station/spacecommandmaint) "AC" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/vehicle_old/train/trolley, /turf/simulated/floor/tiled/monotile, /area/engineering/hallway) @@ -13291,24 +12883,21 @@ /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) "AE" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 }, -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Atmospherics Hardsuits"; - req_access = list(24) +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "ce_office"; + name = "CE Polarized" }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/atmos, -/turf/simulated/floor/tiled, -/area/engineering/engine_eva) +/obj/effect/paint_stripe/sun, +/turf/simulated/floor, +/area/crew_quarters/heads/chief) "AF" = ( /obj/structure/closet/crate, /obj/random/junk, @@ -13323,15 +12912,14 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "AH" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/aux, /obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light/small{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/shuttle/securiship/general) "AI" = ( @@ -13349,21 +12937,23 @@ /turf/simulated/floor/tiled, /area/engineering/engine_eva) "AJ" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; id_tag = "gravity_outer"; req_access = list(11) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "AL" = ( @@ -13580,11 +13170,8 @@ /turf/simulated/floor, /area/constructionsite) "Bh" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -13622,11 +13209,11 @@ /turf/simulated/floor, /area/engineering/storage) "Bl" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Bm" = ( @@ -13683,7 +13270,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Bs" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/tools) "Bt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13796,6 +13383,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) "BG" = ( @@ -13828,7 +13416,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /obj/machinery/door/airlock/glass/engineering{ name = "Break Room"; req_access = list(10) @@ -13837,11 +13427,7 @@ /area/engineering/break_room) "BL" = ( /obj/structure/bed/chair, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13852,17 +13438,20 @@ /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) "BN" = ( -/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/component/binary/passive_gate/on{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0 }, -/obj/machinery/atmospherics/component/binary/passive_gate/on{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "BO" = ( @@ -13909,6 +13498,9 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "BS" = ( @@ -14020,7 +13612,7 @@ /area/hallway/station/atrium) "BZ" = ( /obj/structure/sign/department/eng, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer) "Ca" = ( /obj/effect/floor_decal/borderfloor{ @@ -14036,7 +13628,7 @@ dir = 8 }, /obj/machinery/airlock_sensor{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 4; id_tag = "gravity_esensor"; master_tag = "gravity_airlock"; @@ -14178,11 +13770,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/staircase) "Cn" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14331,11 +13919,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -14362,41 +13946,39 @@ /turf/simulated/floor/wood, /area/maintenance/abandonedlibrary) "CG" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "CH" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" +/obj/structure/cable/green{ + icon_state = "0-2" }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" }, /turf/simulated/floor/plating, /area/bridge/secondary) @@ -14406,8 +13988,8 @@ /area/maintenance/abandonedlibrary) "CK" = ( /obj/machinery/door/airlock/multi_tile/metal/mait{ - req_one_access = list(5,67); - dir = 4 + dir = 4; + req_one_access = list(5,67) }, /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -14431,14 +14013,10 @@ "CN" = ( /obj/structure/table/rack, /obj/item/stack/material/cardboard, -/obj/structure/cable/green{ +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/pink{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "CO" = ( @@ -14472,7 +14050,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "CT" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/customs) "CU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -14538,16 +14116,15 @@ /area/bridge/secondary) "Dd" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "De" = ( @@ -14562,6 +14139,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) "Df" = ( @@ -14572,15 +14150,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Dh" = ( @@ -14596,7 +14174,6 @@ /obj/landmark/spawnpoint/job/chief_engineer, /obj/machinery/button/windowtint{ id = "ce_office"; - layer = 3.3; pixel_x = 26; pixel_y = 29 }, @@ -14633,7 +14210,7 @@ /area/ai_upload) "Dj" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2a1"; name = "exterior access button"; @@ -14664,7 +14241,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_monitoring) "Do" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -14792,15 +14369,14 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Dz" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "DA" = ( @@ -14814,11 +14390,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "DB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/maintenance/station/eng_lower) "DC" = ( @@ -14856,12 +14428,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "DF" = ( @@ -14874,39 +14446,35 @@ /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/medivac/general) "DG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/meeting_room) "DH" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" + }, /turf/simulated/floor/plating, /area/bridge/secondary) "DI" = ( /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28; req_access = list(); req_one_access = list(11,67) }, @@ -14929,20 +14497,16 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "DK" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; id = "medivac blast"; name = "Shuttle Blast Doors"; opacity = 0 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating, /area/shuttle/medivac/cockpit) "DM" = ( /obj/machinery/door/window/brigdoor/eastleft{ @@ -15003,11 +14567,7 @@ /turf/simulated/floor/wood/broken, /area/maintenance/abandonedlibraryconference) "DR" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15144,6 +14704,10 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/pink{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "Ed" = ( @@ -15192,7 +14756,7 @@ /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "Eg" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/exploration, /area/tether/exploration/hallway) "Eh" = ( /obj/structure/bed/chair/comfy/brown{ @@ -15211,12 +14775,8 @@ /turf/simulated/floor/wood, /area/tether/exploration/crew) "Ek" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/engineering/engine_eva) "El" = ( /obj/machinery/computer/aiupload, /obj/structure/window/reinforced{ @@ -15308,7 +14868,7 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "Eu" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_server_room) "Ev" = ( /obj/structure/cable{ @@ -15407,7 +14967,7 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "EF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/vacant/vacant_restaurant_lower) "EG" = ( /obj/effect/floor_decal/borderfloor{ @@ -15480,12 +15040,11 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "EK" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "EL" = ( @@ -15498,7 +15057,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "EM" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/abandonedlibrary) "EN" = ( /mob/living/simple_mob/animal/passive/bird/parrot/polly, @@ -15511,9 +15070,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/machinery/holoposter{ dir = 8; pixel_x = 30 @@ -15533,12 +15090,6 @@ /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "ER" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -15547,6 +15098,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/securiship/cockpit) "ES" = ( @@ -15584,11 +15136,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -15614,15 +15162,18 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/east_mount, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/pink{ icon_state = "0-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/structure/table/rack/shelf, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Fa" = ( @@ -15717,17 +15268,20 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/constructionsite) "Fn" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance_hatch{ name = "SMES Access"; req_access = list(11) }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "Fo" = ( @@ -15793,9 +15347,8 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "Fv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/foyer) "Fw" = ( @@ -16260,9 +15813,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "Gm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/break_room) "Gn" = ( @@ -16270,18 +15822,10 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "Go" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/crew_quarters/toilet) "Gp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer) "Gq" = ( /obj/machinery/light, @@ -16291,7 +15835,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "Gr" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/abandonedlibraryconference) "Gs" = ( /obj/structure/cable/green{ @@ -16403,10 +15947,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 10 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/customs) @@ -16442,7 +15983,7 @@ /area/tether/exploration/equipment) "GH" = ( /obj/structure/sign/department/eng, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/hallway/station/atrium) "GI" = ( /obj/effect/floor_decal/borderfloor{ @@ -16568,21 +16109,13 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "GW" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /turf/simulated/floor/plating, /area/hallway/station/docks) "GX" = ( @@ -16600,6 +16133,9 @@ dir = 8 }, /obj/structure/bed/chair/office/light, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "GZ" = ( @@ -16648,14 +16184,12 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "Hd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) "He" = ( @@ -16714,11 +16248,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/north_mount{ alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; req_access = list(); req_one_access = list(11,67) }, @@ -16750,11 +16281,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "Hl" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -16825,9 +16352,6 @@ /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Ht" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -16836,14 +16360,12 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/engineering/foyer) "Hu" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/polarized/full{ - id = "library_study" - }, +/obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "Hv" = ( @@ -16911,16 +16433,15 @@ /area/crew_quarters/sleep/engi_wash) "HE" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "HF" = ( @@ -16949,7 +16470,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "HI" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central1, @@ -17032,8 +16553,11 @@ /obj/machinery/light/flamp/noshade, /turf/simulated/floor/grass, /area/hallway/station/atrium) +"HS" = ( +/turf/simulated/open, +/area/tether/elevator/two) "HV" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/hallway) "HW" = ( /obj/structure/cable{ @@ -17147,16 +16671,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "Ij" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/tether/station/stairs_one) "Ik" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 5 @@ -17209,11 +16725,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -17303,6 +16815,9 @@ }, /turf/simulated/floor/tiled, /area/bridge/secondary) +"Iy" = ( +/turf/simulated/wall/prepainted/engineering, +/area/engineering/engine_smes) "Iz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/holopad, @@ -17416,14 +16931,10 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "IH" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/secondary/teleporter) "II" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood/broken, /area/maintenance/abandonedlibraryconference) "IJ" = ( @@ -17445,14 +16956,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "IL" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -17462,6 +16965,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "IM" = ( @@ -17520,15 +17037,15 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "IQ" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "IR" = ( @@ -17580,14 +17097,8 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) -"IU" = ( -/obj/effect/debris/cleanable/blood/oil/streak{ - amount = 0 - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/workshop) "IW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/civilian) "IX" = ( /obj/structure/cable/green{ @@ -17605,12 +17116,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "IY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/hallway) "IZ" = ( @@ -17655,14 +17162,13 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) "Jg" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "Jh" = ( @@ -17697,10 +17203,7 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "Jk" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -17924,15 +17427,15 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "JH" = ( @@ -17992,9 +17495,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "JN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/hallway/station/atrium) "JO" = ( @@ -18052,11 +17553,7 @@ /turf/simulated/floor/tiled, /area/security/customs) "JR" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -18088,7 +17585,7 @@ /area/crew_quarters/heads/chief) "JV" = ( /obj/structure/sign/warning/secure_area, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/security/customs) "JW" = ( /obj/structure/cable/green{ @@ -18156,29 +17653,15 @@ /turf/simulated/floor, /area/engineering/storage) "Kc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/staircase) "Kd" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted, +/area/vacant/vacant_restaurant_lower) "Ke" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -18200,9 +17683,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Kf" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/air_alarm{ dir = 1; pixel_y = -22 @@ -18210,6 +17690,9 @@ /obj/machinery/camera/network/tether{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Kg" = ( @@ -18249,12 +17732,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "Ki" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hallway/station/docks) "Kj" = ( @@ -18275,11 +17753,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "Km" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/random/cutout, -/turf/simulated/floor, -/area/constructionsite) +/turf/simulated/wall/r_wall/prepainted/exploration, +/area/tether/exploration/showers) "Kn" = ( /obj/structure/window/reinforced{ dir = 4 @@ -18321,6 +17796,9 @@ "Kr" = ( /turf/simulated/floor/tiled, /area/tether/station/stairs_one) +"Ks" = ( +/turf/simulated/wall/r_wall/prepainted/medical, +/area/crew_quarters/sleep/cryo) "Kt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18635,12 +18113,10 @@ /area/maintenance/substation/civilian) "KT" = ( /obj/structure/table/reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/random/tech_supply, @@ -18690,21 +18166,6 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"KZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/hallway) "La" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -18716,11 +18177,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "Lc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -18739,13 +18196,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/table/rack/shelf, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, -/obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Lg" = ( @@ -18846,9 +18297,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Lq" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/full/firelocks, /turf/simulated/floor/plating, /area/security/checkpoint/science) "Lr" = ( @@ -18874,7 +18324,7 @@ /turf/simulated/floor, /area/engineering/storage) "Lt" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/sleep/cryo) "Lu" = ( /obj/effect/floor_decal/techfloor/orange{ @@ -18946,7 +18396,7 @@ /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) "LC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/constructionsite) "LD" = ( /obj/machinery/light{ @@ -18966,7 +18416,6 @@ /area/engineering/hallway) "LG" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, @@ -18977,7 +18426,7 @@ icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/engine_monitoring) "LJ" = ( /obj/effect/floor_decal/borderfloor/corner, @@ -19066,16 +18515,9 @@ /obj/random/cutout, /turf/simulated/floor, /area/constructionsite) -"LS" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) +"LU" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "LV" = ( /obj/machinery/sleeper{ dir = 4 @@ -19174,11 +18616,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/carpet, /area/engineering/foyer) "Mf" = ( @@ -19236,7 +18674,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/turf/simulated/floor, +/turf/simulated/wall/prepainted, /area/constructionsite) "Mn" = ( /obj/structure/bed/chair/office/dark, @@ -19283,21 +18721,12 @@ /turf/simulated/floor/tiled, /area/security/customs) "Mr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -19305,6 +18734,8 @@ name = "Engine Monitoring Room Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/engineering/engine_monitoring) "Ms" = ( @@ -19340,9 +18771,6 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "Mv" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/effect/floor_decal/rust, /obj/random/junk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19351,6 +18779,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/cable/pink{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Mw" = ( @@ -19370,20 +18801,17 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) "My" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge/secondary) "Mz" = ( -/obj/structure/grille, /obj/structure/cable/green, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "ce_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "ce_office"; + name = "CE Polarized" }, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/crew_quarters/heads/chief) "MA" = ( @@ -19445,16 +18873,10 @@ /turf/simulated/floor/tiled, /area/engineering/foyer) "MF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/vacant/vacant_restaurant_lower) "MG" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) @@ -19469,8 +18891,7 @@ /turf/simulated/floor/tiled, /area/security/checkpoint/science) "MJ" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor, @@ -19555,20 +18976,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/ai_upload_foyer) "MT" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) "MV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/effect/paint_stripe/violet, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/turf/simulated/floor/plating, /area/tether/exploration/hallway) "MW" = ( /obj/structure/table/reinforced, @@ -19582,18 +19001,12 @@ /obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "MY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/exploration/hallway) +/turf/simulated/wall/prepainted/engineering, +/area/maintenance/station/eng_lower) "MZ" = ( /obj/random/junk, /obj/effect/debris/cleanable/cobweb, @@ -19664,11 +19077,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor, /area/maintenance/substation/civilian) @@ -19718,11 +19127,22 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/debris/cleanable/blood/oil/streak{ - amount = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/engineering/workshop) +/area/engineering/hallway) "No" = ( /obj/machinery/vending/coffee{ dir = 8 @@ -19969,11 +19389,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -20053,12 +19469,12 @@ "NZ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/holoposter{ pixel_y = -30 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Oa" = ( @@ -20095,10 +19511,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "Of" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/constructionsite) "Og" = ( @@ -20121,19 +19534,11 @@ "Oi" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, /obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "Oj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) "Ok" = ( @@ -20160,7 +19565,6 @@ }, /obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, -/obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical/emt, /obj/item/clothing/head/helmet/space/void/medical/emt, @@ -20170,9 +19574,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/station/docks) "Oo" = ( @@ -20225,7 +19627,7 @@ dir = 4; pixel_y = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/stairs_one) "Ov" = ( /obj/machinery/sleep_console{ @@ -20240,11 +19642,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/medivac/general) "Ow" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -20264,11 +19662,7 @@ /obj/machinery/atmospherics/component/binary/pump{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "OA" = ( @@ -20284,9 +19678,7 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "OD" = ( @@ -20309,10 +19701,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -20536,9 +19925,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, @@ -20577,10 +19964,7 @@ /obj/structure/cable/cyan{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -20632,11 +20016,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20766,21 +20146,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"Pt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/hallway) "Pu" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20954,7 +20319,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "PI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/shaft) "PJ" = ( /obj/structure/cable/green{ @@ -21052,29 +20417,26 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "PU" = ( -/turf/simulated/wall, -/area/engineering/break_room) +/turf/simulated/wall/prepainted, +/area/hallway/station/docks) "PV" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/security/customs) "PW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/secondary) "PX" = ( /obj/landmark/spawnpoint/job/assistant, @@ -21152,11 +20514,8 @@ /area/bridge/secondary/hallway) "Qj" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -21165,8 +20524,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "Qk" = ( -/turf/simulated/wall/r_wall, -/area/hallway/station/atrium) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/maintenance/station/eng_lower) "Ql" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -21180,10 +20539,7 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/camera/network/tether{ dir = 8 @@ -21351,7 +20707,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "Qy" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/storage) "Qz" = ( /obj/structure/table/woodentable, @@ -21432,7 +20788,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "QI" = ( @@ -21479,7 +20837,6 @@ }, /obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, -/obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical/emt, /obj/item/clothing/head/helmet/space/void/medical/emt, @@ -21499,12 +20856,11 @@ /area/ai_upload) "QR" = ( /obj/machinery/door/airlock/glass_external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/map_helper/airlock/door/int_door, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/general) "QS" = ( @@ -21637,14 +20993,8 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/staircase) "Rh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/foyer) "Ri" = ( /obj/structure/table/glass, /obj/random/medical, @@ -21672,8 +21022,8 @@ /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) "Rm" = ( -/turf/simulated/wall, -/area/crew_quarters/sleep/engi_wash) +/turf/simulated/wall/r_wall/prepainted, +/area/constructionsite) "Rn" = ( /obj/machinery/door/window/westleft{ dir = 4; @@ -21718,7 +21068,7 @@ /area/engineering/hallway) "Rr" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eng_starboard_airlock"; name = "exterior access button"; @@ -21729,15 +21079,8 @@ /turf/simulated/floor/airless, /area/space) "Rs" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/backup) -"Rt" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/hallway/station/atrium) "Ru" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -21806,11 +21149,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/reagent_dispensers/water_cooler/full{ dir = 8 }, @@ -21918,11 +21257,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/random/tech_supply, /obj/random/tech_supply, /obj/structure/cable/green{ @@ -22080,28 +21415,18 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "Sg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/crew_quarters/sleep/engi_wash) "Sh" = ( /obj/effect/floor_decal/techfloor, /obj/structure/window/reinforced{ @@ -22267,15 +21592,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/carpet, /area/engineering/foyer) "Sy" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2a1"; name = "interior access button"; @@ -22487,8 +21809,7 @@ /turf/space, /area/space) "SU" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -22703,7 +22024,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -22736,15 +22057,15 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) "Tp" = ( @@ -22884,6 +22205,12 @@ /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +"Tz" = ( +/obj/effect/paint_stripe/darkred, +/obj/spawner/window/low_wall/full/firelocks, +/obj/machinery/suit_storage_unit/medic, +/turf/simulated/floor/plating, +/area/security/checkpoint/science) "TA" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -22926,11 +22253,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/engineering/hallway) "TD" = ( @@ -23034,9 +22357,7 @@ /area/hallway/station/docks) "TO" = ( /obj/structure/sign/deck1, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "TP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23080,6 +22401,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled, /area/engineering/hallway) "TS" = ( @@ -23117,11 +22439,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -23134,19 +22452,15 @@ /turf/simulated/floor/tiled, /area/security/customs) "TY" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; - dir = 4; icon_state = "pdoor0"; id = "medivac blast"; name = "Shuttle Blast Doors"; opacity = 0 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating, /area/shuttle/medivac/general) "TZ" = ( /obj/machinery/tele_projector, @@ -23261,10 +22575,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) "Ul" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/reinforced, /obj/machinery/microwave, @@ -23296,10 +22607,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -23334,11 +22642,13 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "Uu" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ - id_tag = "bathroomlock7"; - name = "Restroom" + id_tag = "bathroomlock19"; + name = "Engineering Washroom Toilet 1" }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "Uv" = ( @@ -23532,11 +22842,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/photocopier/faxmachine{ department = "Chief Engineer's Office" }, @@ -23624,7 +22930,7 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/hallway) "UT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload) "UU" = ( /obj/effect/floor_decal/industrial/warning{ @@ -23661,20 +22967,19 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "UX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/emergency_storage/emergency4) "UY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23894,14 +23199,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) "Vw" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/structure/cable, /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Exploration"; output_attempt = 0 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Vx" = ( @@ -23929,17 +23234,14 @@ /obj/item/pen{ pixel_y = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "VB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/hallway/station/docks) +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/engineering/engine_gas) "VD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -23999,15 +23301,37 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "VK" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineVent"; - name = "Reactor Vent" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/engineering/engine_room) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/hallway) "VL" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, @@ -24049,7 +23373,7 @@ /area/crew_quarters/sleep/engi_wash) "VR" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d1a2"; name = "interior access button"; @@ -24060,9 +23384,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "VS" = ( @@ -24087,9 +23408,6 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "VW" = ( -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -24098,14 +23416,15 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor/plating, /area/engineering/foyer) "VX" = ( /turf/simulated/floor, /area/engineering/engine_gas) "VY" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -24141,7 +23460,7 @@ /area/hallway/station/atrium) "Wa" = ( /obj/structure/sign/deck1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/stairs_one) "Wb" = ( /obj/effect/floor_decal/borderfloor{ @@ -24215,7 +23534,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/maintenance/substation/exploration) "Wj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -24230,16 +23549,15 @@ req_one_access = list(19,43,67) }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "Wl" = ( @@ -24289,15 +23607,9 @@ /turf/simulated/floor, /area/constructionsite) "Wq" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1379; - id_tag = "gravity_inner"; - req_access = list(11) - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -24307,6 +23619,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_inner"; + req_access = list(11) + }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "Wr" = ( @@ -24331,7 +23651,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 8 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/tiled, @@ -24525,10 +23845,7 @@ /area/bridge/secondary) "WO" = ( /obj/structure/flora/pottedplant, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/station/docks) "WP" = ( @@ -24581,6 +23898,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "WW" = ( @@ -24756,7 +24074,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "Xp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/crew_quarters/sleep/engi_wash) "Xr" = ( /obj/effect/floor_decal/borderfloor{ @@ -24969,11 +24287,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25019,7 +24333,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -25027,13 +24340,16 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/engineering{ name = "Gravity Generator"; req_access = list(11) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "XO" = ( @@ -25225,8 +24541,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -25234,7 +24549,6 @@ "Yk" = ( /obj/machinery/airlock_sensor/airlock_exterior{ id_tag = "eng_al_ext_snsr"; - layer = 3.3; master_tag = "engine_room_airlock"; pixel_x = -22; req_access = list(10) @@ -25325,13 +24639,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) "Yv" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ +/obj/structure/flora/pottedplant/dead, +/obj/structure/cable/pink{ icon_state = "1-8" }, -/obj/structure/flora/pottedplant/dead, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "Yw" = ( @@ -25454,25 +24768,20 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "YK" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/exploration/staircase) "YL" = ( @@ -25549,23 +24858,22 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "YV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -25645,7 +24953,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock/glass/engineering{ name = "Engine Monitoring Room"; req_access = list(11) @@ -25828,6 +25138,9 @@ }, /turf/simulated/floor, /area/constructionsite) +"Zv" = ( +/turf/simulated/open, +/area/tether/elevator) "Zw" = ( /turf/simulated/mineral/vacuum, /area/mine/explored/upper_level) @@ -25854,11 +25167,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ +/obj/machinery/power/apc/west_mount{ cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30; req_access = list(); req_one_access = list(11,67) }, @@ -25947,32 +25257,26 @@ /turf/simulated/floor/wood, /area/tether/exploration/crew) "ZI" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secondary_bridge" - }, /obj/machinery/door/blast/regular{ density = 0; - dir = 8; icon_state = "pdoor0"; id = "secondary_bridge_blast"; name = "Secondary Command Office Blast Doors"; opacity = 0 }, +/obj/effect/paint_stripe/commandblue, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "secondary_bridge"; + name = "Secondary Bridge" + }, /turf/simulated/floor/plating, /area/bridge/secondary) "ZK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/prepainted, +/area/maintenance/abandonedlibrary) "ZL" = ( /obj/structure/table/rack{ dir = 8; @@ -25996,10 +25300,8 @@ /turf/simulated/floor, /area/hallway/station/docks) "ZN" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ alarms_hidden = 1; - name = "south bump"; - pixel_y = -28; req_access = list(); req_one_access = list(11,67) }, @@ -26030,15 +25332,14 @@ /area/storage/tools) "ZP" = ( /obj/structure/sign/department/ai, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_upload_foyer) "ZQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor, /area/engineering/atmos/backup) "ZR" = ( @@ -26115,10094 +25416,17272 @@ /area/space) (1,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (2,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (3,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (4,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (5,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (6,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (7,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (8,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (9,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (10,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (11,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (12,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (13,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (14,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (15,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (16,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (17,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (18,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (19,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (20,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (21,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (22,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (23,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (24,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (25,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (26,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (27,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (28,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (29,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (30,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (31,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (32,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (33,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (34,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (35,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (36,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (37,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (38,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (39,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (40,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (41,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (42,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ Ey "} (43,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(44,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(44,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (45,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (46,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (47,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(48,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(48,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (49,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (50,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} (51,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(52,1,1) = {" -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(52,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(53,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(54,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(55,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(56,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(57,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(58,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(59,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(60,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(61,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(62,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(63,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(64,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(65,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(66,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(67,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(68,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(69,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(70,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +cR +kD +kD +kD +Mb +te +te +Mb +Mb +xo +xo +xo +xo +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(71,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +MB +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +kD +kD +dx +DI +lo +YY +ZR +vF +zy +xo +Tj +xc +Ct +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(72,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +CV +CV +CV +fP +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ER +bO +Du +xi +bG +bG +qD +YQ +vA +xo +gC +It +IC +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(73,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ER +Eq +Bb +MQ +Il +Iv +NT +Il +Il +ji +Tu +rv +eM +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(74,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Mb +Sn +Qs +OE +hK +do +bG +rS +LG +wK +MT +bM +Wu +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(75,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Mb +Mb +Mb +Mb +Mb +Rz +bG +ux +SV +xo +Jf +jm +IC +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(76,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +UK +us +yZ +AH +QR +lE +LG +TM +OW +xo +vB +vB +Is +Vq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(77,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Mh +Mb +cX +NE +Mb +xf +xf +Mb +xf +xo +xo +xo +xo +xo +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(78,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +mY +mY +nH +HO +mY +pj +pj +mY +pj +pj +JV +mY +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(79,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZV +ZV +CV +ZV +ZV +ZV +ZV +ZV +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +mY +Na +kc +yK +CT +CS +dY +CT +dU +Zq +Mq +lZ +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(80,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +CV +ZZ +ZZ +ZZ +ZZ +CV +CV +CV +CV +CV +CV +CV +CV +CV +CV +CV +ZV +ZV +ZV +CV +ZZ +ZZ +mY +uL +VN +Ui +CT +ac +NY +CT +aW +RR +Mn +lg +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(81,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +aq +aq +aq +aq +aq +gu +gu +gu +gu +gu +gu +gu +ZZ +ZZ +ZZ +ZZ +CV +ZZ +ZZ +ZZ +ZZ +CV +Rr +vx +vx +vx +vx +Aw +Aw +vx +vx +CV +ZZ +ZZ +ZZ +CV +ZZ +ZZ +mY +mY +sb +aH +CT +DM +kQ +CT +cc +Zc +Kn +bF +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(82,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +aq +aq +aq +aq +Sb +Sb +Sb +Sb +Sb +VX +gu +VX +VX +VX +VX +gu +CV +CV +CV +kR +CV +CV +CV +CV +CV +CV +PO +KN +rG +CU +FO +DV +Rp +aJ +vx +CV +ZZ +ZZ +ZZ +CV +ZZ +ZZ +ZZ +mY +Jd +lF +kE +PV +Dz +nQ +iy +Jg +uV +Og +mY +Lh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(83,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +sQ +sQ +sQ +Sb +Sb +Sb +Sb +Sb +Sb +VX +gu +VX +VX +VX +VX +VB +sg +zF +zF +dr +sg +zF +zF +zF +sg +CV +PO +KN +Uv +xP +es +yA +dh +Af +vx +CV +ZZ +ZZ +ZZ +CV +zu +ZZ +ZZ +mY +gY +oO +eX +TX +ii +CT +Ql +eo +JQ +Zt +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(84,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +GA +GA +sQ +FJ +Sb +Sb +Sb +Sb +Sb +VX +VX +VX +VX +VX +VX +nS +Qn +kU +vo +FU +zB +Bc +Bc +FH +sg +sg +Ek +yv +yv +yv +yv +BN +IL +yn +yn +AE +AE +AE +yn +yn +yn +yn +yn +zG +EF +EF +EF +EF +CT +CT +CT +CT +Hx +CT +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(85,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +sQ +sQ +sQ +Sb +Sb +Sb +Sb +Sb +Sb +VX +VX +VX +VX +VX +VX +rI +yS +LN +na +qb +KV +Cy +Ww +Av +pw +Rs +cn +lz +Xt +bW +yv +Kx +Tq +yn +OX +wX +JT +rT +ZX +yn +jh +kg +yn +ZY +ZY +ZY +ZY +MF +Zw +Zw +CT +GC +DA +Tn +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(86,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +aq +aq +Sb +Sb +Sb +aq +Sb +Sb +Sb +Sb +Sb +VX +gu +VX +VX +VX +VX +rI +bx +mm +aa +et +Qu +Av +QM +Ik +Hh +Rs +cn +mN +mN +bW +xy +Cs +en +Mz +IA +yw +VD +ES +Pz +zD +QW +cd +yn +ZY +ZY +ZY +ZY +MF +Zw +Zw +CT +Ea +de +gy +mY +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(87,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +VX +gu +gu +gu +gu +gu +sg +Rs +cV +gv +gx +zi +RN +Ml +un +xx +Rs +cn +mN +mN +bW +xy +jb +Kh +Mz +Lj +JM +Dh +JM +NC +yn +Sc +Pr +yn +ZY +ZY +RC +ZY +MF +Zw +Zw +CT +Ly +Jw +mO +mY +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +uk +qa +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(88,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +Zw +Zw +Rs +Kg +YZ +YW +FT +wQ +lA +vC +eW +Rs +iX +VT +Wj +bW +xy +SC +gr +Mz +kz +HJ +Ko +Qv +PD +yn +yn +yn +yn +ZY +ZY +tw +RC +MF +Kd +Kd +CT +vH +RS +CT +mY +Zw +ZZ +ZZ +ZZ +zu +ZZ +ZZ +ZZ +ZZ +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +Ki +SJ +Ki +zu +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(89,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +Zw +Zw +Rs +CC +Ud +Cu +sI +Oz +pr +Im +or +Rs +OM +gj +mE +ug +xy +RU +Xl +Mz +ow +rC +gW +JM +FP +zQ +yn +Nx +MF +ZY +ZY +ZY +RC +MF +iv +iv +PU +ne +Xw +Ii +fU +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +fU +Ki +Ki +jQ +Ki +jo +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} -(53,1,1) = {" +(90,1,1) = {" ZZ ZZ ZZ @@ -36231,6 +42710,84 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +Zw +Zw +Rs +fd +Zh +wA +cx +cx +cx +cx +cx +cx +DR +JA +Hr +AI +DS +XH +Gs +ex +di +uS +AZ +aV +rf +yn +yn +MF +MF +MF +ng +FM +MF +MF +ng +ng +PU +YT +HX +EL +mo +HP +ve +ve +ve +ri +WZ +VR +xn +uZ +ve +ve +pd +Bi +ef +ve +WZ +oc +Ak +ml +Ki ZZ ZZ ZZ @@ -36317,6 +42874,174 @@ ZZ ZZ ZZ ZZ +"} +(91,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +mr +Zw +PI +PI +Rs +Rs +bX +ZQ +cx +lN +xF +sW +dK +xh +MW +mN +mN +Yc +xy +Gu +xA +Mz +yw +lt +yw +TT +GK +yn +WB +ng +ng +ng +ng +ng +Xn +eF +ng +ng +PU +ia +WC +Bj +nO +gc +FC +FC +Fr +cT +Fr +wC +FC +FC +FC +FC +Re +WY +xU +MO +MO +iQ +ve +ve +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -36343,60 +43068,115 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(54,1,1) = {" +(92,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +Au +IZ +HV +UE +Ve +xh +Vs +co +Dr +wN +xh +ci +mN +mN +VL +xy +jb +wg +yn +dE +mQ +UM +hs +EN +yn +ng +ng +ng +ng +jN +rh +Os +ng +ng +ng +Az +TE +Da +Yd +mo +Cn +ve +ve +ve +HY +ve +ve +ve +QE +ve +ve +tA +ve +On +ve +ve +ve +ve +gL +Ki +ZZ ZZ ZZ ZZ @@ -36482,6 +43262,8 @@ ZZ ZZ ZZ ZZ +"} +(93,1,1) = {" ZZ ZZ ZZ @@ -36510,6 +43292,84 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +mw +km +HV +UC +vw +xh +iF +co +Dr +bw +xh +eh +hR +hR +WI +xy +jb +zq +yn +yn +yn +yn +yn +yn +yn +ng +ng +ng +ng +rh +rh +ng +yk +rh +rh +Az +Ot +Bn +cb +fU +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +fU +Ki +Ki +Ki +Ki +jo +Ki ZZ ZZ ZZ @@ -36537,60 +43397,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(55,1,1) = {" ZZ ZZ ZZ @@ -36650,6 +43456,8 @@ ZZ ZZ ZZ ZZ +"} +(94,1,1) = {" ZZ ZZ ZZ @@ -36678,10 +43486,69 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +wV +Ax +nK +ds +oP +xh +QL +co +Dr +pt +xh +zl +Hv +Hv +zl +xh +bH +Nn +hj +NR +if +WQ +FD +KT +kL +XO +ng +ng +ng +rh +rh +Aj +ng +rh +ng +Az +Ot +Bn +Nw +fU ZZ ZZ ZZ ZZ +KD ZZ ZZ ZZ @@ -36695,6 +43562,7 @@ ZZ ZZ ZZ ZZ +KD ZZ ZZ ZZ @@ -36731,60 +43599,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(56,1,1) = {" ZZ ZZ ZZ @@ -36836,6 +43650,8 @@ ZZ ZZ ZZ ZZ +"} +(95,1,1) = {" ZZ ZZ ZZ @@ -36864,6 +43680,64 @@ ZZ ZZ ZZ ZZ +aq +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +Sb +aq +Zw +PI +IZ +Cx +HV +rO +pL +zl +gI +co +Dr +Se +zR +lT +rc +rc +lj +zl +jb +VK +hj +gh +dW +oy +gk +Tc +kL +zf +wk +ng +ng +ng +ng +ng +ng +ng +ng +PU +YR +Bn +Ry +Ki ZZ ZZ ZZ @@ -36925,60 +43799,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(57,1,1) = {" ZZ ZZ ZZ @@ -37024,6 +43844,8 @@ ZZ ZZ ZZ ZZ +"} +(96,1,1) = {" ZZ ZZ ZZ @@ -37052,6 +43874,64 @@ ZZ ZZ ZZ ZZ +yO +yO +yO +tQ +aK +Dn +jr +jr +Mr +jr +jr +gp +vr +cP +vr +vr +Zw +HV +HV +HV +HH +yf +yx +zl +RG +Hg +Dr +XU +Dr +pk +Dr +CP +lj +zl +kt +si +OY +PJ +Al +QI +gk +xK +kL +GQ +tr +ng +Aj +ng +li +ng +ng +ng +GS +ud +ve +Bn +Ry +Ki ZZ ZZ ZZ @@ -37119,60 +43999,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(58,1,1) = {" ZZ ZZ ZZ @@ -37212,6 +44038,8 @@ ZZ ZZ ZZ ZZ +"} +(97,1,1) = {" ZZ ZZ ZZ @@ -37240,6 +44068,64 @@ ZZ ZZ ZZ ZZ +yO +od +re +Vf +Pi +pF +pH +qY +jU +uI +je +gp +uF +PR +KO +vr +Zw +HV +Pg +eK +Wn +fb +rX +bd +Wr +EE +Wt +Wt +gs +Wt +Wt +xR +aP +fO +IM +uR +hj +Gn +iV +Fe +Tl +hP +kL +ng +vU +GS +ng +ng +ng +gP +xJ +ng +ng +YX +ve +Bn +Ry +Ki ZZ ZZ ZZ @@ -37313,60 +44199,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(59,1,1) = {" ZZ ZZ ZZ @@ -37400,6 +44232,8 @@ ZZ ZZ ZZ ZZ +"} +(98,1,1) = {" ZZ ZZ ZZ @@ -37428,6 +44262,78 @@ ZZ ZZ ZZ ZZ +yO +AW +jV +lG +OI +pF +pE +fk +dg +fk +is +gp +UU +rp +cg +vr +Zw +HV +HI +gd +mt +Yh +MA +Bw +kH +yB +Wt +nI +tK +Wt +Wt +nb +nj +Qd +Ce +dq +hj +PG +iu +FQ +zP +tg +kL +ng +iU +rh +QT +ng +ng +ng +ng +ng +ng +PU +WO +Bn +ic +fU +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -37507,60 +44413,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(60,1,1) = {" ZZ ZZ ZZ @@ -37574,6 +44426,8 @@ ZZ ZZ ZZ ZZ +"} +(99,1,1) = {" ZZ ZZ ZZ @@ -37602,6 +44456,65 @@ ZZ ZZ ZZ ZZ +yO +eE +jV +UB +kv +wO +Dk +Eb +DU +Eb +jy +gp +st +fi +st +vr +Zw +HV +Kq +ML +fe +Eo +DY +zl +Qw +uc +Qw +xz +Dr +Dr +GV +Fb +BC +zl +UO +FY +kL +hj +hj +kO +hj +hj +kL +JN +WK +JN +Ij +Ij +Ij +Ij +Ij +Ij +Ij +Ij +IN +Da +LL +fU +Lh ZZ ZZ ZZ @@ -37701,66 +44614,14 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(61,1,1) = {" ZZ ZZ ZZ ZZ ZZ ZZ +"} +(100,1,1) = {" ZZ ZZ ZZ @@ -37789,6 +44650,64 @@ ZZ ZZ ZZ ZZ +yO +lL +DJ +Fc +Gl +pF +fK +qy +uJ +Qf +jg +pF +gR +rV +Yk +ox +Zw +HV +to +ML +fe +mZ +Cj +zl +nr +mn +sl +rE +WJ +Uf +vX +Dr +BC +zl +SC +Iw +Fv +sB +ij +cr +nP +Ga +Gp +Bp +PH +TD +qA +nm +Ck +dj +nh +Qa +RP +Ij +aT +Bn +Ry +Ki ZZ ZZ ZZ @@ -37895,60 +44814,19 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(62,1,1) = {" +(101,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -37966,11 +44844,78 @@ ZZ ZZ ZZ ZZ +yO +xl +ET +fx +oK +pF +bY +Eb +ss +UY +Ua +uh +TL +sN +hH +ox +Zw +HV +AC +ML +fe +Eo +rP +xh +zl +zl +xh +ky +zl +fO +xh +zl +zl +xh +fu +xs +Fv +bs +DZ +uU +Rn +wU +BZ +Br +TQ +Kw +VM +Wd +Kr +Ij +RQ +ev +EX +Ij +Nc +LQ +hX +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ +Nh ZZ ZZ ZZ @@ -38063,6 +45008,8 @@ ZZ ZZ ZZ ZZ +"} +(102,1,1) = {" ZZ ZZ ZZ @@ -38085,64 +45032,70 @@ ZZ ZZ ZZ ZZ +fP ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(63,1,1) = {" +Zw +yO +oC +ag +hV +vt +pF +Qm +cS +pu +ib +Ul +pF +ZS +Cv +fJ +ox +Zw +HV +oW +ML +fe +Eo +jY +Yt +Yt +Yt +nN +sY +jM +sY +WP +EB +EB +EB +kt +eT +Fv +Dp +wf +Xg +Qh +Tf +VW +EG +TQ +Ah +Ou +yD +aw +Wa +Ij +Ij +Ij +Ij +TJ +Bn +XM +Ki ZZ ZZ ZZ @@ -38249,6 +45202,8 @@ ZZ ZZ ZZ ZZ +"} +(103,1,1) = {" ZZ ZZ ZZ @@ -38271,10 +45226,70 @@ ZZ ZZ ZZ ZZ +CV ZZ ZZ ZZ ZZ +Zw +yO +Iy +nT +Fn +th +LH +hr +hr +Ze +hr +hr +LH +ox +cs +ox +ox +HV +vE +Pu +Tw +fe +Eo +ph +iC +iC +oT +BQ +fe +tS +YL +fB +ct +fB +rD +bL +qw +kB +lw +KP +xw +lW +Mp +YG +GL +HB +IO +Ij +CD +Zn +Kr +qq +bu +FV +Ij +JS +Bn +hd +fU ZZ ZZ ZZ @@ -38283,60 +45298,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(64,1,1) = {" ZZ ZZ ZZ @@ -38435,6 +45396,8 @@ ZZ ZZ ZZ ZZ +"} +(104,1,1) = {" ZZ ZZ ZZ @@ -38457,10 +45420,70 @@ ZZ ZZ ZZ ZZ +CV ZZ ZZ ZZ ZZ +Zw +pM +jB +Gg +TK +wt +rJ +rJ +rJ +BT +rJ +rJ +XA +rJ +uP +rJ +Zj +rJ +TR +bn +WA +LF +yr +eq +nD +XX +Tp +XX +XX +jK +sr +rB +rB +rB +rB +rB +sw +oD +Zm +Vi +PE +ME +oH +Ib +Lp +gn +VZ +Ij +eO +Ow +Kr +qq +bu +FV +Ij +Ot +Bn +ic +fU ZZ ZZ ZZ @@ -38477,60 +45500,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(65,1,1) = {" ZZ ZZ ZZ @@ -38621,6 +45590,8 @@ ZZ ZZ ZZ ZZ +"} +(105,1,1) = {" ZZ ZZ ZZ @@ -38643,9 +45614,71 @@ ZZ ZZ ZZ ZZ +CV ZZ ZZ ZZ +Zw +Zw +pM +Pm +Fk +Tr +ub +np +KJ +np +JY +TW +lO +jL +TW +SW +AO +TW +TW +kd +EC +MP +nR +SH +mu +rq +ln +jS +Qr +Rq +YI +dL +bk +Pn +TC +io +ra +mP +Fv +XR +zH +oQ +gQ +sa +VW +Xx +cf +yP +Ij +Ij +Ij +Ij +tZ +Ij +Ij +Ij +DT +Bn +Ry +Ki +ZZ ZZ ZZ ZZ @@ -38671,61 +45704,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(66,1,1) = {" ZZ +Nh ZZ ZZ ZZ @@ -38756,7 +45736,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -38805,6 +45784,11 @@ ZZ ZZ ZZ ZZ +"} +(106,1,1) = {" +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -38823,6 +45807,71 @@ ZZ ZZ ZZ ZZ +ce +qx +qx +qx +qx +qx +qx +qx +jE +jv +jE +jE +md +xu +md +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +QG +DE +vO +Gm +Gm +BK +Gm +kk +Gm +Gm +tL +Xp +Xp +Xp +Xp +Xp +Xp +Xp +Rh +Sx +Yy +KW +nP +nP +Ht +HN +cf +wd +Bs +WX +ZO +rn +NS +gB +EH +Bs +Ot +Bn +Ry +Ki ZZ ZZ ZZ @@ -38865,60 +45914,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(67,1,1) = {" ZZ ZZ ZZ @@ -38983,6 +45978,10 @@ ZZ ZZ ZZ ZZ +"} +(107,1,1) = {" +ZZ +ZZ ZZ ZZ ZZ @@ -39003,6 +46002,73 @@ ZZ ZZ ZZ ZZ +qx +LO +FZ +FZ +FZ +EV +Yj +DD +mc +Xa +jE +am +NM +zN +Qy +Qb +gX +WW +NQ +pc +FX +JJ +dF +Qy +SZ +ax +Gm +Nv +GU +ae +Ne +wx +HQ +og +tL +BX +Xp +it +Xp +Jr +Xp +tj +Rh +ru +Yy +wz +Zg +Zg +Ht +HN +cf +uf +Bs +RT +AX +aN +PX +PX +EH +Bs +BL +QN +Ry +Ki +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -39013,6 +46079,9 @@ ZZ ZZ ZZ ZZ +GW +Dj +Ki ZZ ZZ ZZ @@ -39059,60 +46128,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(68,1,1) = {" ZZ ZZ ZZ @@ -39157,6 +46172,10 @@ ZZ ZZ ZZ ZZ +"} +(108,1,1) = {" +ZZ +ZZ ZZ ZZ ZZ @@ -39177,6 +46196,70 @@ ZZ ZZ ZZ ZZ +qx +hW +vs +Lb +Lb +Kz +KE +KE +Wv +Uw +jE +Er +Ur +sL +Qy +Qb +pa +WW +NQ +pY +En +En +Kp +Qy +Yz +ax +Gm +td +gJ +XZ +VG +gJ +Fj +cW +tL +Uu +Xp +Uu +Xp +Uu +Xp +Uu +Rh +JF +Me +Lr +Rh +Rh +Gp +bh +cf +QA +Bs +fy +sd +zC +hO +YA +jp +Bs +XV +Ys +hX +fU ZZ ZZ ZZ @@ -39185,13 +46268,19 @@ ZZ ZZ ZZ ZZ +zu ZZ ZZ ZZ ZZ +Ki +pN +Ki ZZ +Nh ZZ ZZ +zu ZZ ZZ ZZ @@ -39253,60 +46342,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(69,1,1) = {" ZZ ZZ ZZ @@ -39331,6 +46366,8 @@ ZZ ZZ ZZ ZZ +"} +(109,1,1) = {" ZZ ZZ ZZ @@ -39353,6 +46390,95 @@ ZZ ZZ ZZ ZZ +qx +qo +dR +XE +QU +zt +eG +yi +vn +hb +jE +pe +NW +nt +Qy +Dv +Dv +Dv +Dv +Ju +Dv +Dv +Dv +eL +la +ax +Gm +SD +CO +FB +up +Yl +kC +kC +gK +bA +mX +Fg +wG +sP +at +at +Sg +Gp +Gp +Gp +Gp +Zw +fz +Dw +cf +Tt +PU +PU +PU +yL +JH +PU +PU +PU +Ro +Bn +cb +fU +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +fU +Ki +bE +Ki +fU +Ki +Ki +Ki +fU +Ki +Ki +Ki +Ki ZZ ZZ ZZ @@ -39380,7 +46506,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -39435,6 +46560,8 @@ ZZ ZZ ZZ ZZ +"} +(110,1,1) = {" ZZ ZZ ZZ @@ -39447,60 +46574,114 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(70,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +qx +Zx +RZ +vD +eR +Wq +eR +qx +vY +cy +qx +md +ke +md +Qy +Ep +Dv +Dv +Dv +tC +eA +eA +jq +fl +Ug +sM +tL +ig +CO +pQ +OG +vz +Fj +vi +tL +kw +LX +YJ +vQ +HD +AN +Xo +Sg +Zw +Zw +Zw +Zw +Zw +fz +Wo +IK +py +lv +UH +oo +vh +cj +SX +wn +DP +ve +Bn +XD +mo +Bh +ve +ve +ve +ve +Cw +ve +ve +LD +ve +ve +ve +ve +yj +Sy +xn +LD +ve +ve +pd +Bi +ve +ve +ve +Ki +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -39573,21 +46754,9 @@ ZZ ZZ ZZ ZZ +"} +(111,1,1) = {" ZZ -cR -kD -kD -kD -Mb -te -te -Mb -Mb -xo -xo -xo -xo -xo ZZ ZZ ZZ @@ -39609,6 +46778,95 @@ ZZ ZZ ZZ ZZ +mI +mI +mI +qx +JD +bp +Nl +qx +mI +mI +mI +bQ +qm +sh +Qy +YC +JP +Uc +mM +rA +oV +bN +Jk +Qy +Yi +eZ +Gm +Fj +gJ +uv +sG +gJ +Fj +Db +tL +Xp +sH +Xp +Xp +Xp +Xp +Xp +Xp +zM +zM +zM +zM +zM +GH +fm +mv +tz +RW +Ng +vd +ks +sO +RJ +RJ +dM +RJ +jJ +aD +db +yN +FC +rL +FK +FK +tF +Mo +FC +pG +FC +FC +FC +FC +TN +qn +cv +Oo +cv +cv +rH +Ye +ve +SM +ve +Ki ZZ ZZ ZZ @@ -39641,60 +46899,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(71,1,1) = {" ZZ ZZ ZZ @@ -39743,13 +46947,13 @@ ZZ ZZ ZZ ZZ -MB ZZ +"} +(112,1,1) = {" ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -39768,20 +46972,95 @@ ZZ ZZ ZZ ZZ -kD -kD -dx -DI -lo -YY -ZR -vF -zy -xo -Tj -xc -Ct -Vq +mI +Hk +Li +qx +PK +so +Sv +qx +Je +Qt +mI +ya +qm +bQ +Qy +FG +NU +Xu +Ls +Bk +oV +Kb +wu +Qy +ge +ax +Gm +Fj +Fj +jd +Fj +Fj +Fj +Fq +tL +PP +Be +kY +Xp +cL +sh +Qx +wc +Iq +gT +sm +Yp +wc +fz +PB +iH +Vl +EO +VJ +Jy +IR +FN +VJ +MK +Pb +ve +Bn +Ms +EU +QE +ve +fa +Ti +zT +QP +ve +ve +tG +ve +ve +Ti +fa +LM +ve +ve +tG +ve +ve +tA +ve +ve +ve +ve +Ki ZZ ZZ ZZ @@ -39835,60 +47114,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(72,1,1) = {" ZZ ZZ ZZ @@ -39917,6 +47142,8 @@ ZZ ZZ ZZ ZZ +"} +(113,1,1) = {" ZZ ZZ ZZ @@ -39938,11 +47165,99 @@ ZZ ZZ ZZ ZZ -ZV -CV -CV -CV -fP +ZZ +mI +bT +wT +qx +qx +AJ +qx +vD +bT +wT +mI +bQ +qm +bQ +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Qy +Ia +Xj +Gm +Pd +No +Hl +ww +hv +Mu +HL +tL +eu +VO +Do +Xp +zd +ej +Vc +Ig +RH +er +uY +VV +VF +fz +In +cf +XB +fz +PU +PU +PU +ZM +PU +PU +PU +PU +Xf +kW +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +PU +fU +Ki +Ki +Ki +Ki +Ki +Ki +Ki +Ki +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -39962,20 +47277,6 @@ ZZ ZZ ZZ ZZ -ER -bO -Du -xi -bG -bG -qD -YQ -vA -xo -gC -It -IC -Vq ZZ ZZ ZZ @@ -40029,66 +47330,14 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(73,1,1) = {" ZZ ZZ ZZ ZZ ZZ ZZ +"} +(114,1,1) = {" ZZ ZZ ZZ @@ -40111,6 +47360,87 @@ ZZ ZZ ZZ ZZ +mI +ea +cz +xX +js +nl +Ca +hy +nw +tP +mI +bQ +qm +bQ +bQ +Ag +bQ +pb +sh +ZL +Fx +Ad +Bu +MY +HV +XN +tL +tL +tL +tL +tL +tL +tL +tL +tL +Xp +Xp +Xp +Xp +UI +Us +Sz +aG +GO +xY +Xm +tR +il +Fi +eJ +XL +BS +fz +qk +lH +NG +wF +pW +RE +wm +LC +PZ +vf +sv +lf +lf +lf +lf +lf +lf +lf +lf +lf +lf +sC +Qg +LC +Qg +MJ +BP +Of ZZ ZZ ZZ @@ -40132,7 +47462,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40156,20 +47485,6 @@ ZZ ZZ ZZ ZZ -ER -Eq -Bb -MQ -Il -Iv -NT -Il -Il -ji -Tu -rv -eM -xo ZZ ZZ ZZ @@ -40215,6 +47530,8 @@ ZZ ZZ ZZ ZZ +"} +(115,1,1) = {" ZZ ZZ ZZ @@ -40223,60 +47540,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(74,1,1) = {" ZZ ZZ ZZ @@ -40291,6 +47554,87 @@ ZZ ZZ ZZ ZZ +mI +wW +yq +yq +yq +Nz +yq +yq +yq +NV +mI +bQ +Wy +ej +dl +Ox +dl +sx +Xs +dl +dl +dl +dl +wB +Oa +JI +Jl +gb +Bv +gb +nY +gb +gb +FW +gb +gb +gb +gb +HW +Pv +qs +Ev +oS +Yx +bR +kT +XS +UL +fz +pZ +dN +eB +fz +Nt +ht +oI +JB +ot +ot +GR +LC +Qg +Ap +Qg +Qg +Qg +fv +Qg +Qg +LC +LC +LC +LC +LC +ZW +GZ +BF +tV +tl +yu +Of ZZ ZZ ZZ @@ -40326,7 +47670,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40350,20 +47693,6 @@ ZZ ZZ ZZ ZZ -Mb -Sn -Qs -OE -hK -do -bG -rS -LG -wK -MT -bM -Wu -xo ZZ ZZ ZZ @@ -40395,6 +47724,8 @@ ZZ ZZ ZZ ZZ +"} +(116,1,1) = {" ZZ ZZ ZZ @@ -40416,61 +47747,89 @@ ZZ ZZ ZZ ZZ +ce +mI +Zp +gV +Uk +Uk +wq +qQ +qQ +SO +rR +mI +zM +zM +zM +zM +jF +zM +zM +zM +zM +zM +zM +zM +zM +Zk +Md +zM +Rx +Ag +bQ +Fx +sh +cm +zM +iz +IW +IW +df +Tb +IW +kX +kX +kX +kX +kX +kX +fz +fz +fz +aQ +dB +hg +SK +SK +SK +SK +SK +SK +SK +LC +LC +LC +Ap +aF +Qg +Qg +Ji +fv +Qg +LC +Jh +fv +Qg +LC +rF +Qg +Mm +Qg +UR +AF +Of ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(75,1,1) = {" ZZ ZZ ZZ @@ -40520,7 +47879,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40544,20 +47902,6 @@ ZZ ZZ ZZ ZZ -Mb -Mb -Mb -Mb -Mb -Rz -bG -ux -SV -xo -Jf -jm -IC -Vq ZZ ZZ ZZ @@ -40574,6 +47918,8 @@ ZZ ZZ ZZ ZZ +"} +(117,1,1) = {" ZZ ZZ ZZ @@ -40596,6 +47942,87 @@ ZZ ZZ ZZ ZZ +mI +We +SY +Ss +UD +Ss +oL +Ss +ys +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +Zw +Zw +Vp +Vp +Zw +zM +Jm +zM +zM +zM +zM +zM +zM +zM +zM +zM +Ag +df +Ni +qU +Sa +IW +kX +Zv +Zv +Zv +Zv +kX +fz +ek +Ic +fA +QD +lC +wM +Ar +pm +hi +xa +nf +SK +Vj +MJ +LC +bC +Qg +Qg +Qg +Qg +Qg +fv +LC +Qg +Qg +Qg +LC +Ap +Qg +LC +mf +UR +Vj +Rm ZZ ZZ ZZ @@ -40611,60 +48038,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(76,1,1) = {" ZZ ZZ ZZ @@ -40714,7 +48087,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40738,22 +48110,10 @@ ZZ ZZ ZZ ZZ -UK -us -yZ -AH -QR -lE -LG -TM -OW -xo -vB -vB -Is -Vq ZZ ZZ +"} +(118,1,1) = {" ZZ ZZ ZZ @@ -40776,6 +48136,88 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +Fy +Px +Px +Px +Yu +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +Zw +Zw +zM +zM +zM +zM +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +zM +TA +Zf +KS +mj +yI +IW +kX +Zv +Zv +Zv +Zv +kX +fz +sT +Py +EJ +cf +yg +wM +xW +UP +tb +nc +Wc +SK +bS +Wp +LC +Si +Jh +Qg +Qg +fv +Wp +Qg +LC +Qg +Qg +Qg +LC +Ap +uu +LC +Wp +gt +Vj +Rm +Lh ZZ ZZ ZZ @@ -40805,60 +48247,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(77,1,1) = {" ZZ ZZ ZZ @@ -40908,7 +48296,6 @@ ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -40919,6 +48306,8 @@ ZZ ZZ ZZ ZZ +"} +(119,1,1) = {" ZZ ZZ ZZ @@ -40932,20 +48321,6 @@ ZZ ZZ ZZ ZZ -Mh -Mb -cX -NE -Mb -xf -xf -Mb -xf -xo -xo -xo -xo -xo ZZ ZZ ZZ @@ -40955,6 +48330,87 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +bK +xp +xp +xp +Ff +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +zM +zM +zM +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +Jm +xB +IW +IW +IW +IW +IW +kX +Zv +Zv +Zv +Zv +kX +fz +Tg +Py +pn +cf +fM +dn +nZ +qH +yc +Vx +Jq +SK +UR +yH +LC +Ap +Qg +Qg +bJ +LC +yH +LC +LC +fv +fv +fv +LC +Ap +gf +LC +LC +LC +LC +Rm ZZ ZZ ZZ @@ -40999,60 +48455,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(78,1,1) = {" ZZ ZZ ZZ @@ -41098,11 +48500,12 @@ ZZ ZZ ZZ ZZ +"} +(120,1,1) = {" ZZ ZZ ZZ ZZ -ZV ZZ ZZ ZZ @@ -41121,24 +48524,95 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +bK +xp +xp +Xe +Ff +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +zM +zM +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +bQ +zM +zM +zM +zM +zM +xB +UX +jD +GX +ym +UX +kX +Zv +Zv +Zv +Zv +kX +fz +Cp +go +SR +cf +Uy +wM +Dx +PM +wo +yd +Jq +jt +KH +nC +De +af +Qg +Qg +Qg +LC +pA +Qg +Qg +Qg +LC +LC +LC +Ap +LC +LC +Qg +GD +Vj +Rm +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ -mY -mY -nH -HO -mY -pj -pj -mY -pj -pj -JV -mY -mY ZZ ZZ ZZ @@ -41149,7 +48623,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -41193,60 +48666,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(79,1,1) = {" ZZ ZZ ZZ @@ -41275,6 +48694,22 @@ ZZ ZZ ZZ ZZ +"} +(121,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -41283,6 +48718,93 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +bK +xp +xp +xp +Ff +dS +cH +mI +Zw +Zw +Vp +zM +qm +bQ +bQ +zM +bQ +bQ +bQ +bQ +zM +zM +zM +zM +zM +zM +zM +Vp +Vp +Zw +zM +xB +UX +nz +vM +jZ +UX +kX +kX +uW +uW +TO +kX +fz +fz +fz +hp +TH +EI +SK +LW +Cf +al +iG +Jq +SK +jj +Qg +LC +Ap +fv +Qg +Qg +LC +YM +Qg +Qg +Qg +LC +Qg +Qg +Ap +Qg +Mm +Qg +jj +AF +Of +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -41296,14 +48818,6 @@ ZZ ZZ ZZ ZZ -ZV -ZV -CV -ZV -ZV -ZV -ZV -ZV ZZ ZZ ZZ @@ -41320,19 +48834,6 @@ ZZ ZZ ZZ ZZ -mY -Na -kc -yK -CT -CS -dY -CT -dU -Zq -Mq -lZ -mY ZZ ZZ ZZ @@ -41387,60 +48888,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(80,1,1) = {" +(122,1,1) = {" ZZ ZZ ZZ @@ -41463,6 +48912,87 @@ ZZ ZZ ZZ ZZ +mI +We +Sh +Lu +va +va +va +HC +dS +cH +mI +Zw +Zw +zM +zM +qm +bQ +bQ +bQ +bQ +bQ +bQ +zM +zM +Zw +Zw +Vp +Zw +Vp +Zw +Zw +Zw +Zw +zM +xB +UX +uH +QZ +Ay +UX +cM +OA +OA +OA +dz +lU +fh +Qp +wb +KQ +cf +mx +SK +SK +SK +SK +SK +SK +SK +Uj +fv +LC +Pc +Qg +fv +Qg +LC +Qg +aF +Qg +fv +LC +Qg +Qg +cI +tV +wa +tV +zz +mz +Of ZZ ZZ ZZ @@ -41492,41 +49022,12 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -CV -CV -CV -CV -CV -CV -CV -CV -CV -CV -CV -ZV -ZV -ZV -CV ZZ ZZ -mY -uL -VN -Ui -CT -ac -NY -CT -aW -RR -Mn -lg -mY ZZ ZZ ZZ @@ -41581,87 +49082,14 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(81,1,1) = {" -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ -ZZ +(123,1,1) = {" ZZ ZZ ZZ ZZ ZZ +Nh ZZ ZZ ZZ @@ -41669,58 +49097,100 @@ ZZ ZZ ZZ ZZ -aq -aq -aq -aq -aq -gf -gu -gu -gu -gu -gu -gu -gu ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -CV -Rr -vx -vx -vx -vx -Aw -Aw -vx -vx -CV ZZ +mI +We +sZ +FF +FF +FF +FF +FF +Ll +cH +mI +Zw +zM +zM +bQ +qm +bQ +bQ +bQ +bQ +zM +zM +zM +Vp +UT +UT +UT +UT +UT +Eu +Eu +Eu +Eu +Eu +uw +UX +UX +AD +UX +UX +wl +ui +ui +ui +ui +ui +ui +ui +ui +CQ +cf +mx +LC +Qg +Qg +Qg +YM +Qg +Qg +fv +Qg +LC +Fm +LC +LC +LC +LC +LC +LC +zW +LC +LC +fv +Qg +Qg +Qg +zX +Wp +Qg +gt +Of ZZ ZZ -CV ZZ ZZ -mY -mY -sb -aH -CT -DM -kQ -CT -cc -Zc -Kn -bF -mY ZZ ZZ ZZ @@ -41775,60 +49245,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(82,1,1) = {" ZZ ZZ ZZ @@ -41859,63 +49275,14 @@ ZZ ZZ ZZ ZZ -gf -aq -aq -aq -aq -Sb -Sb -Sb -Sb -Sb -VX -gu -VX -VX -VX -VX -gu -CV -CV -CV -kR -CV -CV -CV -CV -CV -CV -PO -KN -rG -CU -FO -DV -Rp -aJ -vx -CV ZZ +"} +(124,1,1) = {" ZZ ZZ -CV ZZ ZZ ZZ -mY -Jd -lF -kE -PV -Dz -nQ -iy -Jg -uV -Og -mY -Lh ZZ ZZ ZZ @@ -41933,6 +49300,93 @@ ZZ ZZ ZZ ZZ +mI +Ku +zv +zv +zv +NJ +zv +zv +zv +Ph +mI +Vp +zM +bQ +tm +Nd +bQ +zM +zM +zM +zM +Zw +Zw +Zw +UT +bz +mD +nG +UT +Eu +pp +tI +Mi +Eu +Sw +zx +Nk +Sj +Ke +Ru +aB +Cg +Cg +Cg +Cg +Cg +Cg +Cg +Cg +ZE +TU +cN +LC +Vj +Vj +Vj +Vj +Vj +KA +AF +Wp +Bg +ll +Qg +Qg +fv +Qg +Jh +Qg +Qg +Qg +LC +Qg +Qg +Qg +Qg +LC +Rm +Rm +Rm +Rm +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -41969,60 +49423,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(83,1,1) = {" ZZ ZZ ZZ @@ -42053,62 +49453,11 @@ ZZ ZZ ZZ ZZ -aq -sQ -sQ -sQ -Sb -Sb -Sb -Sb -Sb -Sb -VX -gu -VX -VX -VX -VX -gu -sg -zF -zF -dr -sg -zF -zF -zF -sg -CV -PO -KN -Uv -xP -es -yA -dh -Af -vx -CV ZZ ZZ ZZ -CV -zu ZZ ZZ -mY -gY -oO -eX -TX -ii -CT -Ql -eo -JQ -Zt -mY ZZ ZZ ZZ @@ -42121,6 +49470,14 @@ ZZ ZZ ZZ ZZ +"} +(125,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -42137,6 +49494,89 @@ ZZ ZZ ZZ ZZ +mI +mI +mI +mI +mI +mI +Qk +Qk +Qk +Qk +Qk +zM +zM +bQ +qm +zM +zM +zM +UT +UT +UT +UT +UT +UT +UT +tW +oe +ew +UT +Eu +Gt +LA +eQ +Eu +Pq +dC +qF +Vu +Vu +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +ca +OR +lC +LC +LC +LC +LC +LC +LC +LC +LC +LC +wD +yo +Lo +fD +Vj +Vj +Vj +Vj +Vj +Wp +LC +kq +Vj +Vj +Qg +LR +Rm +Vp +Vp +Vp +CV +ZZ ZZ ZZ ZZ @@ -42163,60 +49603,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(84,1,1) = {" ZZ ZZ ZZ @@ -42233,7 +49619,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -42247,62 +49632,6 @@ ZZ ZZ ZZ ZZ -VK -GA -GA -sQ -FJ -Sb -Sb -Sb -Sb -Sb -VX -VX -VX -VX -VX -VX -nS -Qn -kU -vo -FU -zB -Bc -Bc -FH -sg -sg -yv -yv -yv -yv -yv -BN -IL -yn -yn -iN -iN -iN -yn -yn -yn -yn -yn -EF -EF -EF -EF -EF -CT -CT -CT -CT -Hx -CT -mY ZZ ZZ ZZ @@ -42335,6 +49664,8 @@ ZZ ZZ ZZ ZZ +"} +(126,1,1) = {" ZZ ZZ ZZ @@ -42357,64 +49688,87 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(85,1,1) = {" ZZ ZZ ZZ ZZ +DB +DB +zM +xL +BE +mq +iw +zM +zM +bQ +qm +zM +Zw +Zw +UT +sK +Rj +Rj +NK +UT +UT +UT +Za +UT +UT +Eu +xQ +Cz +Cc +Eu +JO +Ky +gq +Fo +az +az +ui +OA +OA +OA +dz +ui +Fo +Fo +Fo +Fo +IK +zr +hA +jG +CZ +kF +fF +OJ +OJ +OJ +hT +Zu +Qg +lB +rg +wy +IH +IH +IH +IH +IH +IH +IH +IH +IH +VU +gS +gS +Vp +Vp +Vp ZZ ZZ ZZ @@ -42441,62 +49795,6 @@ ZZ ZZ ZZ ZZ -aq -sQ -sQ -sQ -Sb -Sb -Sb -Sb -Sb -Sb -VX -VX -VX -VX -VX -VX -zW -yS -LN -na -qb -KV -Cy -Ww -Av -pw -Rs -AE -lz -Xt -hU -yv -Kx -Tq -yn -OX -wX -JT -rT -ZX -yn -jh -kg -yn -ZY -ZY -ZY -ZY -EF -Zw -Zw -CT -GC -DA -Tn -mY ZZ ZZ ZZ @@ -42517,7 +49815,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -42551,60 +49848,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(86,1,1) = {" ZZ ZZ ZZ @@ -42615,6 +49858,8 @@ ZZ ZZ ZZ ZZ +"} +(127,1,1) = {" ZZ ZZ ZZ @@ -42633,64 +49878,6 @@ ZZ ZZ ZZ ZZ -aq -aq -aq -Sb -Sb -Sb -aq -Sb -Sb -Sb -Sb -Sb -VX -gu -VX -VX -VX -VX -rI -bx -mm -aa -et -Qu -Av -QM -Ik -Hh -Rs -bC -mN -mN -bW -xy -Cs -en -Mz -IA -yw -VD -ES -Pz -zD -QW -cd -yn -ZY -ZY -ZY -ZY -EF -Zw -Zw -CT -Ea -de -gy -mY ZZ ZZ ZZ @@ -42698,6 +49885,84 @@ ZZ ZZ ZZ ZZ +DB +DB +bQ +jR +bQ +bQ +bQ +nd +mh +zM +bQ +qm +zM +Zw +Zw +UT +Zz +mU +mU +on +UT +fG +Dt +qJ +aZ +Gw +Eu +Eu +UV +Eu +Eu +FL +ui +Fo +Fo +Ld +UA +LU +LU +tt +tt +LU +LU +Fo +Qe +uy +Fo +SF +Bz +AA +lx +lx +lx +AM +RM +bf +bf +bf +bf +bf +bf +ly +TP +IH +YD +ay +Fw +ZD +OZ +hF +OZ +IH +mi +bg +gS +SS +Vp +Vp ZZ ZZ ZZ @@ -42745,60 +50010,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(87,1,1) = {" ZZ ZZ ZZ @@ -42827,65 +50038,6 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -VX -gu -gu -gu -gu -gu -sg -sg -cV -gv -gx -zi -RN -Ml -un -xx -Rs -cn -mN -mN -hU -xy -jb -Kh -Mz -Lj -JM -Dh -JM -NC -yn -Sc -Pr -yn -ZY -ZY -RC -ZY -EF -Zw -Zw -CT -Ly -Jw -mO -mY -Zw ZZ ZZ ZZ @@ -42900,9 +50052,8 @@ ZZ ZZ ZZ ZZ -uk -qa -pM +"} +(128,1,1) = {" ZZ ZZ ZZ @@ -42928,6 +50079,84 @@ ZZ ZZ ZZ ZZ +DB +zU +zU +bQ +bQ +bQ +bQ +bQ +bQ +zM +bQ +qm +zM +zM +Vp +UT +El +RX +Gw +YS +UT +fg +Td +Am +La +Di +hY +WF +tc +Gq +hY +Qo +oN +Fo +Fo +tx +tx +LU +HS +HS +HS +HS +LU +Fo +gZ +el +Fo +ui +Gf +hA +rM +cu +cu +Rl +BM +bf +sz +po +QX +QS +vk +BO +HG +ou +PA +CM +By +Iz +dJ +OZ +OZ +ed +mi +pq +cZ +Vp +Vp +Vp ZZ ZZ ZZ @@ -42939,60 +50168,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(88,1,1) = {" ZZ ZZ ZZ @@ -43021,83 +50196,18 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -Zw -Zw -sg -Kg -YZ -YW -FT -wQ -lA -vC -eW -Rs -iX -VT -Wj -bW -xy -SC -gr -Mz -kz -HJ -Ko -Qv -PD -yn -yn -yn -yn -ZY -ZY -tw -RC -EF -EF -EF -CT -vH -RS -mY -mY -Zw ZZ ZZ ZZ -zu ZZ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ ZZ -Ki -SJ -hf -zu ZZ ZZ ZZ @@ -43133,63 +50243,11 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(89,1,1) = {" ZZ ZZ ZZ +"} +(129,1,1) = {" ZZ ZZ ZZ @@ -43215,84 +50273,84 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -Zw +DB +bv +YH +bQ +bQ +ZA +bQ +bQ +bQ +Jm +bQ +qm +bQ +zM Zw -sg -CC -Ud -Cu -sI -Oz -pr -Im -or -Rs -OM -gj -mE -ug -xy -RU -Xl -Mz -ow -rC -gW -JM -FP -zQ -yn -Nx -EF -ZY -ZY -ZY -RC -EF -iv -iv -jo -ne -Xw -Ii -jo -jo -Sg -Sg -Sg -fU -Rh -Rh -Rh -jo -Sg -Sg -Sg -jo -jo -Sg -jW -jQ -jW -jo -pM +UT +mp +Zb +EA +zj +ez +Vt +cK +Lx +bq +Lg +hD +zE +CX +ku +MR +Wz +cf +Fo +mL +sR +mL +LU +HS +HS +HS +HS +LU +Fo +xT +el +Fo +ui +TB +hA +GJ +QY +jP +xD +Hb +kb +jx +Rv +ov +JR +Pw +qu +dd +IH +XI +mW +vV +vV +qe +Rf +Rf +IH +mi +mi +cZ +Vp +Vp +Vp ZZ ZZ ZZ @@ -43327,60 +50385,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(90,1,1) = {" ZZ ZZ ZZ @@ -43409,84 +50413,6 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -Zw -Zw -sg -fd -Zh -wA -xh -xh -xh -xh -xh -xh -DR -JA -Hr -AI -DS -XH -Gs -ex -di -uS -AZ -aV -rf -yn -yn -EF -EF -EF -ng -FM -EF -EF -ng -ng -jo -YT -HX -EL -mo -HP -ve -ve -ve -ri -WZ -VR -xn -uZ -ve -ve -pd -Bi -ef -ve -WZ -oc -Ak -ml -hf ZZ ZZ ZZ @@ -43514,6 +50440,8 @@ ZZ ZZ ZZ ZZ +"} +(130,1,1) = {" ZZ ZZ ZZ @@ -43521,60 +50449,102 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(91,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +DB +aM +aM +bQ +bQ +bQ +bQ +bQ +bQ +zM +bQ +Wy +hz +zM +Zw +UT +Fa +Uz +Gw +Pe +UT +my +At +uQ +cO +zO +of +Lc +tc +Wf +ZP +RV +cf +sR +Fo +Fo +Fo +LU +HS +HS +HS +HS +LU +Fo +Dq +Ub +Fo +ui +mJ +PW +PW +PW +PW +PW +PW +PW +jW +jW +jW +jW +jW +cB +bo +IH +mB +ar +TZ +yp +MD +Rf +Rf +IH +mi +kK +gS +Vp +Vp +Vp ZZ ZZ ZZ @@ -43603,84 +50573,6 @@ ZZ ZZ ZZ ZZ -gf -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -mr -Zw -PI -PI -sg -sg -bX -ZQ -xh -lN -xF -sW -dK -xh -MW -mN -mN -Yc -xy -Gu -xA -Mz -yw -lt -yw -TT -GK -yn -WB -ng -ng -ng -ng -ng -Xn -eF -ng -ng -jo -ia -WC -Bj -nO -gc -FC -FC -Fr -cT -Fr -wC -FC -FC -FC -FC -Re -WY -xU -MO -MO -iQ -ve -ve -hf ZZ ZZ ZZ @@ -43715,60 +50607,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(92,1,1) = {" ZZ ZZ ZZ @@ -43796,85 +50634,10 @@ ZZ ZZ ZZ ZZ +"} +(131,1,1) = {" +ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -PI -Au -IZ -HV -UE -Ve -xh -Vs -co -Dr -wN -xh -ci -mN -mN -VL -xy -jb -wg -yn -dE -mQ -UM -hs -EN -yn -ng -ng -ng -ng -jN -rh -Os -ng -ng -ng -Az -TE -Da -Yd -EU -Cn -ve -ve -ve -HY -ve -ve -ve -QE -ve -ve -tA -ve -On -ve -ve -ve -ve -gL -hf ZZ ZZ ZZ @@ -43898,6 +50661,90 @@ ZZ ZZ ZZ ZZ +DB +DB +bQ +xI +bQ +bQ +bQ +Ag +qK +zM +bQ +bQ +qm +zM +Zw +UT +Zz +mU +mU +ft +UT +yM +mU +qJ +An +Gw +iD +iD +Ci +iD +iD +pU +cf +uM +Fo +Fo +Fo +LU +HS +HS +HS +HS +LU +Fo +Ie +UA +Fo +SA +wj +KI +ko +IG +IG +IG +IG +Wb +VY +UQ +zp +OF +jW +Zl +Qi +DG +DG +DG +DG +DG +DG +DG +DG +DG +xk +DG +DG +DG +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -43909,60 +50756,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(93,1,1) = {" ZZ ZZ ZZ @@ -43991,84 +50784,6 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -PI -mw -km -HV -UC -vw -xh -iF -Nn -Dr -bw -xh -eh -hR -hR -WI -xy -jb -zq -yn -yn -yn -yn -yn -yn -yn -ng -ng -ng -ng -rh -rh -ng -yk -rh -rh -Az -Ot -Bn -cb -jo -jo -Rh -Rh -Rh -jo -Rh -Rh -Rh -jo -Rh -Rh -jW -jo -jo -Rh -Rh -Rh -Rh -jo -ua ZZ ZZ ZZ @@ -44103,60 +50818,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(94,1,1) = {" ZZ ZZ ZZ @@ -44167,6 +50828,8 @@ ZZ ZZ ZZ ZZ +"} +(132,1,1) = {" ZZ ZZ ZZ @@ -44185,69 +50848,100 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +DB +DB +xN +Ja +Wg +Wl +sy +xN +xN +xN +bQ +ga +zM Zw -PI -wV -Ax -nK -ds -oP -cx -QL -co -Dr -pt -cx -zl -Hv -Hv -zl -cx -bH -xs -hj -NR -if -WQ -FD -KT -kL -XO -ng -ng -ng -rh -rh -Aj -ng -rh -ng -Az -Ot -Bn -Nw -jo +UT +HZ +XW +XW +QQ +UT +UT +UT +Za +UT +UT +iD +Aq +pS +bZ +iD +pU +cf +Fo +Fo +Fo +Fo +LU +LU +LU +LU +LU +LU +Fo +tx +tx +rQ +VE +Em +PW +dc +TS +TS +TS +TS +Ix +TS +fq +Kl +WM +My +Zl +kJ +kS +gF +DX +Ns +mF +mF +tH +BU +YF +mF +mF +mF +ry +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ -KD ZZ ZZ ZZ @@ -44261,7 +50955,6 @@ ZZ ZZ ZZ ZZ -KD ZZ ZZ ZZ @@ -44297,60 +50990,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(95,1,1) = {" ZZ ZZ ZZ @@ -44379,68 +51018,12 @@ ZZ ZZ ZZ ZZ -aq -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -Sb -aq -Zw -PI -IZ -Cx -HV -rO -pL -zl -gI -co -Dr -Se -zR -lT -rc -rc -lj -zl -jb -eT -hj -gh -dW -oy -gk -Tc -kL -zf -wk -ng -ng -ng -ng -ng -ng -ng -ng -jo -YR -Bn -Ry -hf ZZ ZZ ZZ ZZ +"} +(133,1,1) = {" ZZ ZZ ZZ @@ -44469,6 +51052,81 @@ ZZ ZZ ZZ ZZ +xN +xN +xN +xN +xN +xN +Zw +xN +SB +ga +zM +zM +UT +UT +UT +UT +UT +UT +UT +ok +Fl +xZ +UT +iD +sF +tY +tX +iD +pU +cf +ui +ui +ui +ui +fY +ui +ui +ui +ui +fY +ui +ui +ui +ui +cf +he +AQ +hq +IP +IP +IP +aj +vm +yC +qC +iP +lR +My +Zl +bD +kS +BA +aR +Ns +mF +mF +mF +mF +Ra +JC +JC +Ra +ry +Vp +Vp ZZ ZZ ZZ @@ -44491,60 +51149,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(96,1,1) = {" ZZ ZZ ZZ @@ -44573,64 +51177,6 @@ ZZ ZZ ZZ ZZ -yO -yO -yO -tQ -aK -Dn -jr -jr -Mr -jr -jr -pF -vr -cP -vr -vr -Zw -HV -HV -HV -HH -yf -yx -zl -RG -Hg -Dr -XU -Dr -pk -Dr -CP -lj -zl -kt -si -OY -PJ -Al -QI -gk -xK -kL -GQ -tr -ng -Aj -ng -li -ng -ng -ng -GS -ud -ve -Bn -Ry -hf ZZ ZZ ZZ @@ -44670,6 +51216,9 @@ ZZ ZZ ZZ ZZ +"} +(134,1,1) = {" +ZZ ZZ ZZ ZZ @@ -44685,60 +51234,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(97,1,1) = {" ZZ ZZ ZZ @@ -44752,6 +51247,81 @@ ZZ ZZ ZZ ZZ +Vp +Vp +Zw +Zw +Zw +Zw +xN +SB +tk +zM +nX +Df +DW +Df +Df +Uh +Uh +UT +Fs +Kv +nE +UT +iD +WR +Vv +Fd +iD +Vn +cf +NI +NI +NI +NI +NI +hJ +hJ +ui +ui +ui +ui +ui +ui +ui +cf +vg +PW +jW +jW +jW +jW +jW +jW +aX +fq +KK +ZB +My +Hc +Jp +RD +YN +LY +bl +bl +wr +bl +oU +pJ +Ex +Xz +MM +ry +Vp +Vp +ZZ ZZ ZZ ZZ @@ -44767,64 +51337,6 @@ ZZ ZZ ZZ ZZ -yO -od -re -Vf -Pi -pF -pH -qY -jU -uI -je -pF -uF -PR -KO -vr -Zw -HV -Pg -eK -Wn -fb -rX -bd -Wr -EE -Wt -IU -gs -Wt -Wt -xR -aP -fO -IM -uR -hj -Gn -iV -Fe -Tl -hP -kL -ng -vU -GS -ng -ng -ng -gP -xJ -ng -ng -YX -ve -Bn -Ry -hf ZZ ZZ ZZ @@ -44879,60 +51391,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(98,1,1) = {" ZZ ZZ ZZ @@ -44952,6 +51410,8 @@ ZZ ZZ ZZ ZZ +"} +(135,1,1) = {" ZZ ZZ ZZ @@ -44961,64 +51421,6 @@ ZZ ZZ ZZ ZZ -yO -AW -jV -lG -OI -pF -pE -fk -dg -fk -is -pF -UU -rp -cg -vr -Zw -HV -HI -gd -mt -Yh -MA -Bw -kH -yB -Wt -nI -tK -Wt -Wt -nb -nj -Qd -Ce -dq -hj -PG -iu -FQ -zP -tg -kL -ng -iU -rh -QT -ng -ng -ng -ng -ng -ng -jo -WO -Bn -ic -jo ZZ ZZ ZZ @@ -45040,6 +51442,79 @@ ZZ ZZ ZZ ZZ +Vp +tE +tE +Zw +Zw +xN +Df +yl +Ba +bV +DO +hw +bm +kn +Dm +in +UT +UT +UT +UT +UT +iD +iD +iD +iD +iD +lm +cf +fQ +ho +ho +ho +ho +SE +PC +ui +Fo +HR +Fo +az +az +rQ +cf +WT +cE +BV +fZ +bb +OK +Po +jW +Jj +fq +BH +wh +My +Zl +sU +kS +Nm +Kt +mF +mF +Bt +Xv +Yf +ba +Xd +Vh +MM +ry +Vp +Vp ZZ ZZ ZZ @@ -45073,60 +51548,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(99,1,1) = {" ZZ ZZ ZZ @@ -45155,65 +51576,6 @@ ZZ ZZ ZZ ZZ -yO -eE -jV -UB -kv -wO -Dk -Eb -DU -Eb -jy -pF -st -fi -st -vr -Zw -HV -Kq -ML -fe -Eo -DY -zl -Qw -uc -Qw -xz -Dr -Dr -GV -Fb -BC -zl -UO -FY -kL -hj -hj -kO -hj -hj -kL -JN -WK -JN -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -IN -Da -LL -jo -Lh ZZ ZZ ZZ @@ -45242,6 +51604,8 @@ ZZ ZZ ZZ ZZ +"} +(136,1,1) = {" ZZ ZZ ZZ @@ -45267,65 +51631,84 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(100,1,1) = {" ZZ ZZ ZZ ZZ ZZ +Vp +tE +tE +Zw +Zw +xN +Df +bi +Sk +Df +Df +zM +tT +eC +Hp +Uh +au +fn +NF +mC +Op +Co +Ty +Gb +zK +au +Uq +cf +qt +hJ +hJ +hJ +hJ +SE +PC +ui +Fo +sR +Fo +ON +UA +Fo +cf +WT +DH +BW +Zo +iT +Zo +Yn +EK +br +fq +Oh +KR +My +Bf +Qi +kS +mF +Kt +mF +mF +qS +mF +Yf +Ra +PN +PN +Ra +ry +Vp +Vp ZZ ZZ ZZ @@ -45349,64 +51732,6 @@ ZZ ZZ ZZ ZZ -yO -lL -DJ -Fc -Gl -pF -fK -qy -uJ -Qf -jg -pF -gR -rV -Yk -vr -Zw -HV -to -ML -fe -mZ -Cj -zl -nr -mn -sl -rE -WJ -Uf -vX -Dr -BC -zl -SC -Iw -Fv -sB -ij -cr -nP -Ga -Gp -Bp -PH -TD -qA -nm -Ck -dj -nh -Qa -RP -tZ -aT -Bn -Ry -hf ZZ ZZ ZZ @@ -45461,60 +51786,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(101,1,1) = {" ZZ ZZ ZZ @@ -45527,6 +51798,8 @@ ZZ ZZ ZZ ZZ +"} +(137,1,1) = {" ZZ ZZ ZZ @@ -45543,64 +51816,6 @@ ZZ ZZ ZZ ZZ -yO -xl -ET -fx -oK -pF -bY -Eb -ss -UY -Ua -uh -TL -sN -hH -vr -Zw -HV -AC -ML -fe -Eo -rP -cx -zl -zl -cx -ky -zl -fO -cx -zl -zl -cx -fu -xs -Fv -bs -DZ -uU -Rn -wU -BZ -Br -TQ -Kw -VM -Wd -Kr -tZ -RQ -ev -EX -tZ -Nc -LQ -hX -hf ZZ ZZ ZZ @@ -45614,8 +51829,80 @@ ZZ ZZ ZZ ZZ -Nh ZZ +Vp +tE +tE +Zw +Zw +xN +Df +Vy +Df +Df +Rk +zM +HM +eC +ts +uN +au +iB +lq +lq +lq +CA +ZG +vZ +GG +au +SQ +cf +iJ +hk +iq +eb +hJ +SE +PC +ui +Fo +mL +Fo +Bx +oa +Fo +cf +qG +CH +Ft +Bd +xe +hu +zL +WN +mT +Dc +jz +tU +IB +Ue +Mx +kS +mF +Kt +mF +mF +xV +eS +Gy +WD +XT +YV +mG +ry +Vp +Vp ZZ ZZ ZZ @@ -45655,60 +51942,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(102,1,1) = {" ZZ ZZ ZZ @@ -45731,70 +51964,10 @@ ZZ ZZ ZZ ZZ -fP ZZ ZZ ZZ ZZ -Zw -yO -oC -ag -hV -vt -pF -Qm -cS -pu -ib -Ul -pF -ZS -Cv -fJ -vr -Zw -HV -oW -ML -fe -Eo -jY -Yt -Yt -Yt -nN -sY -jM -sY -WP -EB -EB -EB -kt -eT -Fv -Dp -wf -Xg -Qh -Tf -VW -EG -TQ -Ah -Ou -yD -aw -Wa -tZ -tZ -tZ -tZ -TJ -Bn -XM -hf ZZ ZZ ZZ @@ -45819,6 +51992,8 @@ ZZ ZZ ZZ ZZ +"} +(138,1,1) = {" ZZ ZZ ZZ @@ -45849,60 +52024,79 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(103,1,1) = {" +Vp +tE +tE +Zw +Zw +xN +xN +xN +xN +xN +xN +xN +lJ +Kk +Uh +eN +au +ql +dw +Le +rK +hl +Ac +QO +Om +au +Jv +KB +vq +le +pV +Tk +hJ +SE +PC +ui +sR +Hy +UA +gZ +el +Fo +cf +qG +DH +gg +Zo +ZC +Zo +lS +pl +Yb +cD +QF +hB +jW +zV +OP +kS +aC +xE +Od +JK +zh +zh +zh +zh +zh +zh +zh +DG +Vp +Vp ZZ ZZ ZZ @@ -45925,70 +52119,10 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -Zw -yO -yO -nT -Fn -th -LH -hr -hr -Ze -hr -hr -LH -vr -cs -vr -vr -HV -vE -Pu -Tw -fe -Eo -ph -iC -iC -oT -BQ -fe -tS -YL -fB -ct -fB -rD -bL -qw -kB -lw -KP -xw -lW -Mp -YG -GL -HB -IO -tZ -CD -Zn -Kr -qq -tZ -FV -tZ -JS -Bn -hd -jo ZZ ZZ ZZ @@ -46043,60 +52177,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(104,1,1) = {" ZZ ZZ ZZ @@ -46106,6 +52186,10 @@ ZZ ZZ ZZ ZZ +"} +(139,1,1) = {" +ZZ +ZZ ZZ ZZ ZZ @@ -46119,70 +52203,10 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ ZZ -Zw -HV -jB -Gg -TK -wt -rJ -rJ -rJ -BT -rJ -rJ -XA -rJ -uP -rJ -Zj -rJ -TR -bn -WA -LF -yr -eq -nD -XX -Tp -XX -XX -jK -sr -rB -rB -rB -rB -rB -sw -oD -Zm -Vi -PE -ME -oH -Ib -Lp -gn -VZ -tZ -eO -Ow -Kr -qq -tZ -FV -tZ -Ot -Bn -ic -jo ZZ ZZ ZZ @@ -46194,6 +52218,84 @@ ZZ ZZ ZZ ZZ +Vp +tE +tE +tE +Zw +Zw +Zw +Zw +Zw +Zw +Zw +xN +eC +sA +sA +sA +sA +sA +sA +sA +ad +nv +dI +fs +OU +au +Vn +cf +Mg +hJ +hJ +hJ +hJ +Ka +PC +ui +Fo +Hy +UA +xT +el +Fo +cf +qG +ZI +gi +Bm +nx +YO +rx +PW +PW +PW +PW +PW +PW +wy +wy +zh +zh +zh +zh +zh +zh +St +zm +Yr +ey +zw +Gr +Vp +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -46237,60 +52339,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(105,1,1) = {" ZZ ZZ ZZ @@ -46313,70 +52361,9 @@ ZZ ZZ ZZ ZZ -CV ZZ ZZ ZZ -Zw -Zw -HV -Pm -Fk -Tr -ub -np -KJ -np -JY -TW -lO -jL -TW -SW -AO -TW -TW -kd -EC -MP -nR -SH -mu -rq -ln -jS -Qr -Rq -YI -dL -bk -Pn -TC -io -ra -mP -Fv -XR -zH -oQ -gQ -sa -kS -Xx -cf -yP -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -DT -Bn -Ry -hf ZZ ZZ ZZ @@ -46393,6 +52380,8 @@ ZZ ZZ ZZ ZZ +"} +(140,1,1) = {" ZZ ZZ ZZ @@ -46404,7 +52393,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -46426,65 +52414,91 @@ ZZ ZZ ZZ ZZ +tE +tE +tE +tE +tE +Zw +Zw +xN +xN +xN +eC +sA +NA +uo +uX +fw +ob +sA +ih +Gi +dI +CL +lQ +au +Fz +cf +pg +RY +RY +RY +RY +Ka +PC +ui +Fo +Hy +UA +LP +ik +Fo +cf +qG +PW +PW +PW +PW +PW +PW +EM +Xc +eY +qE +CE +nM +Gh +qz +Rw +wS +ja +no +qv +kA +zm +zm +kh +EW +Qc +Gr +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(106,1,1) = {" ZZ ZZ ZZ @@ -46506,71 +52520,6 @@ ZZ ZZ ZZ ZZ -ce -qx -qx -qx -qx -qx -qx -qx -qx -jv -qx -qx -md -xu -md -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -QG -DE -vO -Gm -Gm -BK -Gm -kk -Gm -Gm -PU -Rm -Rm -Rm -Rm -Rm -Rm -Rm -Gp -Sx -Yy -KW -nP -nP -Ht -HN -cf -wd -Bs -WX -ZO -rn -NS -gB -EH -Bs -Ot -Bn -Ry -hf ZZ ZZ ZZ @@ -46625,60 +52574,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(107,1,1) = {" +(141,1,1) = {" ZZ ZZ ZZ @@ -46701,70 +52598,86 @@ ZZ ZZ ZZ ZZ -qx -LO -FZ -FZ -FZ -EV -Yj -DD -mc -Xa -qx -am -NM -zN -Qy -Qb -gX -WW -NQ -pc -FX -JJ -dF -Qy -SZ -ax -Gm -Nv -GU -ae -Ne -wx -HQ -og -PU -BX -Rm -it -Rm -Jr -Rm -tj -Gp -ru -Yy -wz -Zg -Zg -Ht -HN -cf -uf -Bs -RT -AX -aN -PX -PX -EH -Bs -BL -QN -Ry -hf +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +tE +tE +tE +tE +tE +tE +tE +xN +PL +tq +Kk +sA +NA +NH +mA +ir +nn +sD +UW +dO +Bl +lq +Dy +au +IE +yy +fH +fH +fH +fH +fH +fH +hJ +ui +rQ +Fo +Fo +Fo +Fo +Fo +IK +xr +ND +fI +ZT +fI +NN +XG +fz +Hi +wL +Pk +Vg +qE +eY +vl +CJ +FS +ee +Eh +qv +Wh +iO +Np +nB +iY +zm +Oj +Vp +Vp ZZ ZZ ZZ @@ -46778,9 +52691,6 @@ ZZ ZZ ZZ ZZ -GW -Dj -gp ZZ ZZ ZZ @@ -46819,60 +52729,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(108,1,1) = {" ZZ ZZ ZZ @@ -46895,70 +52751,6 @@ ZZ ZZ ZZ ZZ -qx -hW -vs -Lb -Lb -Kz -KE -KE -Wv -Uw -qx -Er -Ur -sL -Qy -Qb -pa -WW -NQ -pY -En -En -Kp -Qy -Yz -ax -Gm -td -gJ -XZ -VG -gJ -Fj -cW -PU -kM -Rm -uu -Rm -wa -Rm -Uu -Gp -JF -Me -Lr -Gp -Gp -Gp -bh -cf -QA -Bs -fy -sd -zC -hO -YA -jp -Bs -XV -Ys -hX -jo ZZ ZZ ZZ @@ -46967,21 +52759,17 @@ ZZ ZZ ZZ ZZ -zu ZZ ZZ ZZ ZZ -ox -pN -Ek ZZ -Nh ZZ ZZ -zu ZZ ZZ +"} +(142,1,1) = {" ZZ ZZ ZZ @@ -47009,64 +52797,81 @@ ZZ ZZ ZZ ZZ +Nh ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(109,1,1) = {" +ZZ +tE +tE +tE +tE +ff +xN +xN +ie +eC +TG +sA +NA +Hz +sA +Km +Km +sA +OB +EY +xb +Ee +lV +au +by +SF +lM +rj +rj +rj +rj +Vd +rj +rj +rj +rj +rj +rj +rj +lM +BB +ha +bt +rj +oN +ui +Th +da +fz +wL +Xh +cU +Ts +wL +Xk +Cl +Xk +Xk +Xh +wL +jT +iO +iO +Io +im +ze +zm +Oj +Vp +Vp ZZ ZZ ZZ @@ -47089,95 +52894,6 @@ ZZ ZZ ZZ ZZ -qx -qo -dR -XE -QU -zt -eG -yi -vn -hb -qx -pe -NW -nt -Qy -Dv -Dv -Dv -Dv -Ju -Dv -Dv -Dv -eL -la -ax -Gm -SD -CO -FB -up -Yl -kC -kC -gK -bA -mX -Fg -wG -sP -at -at -Xp -Gp -Gp -Gp -Gp -Zw -Qk -Dw -cf -Tt -jo -jo -jo -yL -JH -jo -jo -jo -Ro -Bn -cb -jo -jo -Sg -Sg -Sg -jo -Sg -Sg -VB -jo -Sg -Sg -VB -jo -qv -bE -qv -jo -Sg -Sg -Sg -jo -Sg -Sg -VB -pM ZZ ZZ ZZ @@ -47207,60 +52923,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(110,1,1) = {" ZZ ZZ ZZ @@ -47283,95 +52945,6 @@ ZZ ZZ ZZ ZZ -qx -Zx -RZ -vD -eR -Wq -eR -qx -vY -cy -qx -md -ke -md -Qy -Ep -Dv -Dv -Dv -tC -eA -eA -jq -fl -Ug -sM -tL -ig -CO -pQ -OG -vz -Fj -vi -PU -kw -LX -YJ -vQ -HD -AN -Xo -Xp -Zw -Zw -Zw -Zw -Zw -Qk -Wo -IK -py -lv -UH -oo -vh -cj -SX -wn -DP -ve -Bn -XD -mo -Bh -ve -ve -ve -ve -Cw -ve -ve -LD -ve -ve -ve -ve -yj -Sy -xn -LD -ve -ve -pd -Bi -ve -ve -ve -hf ZZ ZZ ZZ @@ -47389,6 +52962,8 @@ ZZ ZZ ZZ ZZ +"} +(143,1,1) = {" ZZ ZZ ZZ @@ -47401,60 +52976,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(111,1,1) = {" ZZ ZZ ZZ @@ -47477,95 +52998,84 @@ ZZ ZZ ZZ ZZ -mI -mI -mI -qx -JD -bp -Nl -qx -mI -mI -mI -bQ -qm -sh -Qy -YC -JP -Uc -mM -rA -oV -bN -Jk -Qy -Yi -eZ -Gm -Fj -gJ -uv -sG -gJ -Fj -Db -PU -Rm -sH -Rm -Xp -Xp -Xp -Xp -Xp -zM -zM -zM -zM -zM -GH -fm -mv -tz -RW -Ng -vd -ks -sO -RJ -RJ -dM -RJ -jJ -aD -db -yN -FC -rL -FK -FK -tF -Mo -FC -pG -FC -FC -FC -FC -TN -qn -cv -Oo -cv -cv -rH -Ye -ve -SM -ve -hf +ZZ +tE +tE +Zw +xN +Ch +OO +eC +aS +sA +sA +Mw +sA +HF +HF +Mf +au +au +YU +gU +au +au +AV +JE +oF +ai +Te +OH +XC +uK +Lm +JE +Gx +FA +JE +Ip +JE +cw +BY +Ps +lb +Ed +Ge +Ta +Hf +Hq +Cd +cG +mV +bj +Qz +Vb +an +mV +mV +yb +bj +kp +Hd +Ha +XJ +Pp +Gc +gN +EW +Oj +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -47595,60 +53105,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(112,1,1) = {" ZZ ZZ ZZ @@ -47671,95 +53127,6 @@ ZZ ZZ ZZ ZZ -mI -Hk -Li -qx -PK -so -Sv -qx -Je -Qt -mI -ya -qm -bQ -Qy -FG -NU -Xu -Ls -Bk -oV -Kb -wu -Qy -ge -ax -Gm -Fj -Fj -jd -Fj -Fj -Fj -Fq -PU -PP -Be -kY -Xp -cL -sh -Qx -wc -Iq -gT -sm -Yp -wc -Qk -PB -iH -Vl -EO -VJ -Jy -IR -FN -VJ -MK -Pb -ve -Bn -Ms -EU -QE -ve -fa -Ti -zT -QP -ve -ve -tG -ve -ve -Ti -fa -LM -ve -ve -tG -ve -ve -tA -ve -ve -ve -ve -hf ZZ ZZ ZZ @@ -47789,60 +53156,21 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(113,1,1) = {" +(144,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -47865,95 +53193,75 @@ ZZ ZZ ZZ ZZ -mI -bT -wT -qx -qx -AJ -qx -vD -bT -wT -mI -bQ -qm -bQ -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Qy -Ia -Xj -Gm -Pd -No -Hl -ww -hv -Mu -HL -PU -eu -VO -Do -Xp -zd -ej -Vc -Ig -RH -er -uY -VV -VF -Qk -In -cf -XB -fz -jo -jo -jo -ZM -jo -jo -jo -jo -Xf -kW -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -jo -Rh -Rh -Kd -Kd -Kd -Kd -Kd -ua +ZZ +tE +Zw +xN +lJ +AG +Kk +aS +AR +mH +vG +Rc +hx +hx +pO +fL +ma +ec +ro +Pl +fL +qL +qL +rW +qL +qL +qL +sp +dA +MV +MV +sp +sp +aL +aL +aL +aL +yh +jX +aL +ki +aL +Lw +Vo +ZF +Fp +Wm +jn +Xb +JX +jn +jn +Xk +jn +GP +jn +Wm +Up +rr +rm +WE +rZ +DC +EW +Oj +Vp +Vp +ZZ +ZZ ZZ ZZ ZZ @@ -47983,60 +53291,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(114,1,1) = {" ZZ ZZ ZZ @@ -48059,87 +53313,6 @@ ZZ ZZ ZZ ZZ -mI -ea -cz -xX -js -nl -Ca -hy -nw -tP -mI -bQ -qm -bQ -bQ -Ag -bQ -pb -sh -ZL -Fx -Ad -Bu -zM -HV -XN -tL -tL -tL -tL -tL -tL -tL -tL -tL -Xp -Xp -Xp -Xp -UI -Us -Sz -aG -GO -xY -Xm -tR -il -Fi -eJ -XL -BS -fz -qk -lH -NG -wF -pW -RE -wm -LC -PZ -vf -sv -lf -lf -lf -lf -lf -lf -lf -lf -lf -lf -sC -Qg -Qg -Qg -MJ -BP -Of ZZ ZZ ZZ @@ -48177,60 +53350,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(115,1,1) = {" +(145,1,1) = {" ZZ ZZ ZZ @@ -48253,87 +53374,6 @@ ZZ ZZ ZZ ZZ -mI -wW -yq -yq -yq -Nz -yq -yq -yq -NV -mI -bQ -Wy -ej -dl -Ox -dl -sx -Xs -dl -dl -dl -dl -wB -Oa -JI -Jl -gb -Bv -gb -nY -gb -gb -FW -gb -gb -gb -gb -HW -Pv -qs -Ev -oS -Yx -bR -kT -XS -UL -Qk -pZ -dN -eB -fz -Nt -ht -oI -JB -ot -ot -GR -LC -Qg -Ap -Qg -Qg -Qg -fv -Qg -Qg -Qg -Qg -Qg -Qg -Qg -ZW -GZ -BF -tV -tl -yu -Of ZZ ZZ ZZ @@ -48348,6 +53388,81 @@ ZZ ZZ ZZ ZZ +Zw +Zw +xN +eC +yY +hf +aS +yt +hx +hx +hx +hx +hx +RB +fL +Sf +ld +rd +sk +fL +qL +MH +sq +VS +oY +qL +Sr +Et +ID +ws +US +sp +zY +zY +zY +aL +uz +ni +aL +hN +aL +aE +ui +pR +fz +Mt +eY +wL +pT +wL +eY +HK +Lv +So +yQ +IF +qv +Zs +DQ +zm +Jz +iO +zm +Oj +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -48371,60 +53486,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(116,1,1) = {" ZZ ZZ ZZ @@ -48446,88 +53507,6 @@ ZZ ZZ ZZ ZZ -ce -mI -Zp -gV -Uk -Uk -wq -qQ -qQ -SO -rR -mI -ta -ta -ta -ta -jF -ta -ta -ta -ta -ta -ta -ta -ta -Zk -Md -zM -Rx -Ag -bQ -Fx -sh -cm -ta -iz -IW -IW -df -Tb -IW -kX -kX -kX -kX -kX -kX -Qk -Qk -Qk -aQ -dB -hg -SK -SK -SK -SK -SK -SK -SK -LC -LC -Qg -Ap -aF -Qg -Qg -Ji -fv -Qg -Qg -Jh -fv -Qg -Qg -rF -LR -Mm -Qg -UR -AF -Of ZZ ZZ ZZ @@ -48565,60 +53544,22 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(117,1,1) = {" +(146,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -48641,87 +53582,73 @@ ZZ ZZ ZZ ZZ -mI -We -SY -pf -UD -Ss -oL -pf -ys -cH -mI Zw Zw +xN +eC +SN +hf +yE +hx +hx +Rg +fT +yz +UG +nF +dX +XP +aA +NL +Ej +se +qL +gM +sq +tN +sq +Lq +uG +Et +xG +qg +kj +sp +cY +cY +cY +aL +NP +ni +aL +hN +aL +bc +ui +tn +fz +OV +tB +KG +eY +qE +Xk +Ef +wL +pC +wL +uq +oh +Sm +Mj +zm +Nf +iO +Qc +Gr Vp -ta -qm -bQ -ta -Zw -Zw Vp Vp -Zw -ta -Jm -ta -ta -ta -ta -ta -ta -ta -ta -ta -Ag -df -Ni -qU -Sa -IW -kX -uW -uW -uW -uW -kX -Qk -ek -Ic -fA -QD -lC -wM -Ar -pm -hi -xa -nf -SK -Vj -MJ -Qg -Ap -Qg -Qg -Qg -Qg -Qg -fv -Qg -Qg -Qg -Qg -LR -Ap -Qg -mf -Qg -UR -Vj -LC ZZ ZZ ZZ @@ -48759,60 +53686,74 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ "} -(118,1,1) = {" +(147,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -48835,88 +53776,73 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -Fy -Px -Px -Px -Yu -dS -cH -mI Zw Zw +xN +uB +fW +hf +yE +hx +hx +ur +Va +lY +kl +nk +To +wY +rl +Ab +ZH +oj +qL +Uo +qf +As +sq +Lq +GI +Et +xG +dQ +Bo +sp +jc +PQ +PQ +sf +Ir +nu +aL +hN +aL +vc +ui +eP +fz +qE +MG +eY +kr +fS +kf +Kj +ja +aU +ja +dG +qv +qv +oZ +zm +ti +II +lc +Gr +Vp +Vp Vp -ta -qm -bQ -ta -Zw -Zw -ta -ta -ta -ta -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -ta -TA -Zf -KS -mj -yI -IW -kX -uW -uW -uW -uW -kX -Qk -sT -Py -EJ -cf -yg -wM -xW -UP -tb -nc -Wc -SK -bS -Wp -Qg -Si -Jh -Qg -Qg -fv -Wp -Qg -Qg -Qg -LR -Qg -Qg -Ap -LR -Wp -Qg -gt -Vj -LC -Lh ZZ ZZ ZZ @@ -48953,60 +53879,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(119,1,1) = {" ZZ ZZ ZZ @@ -49029,87 +53901,6 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -bK -xp -xp -xp -Ff -dS -cH -mI -Zw -Zw -Vp -ta -qm -bQ -ta -ta -ta -ta -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -Jm -xB -IW -IW -IW -IW -IW -kX -uW -uW -uW -uW -kX -Qk -Tg -Py -pn -cf -fM -dn -nZ -qH -yc -Vx -Jq -SK -UR -yH -Qg -Ap -Qg -Qg -bJ -Qg -yH -Qg -LR -fv -fv -fv -LR -Ap -Qg -yH -YM -GD -Vj -LC ZZ ZZ ZZ @@ -49141,66 +53932,14 @@ ZZ ZZ ZZ ZZ +"} +(148,1,1) = {" ZZ ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(120,1,1) = {" ZZ ZZ ZZ @@ -49223,87 +53962,103 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -bK -xp -xp -Xe -Ff -dS -cH -mI -Zw -Zw -Vp -ta -qm -bQ -ta -ta -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -ta -ta -ta -ta -ta -xB -UX -jD -GX -ym -zG -kX -uW -uW -uW -uW -kX -Qk -Cp -go -SR -cf -Uy -wM -Dx -PM -wo -yd -Jq -jt -KH -nC -De -af -Qg -Qg -Qg -Qg -pA -Qg -Qg -Qg -LR -Qg -Qg -Ap -LR -pA -Qg -jj -Vj -LC +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Zw +Zw +xN +eC +kx +hf +yE +hx +hx +sc +If +oJ +wR +LJ +dX +op +eD +nV +jO +vT +qL +CN +IQ +vL +sq +Lq +Mk +du +yW +dv +tv +sp +rb +qh +qh +iE +SI +Tv +aL +Nq +aL +iW +ui +eP +Go +Go +Go +Go +Go +Go +ZK +ZK +Hu +yG +Hu +sj +jf +Gr +Gr +Gr +Gr +Gr +Gr +Gr +Zw +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -49341,60 +54096,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(121,1,1) = {" ZZ ZZ ZZ @@ -49417,87 +54118,6 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -bK -xp -xp -xp -Ff -dS -cH -mI -Zw -Zw -Vp -ta -qm -bQ -bQ -ta -bQ -bQ -bQ -bQ -ta -ta -ta -ta -ta -ta -ta -Vp -Vp -Zw -ta -xB -UX -nz -vM -jZ -zG -kX -kX -uW -uW -TO -kX -Qk -Qk -Qk -hp -TH -EI -SK -LW -Cf -al -iG -Jq -SK -jj -Qg -Qg -Ap -fv -Qg -Qg -Qg -YM -Qg -Qg -Qg -Qg -Qg -LR -Ap -Qg -Mm -Qg -jj -AF -Of ZZ ZZ ZZ @@ -49506,6 +54126,8 @@ ZZ ZZ ZZ ZZ +"} +(149,1,1) = {" ZZ ZZ ZZ @@ -49535,60 +54157,86 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(122,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Zw +Zw +xN +tu +Df +hf +aS +OQ +hx +hx +hx +jk +zs +yJ +fL +Rd +MN +gD +Rb +Ew +qL +gl +aO +sq +sq +sJ +lh +Et +id +id +VI +sp +be +UF +UF +aL +Ob +zJ +aL +hN +aL +xM +ui +eP +Go +hZ +Go +vP +Go +oM +ZK +MZ +LB +NO +GN +Hn +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Vp +Vp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -49611,87 +54259,6 @@ ZZ ZZ ZZ ZZ -mI -We -Sh -Lu -va -va -va -HC -dS -cH -mI -Zw -Zw -ta -ta -qm -bQ -bQ -bQ -bQ -bQ -bQ -ta -ta -Zw -Zw -Vp -Zw -Vp -Zw -Zw -Zw -Zw -ta -xB -UX -uH -QZ -Ay -UX -cM -OA -OA -OA -dz -lU -fh -Qp -wb -KQ -cf -mx -SK -SK -SK -SK -SK -SK -SK -Uj -fv -Qg -Pc -Qg -fv -Qg -Qg -Qg -aF -Qg -fv -Qg -Qg -Qg -cI -Km -GZ -tV -zz -mz -Of ZZ ZZ ZZ @@ -49729,66 +54296,11 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(123,1,1) = {" ZZ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -49805,90 +54317,11 @@ ZZ ZZ ZZ ZZ -mI -We -sZ -FF -FF -FF -FF -FF -Ll -cH -mI -Zw -ta -ta -bQ -qm -bQ -bQ -bQ -bQ -ta -ta -ta -Vp -UT -UT -UT -UT -UT -Eu -Eu -Eu -Eu -Eu -uw -UX -UX -AD -UX -UX -wl -ui -ui -ui -ui -ui -ui -ui -ui -CQ -cf -mx -LC -Qg -Qg -Qg -YM -Qg -Qg -fv -Qg -Bg -Fm -Qg -Qg -fv -Qg -Qg -Qg -Qg -Qg -Qg -fv -Qg -Qg -Qg -zX -Wp -Qg -gt -Of ZZ ZZ ZZ +"} +(150,1,1) = {" ZZ ZZ ZZ @@ -49923,62 +54356,74 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(124,1,1) = {" ZZ ZZ +Zw +Zw +xN +Ma +Fu +kn +aS +oz +qP +Tm +we +Dg +dV +aS +fL +jA +Iu +RA +Oq +rz +qL +Jo +aO +dy +Gk +aI +kP +BD +pD +cA +Nr +sp +vj +vj +vj +aL +lk +lk +aL +hN +aL +OD +ui +kN +Go +ul +Go +ep +Go +fc +ZK +LB +wL +gE +wL +tf +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw ZZ ZZ ZZ @@ -49999,87 +54444,6 @@ ZZ ZZ ZZ ZZ -mI -Ku -zv -zv -zv -NJ -zv -zv -zv -Ph -mI -Vp -ta -bQ -tm -Nd -bQ -ta -ta -ta -ta -Zw -Zw -Zw -UT -bz -mD -nG -UT -Eu -pp -tI -Mi -Eu -Sw -zx -Nk -Sj -Ke -Ru -aB -Cg -Cg -Cg -Cg -Cg -Cg -Cg -Cg -ZE -TU -cN -LC -Vj -Vj -Vj -Vj -Vj -KA -AF -Wp -Qg -ll -Qg -Qg -Qg -Qg -Jh -Qg -Qg -Qg -Qg -Qg -Qg -Qg -Qg -Qg -LC -LC -LC -LC ZZ ZZ ZZ @@ -50117,60 +54481,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(125,1,1) = {" ZZ ZZ ZZ @@ -50193,88 +54503,6 @@ ZZ ZZ ZZ ZZ -mI -mI -mI -mI -mI -mI -zM -zM -zM -zM -zM -ta -ta -bQ -qm -ta -ta -ta -UT -UT -UT -UT -UT -UT -UT -tW -oe -ew -UT -Eu -Gt -LA -eQ -Eu -Pq -dC -qF -Vu -Vu -nL -nL -nL -nL -nL -nL -nL -nL -nL -nL -ca -OR -lC -LC -LC -LC -LC -LC -LC -LC -LC -LC -wD -yo -Lo -fD -Vj -Vj -Vj -Vj -Vj -Wp -Vj -kq -Vj -Vj -Qg -Qg -LC -Vp -Vp -Vp -CV ZZ ZZ ZZ @@ -50286,6 +54514,8 @@ ZZ ZZ ZZ ZZ +"} +(151,1,1) = {" ZZ ZZ ZZ @@ -50311,60 +54541,83 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(126,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +Zw +xN +ta +uT +yR +ua +ua +yF +ua +PS +zg +NZ +aS +fL +fL +fL +fL +fL +fL +qL +Tz +zZ +Lq +qL +qL +PT +Et +Oi +sp +za +sp +aL +aL +aL +aL +aL +aL +aL +hN +aL +aE +qW +mS +ED +GM +Qj +Ok +oG +SU +ZK +Sp +wL +iI +fR +jf +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw ZZ ZZ ZZ @@ -50391,83 +54644,6 @@ ZZ ZZ ZZ ZZ -Go -ZK -ta -xL -BE -mq -iw -ta -ta -bQ -qm -ta -Zw -Zw -UT -sK -Rj -Rj -NK -UT -UT -UT -Za -UT -UT -Eu -xQ -Cz -Cc -Eu -JO -Ky -gq -Fo -az -az -Fo -rQ -ui -ui -rQ -Fo -Fo -Fo -Fo -Fo -IK -zr -hA -jG -CZ -kF -fF -OJ -OJ -OJ -hT -Zu -Qg -lB -rg -wy -IH -IH -IH -IH -IH -IH -IH -IH -IH -VU -gS -gS -Vp -Vp -Vp ZZ ZZ ZZ @@ -50505,60 +54681,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(127,1,1) = {" ZZ ZZ ZZ @@ -50584,86 +54706,10 @@ ZZ ZZ ZZ ZZ -Go -MF -bQ -jR -bQ -bQ -bQ -nd -mh -ta -bQ -qm -ta -Zw -Zw -UT -Zz -mU -mU -on -UT -fG -Dt -qJ -aZ -Gw -Eu -Eu -UV -Eu -Eu -FL -ui -Fo -Fo -Ld -UA -Fo -Fo -ui -ui -Fo -Hy -UA -Qe -uy -Fo -SF -Bz -AA -lx -lx -lx -AM -RM -bf -bf -bf -bf -bf -bf -ly -TP -IH -YD -ay -Fw -ZD -OZ -hF -OZ -IH -mi -bg -gS -SS -Vp -Vp ZZ ZZ +"} +(152,1,1) = {" ZZ ZZ ZZ @@ -50699,60 +54745,101 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(128,1,1) = {" +ZZ +ZZ +Zw +Zw +Zw +uT +dT +yV +hL +Kf +ua +Cm +zg +Ws +Xr +GY +bI +xm +vG +ut +LK +dv +lI +vI +wP +LK +dH +qO +Et +fV +sp +KL +sp +iK +oB +eV +BG +BG +BG +BG +IT +aL +aE +om +KY +Go +xj +kZ +uA +dP +Pf +jf +jf +jf +jf +jf +jf +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -50778,84 +54865,6 @@ ZZ ZZ ZZ ZZ -aS -zU -zU -bQ -bQ -bQ -bQ -bQ -bQ -ta -bQ -qm -ta -ta -Vp -UT -El -RX -Gw -YS -UT -fg -Td -Am -La -Di -hY -WF -tc -Gq -hY -Qo -oN -Fo -Fo -tx -tx -Fo -Fo -ui -ui -Fo -Hy -Ie -gZ -el -Fo -ui -Gf -hA -rM -cu -cu -Rl -BM -bf -sz -po -QX -QS -bf -BO -HG -ou -PA -CM -By -Iz -dJ -OZ -OZ -ed -mi -pq -cZ -Vp -Vp -Vp ZZ ZZ ZZ @@ -50893,60 +54902,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(129,1,1) = {" +(153,1,1) = {" ZZ ZZ ZZ @@ -50972,84 +54929,6 @@ ZZ ZZ ZZ ZZ -aS -bv -YH -bQ -bQ -ZA -bQ -bQ -bQ -Jm -bQ -qm -bQ -ta -Zw -UT -mp -Zb -EA -zj -ez -Vt -cK -Lx -bq -Lg -hD -zE -CX -ku -MR -Wz -cf -Fo -mL -sR -mL -sR -uM -ui -ui -sR -Hy -UA -xT -el -Fo -ui -TB -hA -GJ -QY -jP -xD -Hb -kb -jx -Rv -ov -JR -Pw -qu -dd -IH -XI -mW -vV -vV -qe -Rf -Rf -IH -mi -mi -cZ -Vp -Vp -Vp ZZ ZZ ZZ @@ -51062,6 +54941,74 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +uT +nU +Vw +wZ +Yv +ua +IJ +Hs +pK +qM +Dd +qM +YK +qM +Wk +HE +HE +CG +gG +ka +HE +HE +HE +JG +VA +sp +KM +sp +Vm +AL +aL +Pa +Zr +ty +AU +Ym +aL +iM +vp +Sd +qT +qT +qT +qT +qT +qT +qT +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51087,60 +55034,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(130,1,1) = {" ZZ ZZ ZZ @@ -51166,84 +55059,6 @@ ZZ ZZ ZZ ZZ -aS -aM -aM -bQ -bQ -bQ -bQ -bQ -bQ -ta -bQ -Wy -hz -ta -Zw -UT -Fa -Uz -Gw -Pe -UT -my -At -uQ -cO -zO -of -Lc -tc -Wf -ZP -RV -cf -sR -NI -NI -NI -NI -NI -NI -hJ -hJ -mL -Fo -Dq -Ub -Fo -ui -mJ -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -PW -cB -bo -IH -mB -ar -TZ -yp -MD -Rf -Rf -IH -mi -kK -gS -Vp -Vp -Vp ZZ ZZ ZZ @@ -51281,60 +55096,21 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(131,1,1) = {" +(154,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51360,84 +55136,123 @@ ZZ ZZ ZZ ZZ -Ij -MF -bQ -xI -bQ -bQ -bQ -Ag -qK -ta -bQ -bQ -qm -ta Zw -UT -Zz -mU -mU -ft -UT -yM -mU -qJ -An -Gw -iD -iD -Ci -iD -iD -pU -cf -uM -fQ -ho -ho -ho -ho -Ka -PC -hJ -sR -Fo -UA -UA -Fo -SA -wj -KI -ko -IG -IG -IG -IG -Wb -VY -UQ -zp -OF -PW -Zl -Qi -DG -DG -DG -DG -DG -DG -DG -DG -DG -xk -DG -DG -DG -Vp -Vp +Zw +uT +uT +uT +ua +tM +Wi +He +FI +sE +rs +qN +rs +Ez +Cr +ut +tO +dk +Ol +KC +YB +rN +vJ +UN +Ae +Ec +sp +wI +sp +ny +Pj +Lt +Lt +Lt +Lt +Lt +Ks +Ks +yT +IX +yT +um +ZZ +CW +CW +CW +AY +AY +CW +CW +CW +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51475,60 +55290,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(132,1,1) = {" +(155,1,1) = {" ZZ ZZ ZZ @@ -51555,83 +55318,6 @@ ZZ ZZ ZZ ZZ -Ij -DB -ta -Ja -Wg -Wl -sy -ta -ta -ta -bQ -ga -ta -Zw -UT -HZ -XW -XW -QQ -UT -UT -UT -Za -UT -UT -iD -Aq -pS -bZ -iD -pU -cf -ui -qt -hJ -hJ -hJ -hJ -Ka -PC -hJ -HR -Fo -tx -tx -rQ -VE -Em -PW -dc -TS -TS -TS -TS -Ix -TS -fq -Kl -WM -My -Zl -kJ -DG -gF -DX -Ns -mF -mF -tH -BU -YF -mF -mF -mF -ry -Vp -Vp ZZ ZZ ZZ @@ -51644,6 +55330,70 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +Zw +uT +vu +Mv +uT +hf +hf +Kc +Kc +Kc +Kc +hf +hf +hf +Eg +Eg +IY +IY +IY +IY +Eg +Eg +Eg +Eg +Eg +Eg +Eg +uO +uO +uO +Zw +Zw +Zw +Zw +um +ao +Vk +fX +ue +um +ZZ +CW +lP +CW +xv +xg +CW +CB +CW +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51669,60 +55419,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(133,1,1) = {" ZZ ZZ ZZ @@ -51751,81 +55447,6 @@ ZZ ZZ ZZ ZZ -ta -ta -ta -ta -ta -ta -Zw -ta -SB -ga -ta -ta -UT -UT -UT -UT -UT -UT -UT -ok -Fl -xZ -UT -iD -sF -tY -tX -iD -pU -cf -ui -iJ -hk -iq -eb -hJ -SE -PC -hJ -ui -ui -ui -ui -ui -cf -he -AQ -hq -IP -IP -IP -aj -vm -yC -qC -iP -lR -My -Zl -bD -DG -BA -aR -Ns -mF -mF -mF -mF -Ra -JC -JC -Ra -ry -Vp -Vp ZZ ZZ ZZ @@ -51863,60 +55484,19 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(134,1,1) = {" +(156,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -51946,85 +55526,63 @@ ZZ ZZ ZZ ZZ -Vp -Vp -Zw Zw Zw +uT +uT +uT +uT Zw -ta -SB -tk -ta -nX -Df -DW -Df -Df -Uh -Uh -UT -Fs -Kv -nE -UT -iD -WR -Vv -Fd -iD -Vn -KB -rj -vq -le -pV -Tk -hJ -SE -PC -hJ -ui -ui -ui -ui -ui -cf -vg -PW -PW -PW -PW -PW -PW -PW -aX -fq -KK -ZB -My -Hc -Jp -RD -YN -LY -bl -bl -wr -bl -oU -pJ -Ex -Xz -MM -ry -Vp -Vp +tE +tE +tE +tE +tE +ls +Zw +Zw +Zw +tE +tE +tE +tE +tE +tE +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +Zw +um +GF +Zd +dm +Ri +um ZZ +QV +av +Gd +EQ +Zy +Nb +hC +QV ZZ ZZ ZZ ZZ +Zw +Zw +Zw ZZ ZZ ZZ @@ -52057,60 +55615,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(135,1,1) = {" ZZ ZZ ZZ @@ -52141,79 +55645,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -Df -yl -Ba -bV -DO -hw -bm -kn -Dm -in -UT -UT -UT -UT -UT -iD -iD -iD -iD -iD -lm -cf -ui -Mg -hJ -hJ -hJ -hJ -Ka -PC -hJ -HR -Fo -az -az -rQ -cf -WT -cE -BV -fZ -bb -OK -Po -PW -Jj -fq -BH -wh -My -Zl -sU -DG -Nm -Kt -mF -mF -Bt -Xv -Yf -ba -Xd -Vh -MM -ry -Vp -Vp ZZ ZZ ZZ @@ -52247,64 +55678,12 @@ ZZ ZZ ZZ ZZ +"} +(157,1,1) = {" ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(136,1,1) = {" ZZ ZZ ZZ @@ -52335,79 +55714,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -Df -bi -Sk -Df -Df -ta -tT -eC -Hp -Uh -au -fn -NF -mC -Op -Co -Ty -Gb -zK -au -Uq -cf -uM -pg -RY -RY -RY -RY -Ka -PC -hJ -sR -Fo -ON -UA -Fo -cf -WT -DH -BW -Zo -iT -Zo -Yn -EK -br -fq -Oh -KR -My -Bf -Qi -DG -mF -Kt -mF -mF -qS -mF -Yf -Ra -PN -PN -Ra -ry -Vp -Vp ZZ ZZ ZZ @@ -52415,6 +55721,60 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +Zw +Zw +Zw +Zw +ZZ +ZZ +ZZ +ZZ +tE +tE +Zw +Zw +tE +tE +tE +tE +tE +tE +tE +Zw +Zw +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +um +nJ +JW +iS +Oe +um +ZZ +CW +BR +hM +as +Ai +Mc +WV +CW +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -52445,60 +55805,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(137,1,1) = {" ZZ ZZ ZZ @@ -52529,79 +55835,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -Df -Vy -Df -Df -Rk -ta -HM -eC -ts -uN -au -iB -lq -lq -lq -CA -ZG -vZ -GG -au -SQ -cf -sR -fH -fH -fH -fH -fH -fH -hJ -hJ -mL -Fo -Bx -oa -Fo -cf -qG -CH -Ft -Bd -xe -hu -zL -WN -mT -Dc -jz -tU -IB -Ue -Mx -DG -mF -Kt -mF -mF -xV -eS -Gy -WD -XT -YV -mG -ry -Vp -Vp ZZ ZZ ZZ @@ -52639,60 +55872,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(138,1,1) = {" +(158,1,1) = {" ZZ ZZ ZZ @@ -52723,79 +55904,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -Zw -Zw -ta -ta -ta -ta -ta -ta -ta -lJ -Kk -Uh -eN -au -ql -dw -Le -rK -hl -Ac -QO -Om -au -Jv -cf -Fo -mL -sR -mL -sR -uM -ui -ui -sR -Hy -UA -gZ -el -Fo -cf -qG -DH -gg -Zo -ZC -Zo -lS -pl -Yb -cD -QF -hB -PW -zV -OP -DG -aC -xE -Od -JK -zh -zh -zh -zh -zh -zh -zh -DG -Vp -Vp ZZ ZZ ZZ @@ -52808,6 +55916,12 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw +Zw +Zw +Zw ZZ ZZ ZZ @@ -52815,6 +55929,13 @@ ZZ ZZ ZZ ZZ +tE +tE +tE +Zw +Zw +tE +tE ZZ ZZ ZZ @@ -52828,65 +55949,26 @@ ZZ ZZ ZZ ZZ +um +hG +ck +qX +ak +um +um +CW +CW +CW +tD +CK +CW +CW +CW ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(139,1,1) = {" ZZ ZZ ZZ @@ -52917,79 +55999,6 @@ ZZ ZZ ZZ ZZ -Vp -tE -tE -tE -Zw -Zw -Zw -Zw -Zw -Zw -Zw -ta -eC -sA -sA -sA -sA -sA -sA -sA -ad -nv -dI -fs -OU -au -Vn -cf -Fo -Fo -az -az -Fo -Fo -ui -ui -Fo -Hy -UA -xT -el -Fo -cf -qG -ZI -gi -Bm -nx -YO -rx -PW -PW -PW -PW -PW -PW -wy -wy -zh -zh -zh -zh -zh -zh -St -zm -Yr -ey -zw -Gr -Vp -Vp -Vp ZZ ZZ ZZ @@ -53027,60 +56036,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(140,1,1) = {" ZZ ZZ ZZ @@ -53111,78 +56066,10 @@ ZZ ZZ ZZ ZZ +"} +(159,1,1) = {" ZZ ZZ -tE -tE -tE -tE -tE -Zw -Zw -ta -ta -ta -eC -sA -NA -uo -uX -fw -ob -sA -ih -Gi -dI -CL -lQ -au -Fz -cf -Fo -Fo -ON -UA -Fo -Fo -ui -ui -Fo -Hy -UA -LP -ik -Fo -cf -qG -PW -PW -PW -PW -PW -PW -EM -Xc -eY -qE -CE -nM -Gh -qz -Rw -wS -ja -no -Gr -kA -zm -zm -kh -EW -Qc -Gr -Vp -Vp ZZ ZZ ZZ @@ -53221,60 +56108,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(141,1,1) = {" ZZ ZZ ZZ @@ -53292,6 +56125,9 @@ ZZ ZZ ZZ ZZ +Zw +Zw +Zw ZZ ZZ ZZ @@ -53307,76 +56143,22 @@ ZZ ZZ ZZ ZZ -tE -tE -tE -tE -tE -tE -tE -ta -PL -tq -Kk -sA -NA -NH -mA -ir -nn -sD -UW -dO -Bl -lq -Dy -au -IE -yy -Rt -Fo -tx -tx -Fo -rQ -ui -ui -rQ -Fo -Fo -Fo -Fo -Fo -IK -xr -ND -fI -ZT -fI -NN -XG -fz -Hi -wL -Pk -Vg -qE -eY -vl -CJ -FS -ee -Eh -Gr -Wh -iO -Np -nB -iY -zm -Oj -Vp -Vp +um +LV +ck +pP +Jn +WG +oA +xd +ju +cF +ab +hQ +DF +pB +OL +ZZ ZZ ZZ ZZ @@ -53415,60 +56197,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(142,1,1) = {" ZZ ZZ ZZ @@ -53496,81 +56224,11 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ ZZ ZZ -tE -tE -tE -tE -ff -ta -ta -ie -eC -TG -sA -NA -Hz -sA -sA -sA -sA -OB -EY -xb -Ee -lV -au -by -SF -LS -rj -rj -rj -rj -Vd -rj -rj -rj -rj -rj -rj -rj -lM -BB -ha -bt -rj -oN -ui -Th -da -fz -wL -Xh -cU -Ts -wL -Xk -Cl -Xk -Xk -Xh -wL -jT -iO -iO -Io -im -ze -zm -Oj -Vp -Vp ZZ ZZ ZZ @@ -53602,6 +56260,9 @@ ZZ ZZ ZZ ZZ +"} +(160,1,1) = {" +ZZ ZZ ZZ ZZ @@ -53609,60 +56270,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(143,1,1) = {" ZZ ZZ ZZ @@ -53698,73 +56305,6 @@ ZZ ZZ ZZ ZZ -tE -tE -Zw -ta -Ch -OO -eC -Mf -sA -sA -Mw -sA -HF -HF -Mf -au -au -YU -gU -au -au -AV -JE -oF -ai -Te -OH -XC -uK -Lm -JE -Gx -FA -JE -Ip -JE -cw -BY -Ps -lb -Ed -Ge -Ta -Hf -Hq -Cd -cG -mV -bj -Qz -Vb -an -mV -mV -yb -bj -kp -Hd -Ha -XJ -Pp -Gc -gN -EW -Oj -Vp -Vp ZZ ZZ ZZ @@ -53797,66 +56337,30 @@ ZZ ZZ ZZ ZZ +um +Jx +Sq +Vk +Vk +hh +sX +jI +Xy +oR +mk +oq +pz +Yq +pi +ZZ +ZZ +ZZ ZZ ZZ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(144,1,1) = {" ZZ ZZ ZZ @@ -53893,72 +56397,6 @@ ZZ ZZ ZZ ZZ -tE -Zw -ta -lJ -AG -Kk -Mf -AR -mH -vG -Rc -hx -hx -pO -fL -ma -ec -ro -Pl -fL -qL -qL -rW -qL -qL -qL -sp -dA -MV -MY -sp -sp -Lt -Lt -Lt -Lt -yh -jX -Lt -ki -aL -Lw -Vo -ZF -Fp -Wm -jn -Xb -JX -jn -jn -Xk -jn -GP -jn -Wm -Up -rr -rm -WE -rZ -DC -EW -Oj -Vp -Vp ZZ ZZ ZZ @@ -53997,60 +56435,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(145,1,1) = {" ZZ ZZ ZZ @@ -54070,6 +56454,8 @@ ZZ ZZ ZZ ZZ +"} +(161,1,1) = {" ZZ ZZ ZZ @@ -54087,72 +56473,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -eC -yY -Mf -Mf -yt -hx -hx -hx -hx -hx -RB -fL -Sf -ld -rd -sk -fL -qL -MH -sq -VS -oY -qL -Sr -Et -ID -ws -US -sp -zY -zY -zY -Lt -uz -ni -Lt -hN -aL -aE -ui -pR -fz -Mt -eY -wL -pT -wL -eY -HK -Lv -So -yQ -IF -Gr -Zs -DQ -zm -Jz -iO -zm -Oj -Vp -Vp ZZ ZZ ZZ @@ -54191,60 +56511,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(146,1,1) = {" ZZ ZZ ZZ @@ -54265,6 +56531,21 @@ ZZ ZZ ZZ ZZ +um +yT +yT +yT +yT +um +um +pi +pi +pi +eH +pX +OS +pi +pi ZZ ZZ ZZ @@ -54281,73 +56562,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -eC -SN -Mf -yE -hx -hx -Rg -fT -yz -UG -nF -dX -XP -aA -NL -Ej -se -qL -gM -sq -tN -sq -Lq -uG -Et -xG -qg -kj -sp -cY -cY -cY -Lt -NP -ni -Lt -hN -aL -bc -ui -tn -fz -OV -tB -KG -eY -qE -Xk -Ef -wL -pC -wL -uq -oh -Sm -Mj -zm -Nf -iO -Qc -Gr -Vp -Vp -Vp ZZ ZZ ZZ @@ -54385,60 +56599,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(147,1,1) = {" ZZ ZZ ZZ @@ -54475,73 +56635,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -uB -fW -Mf -yE -hx -hx -ur -Va -lY -kl -nk -To -wY -rl -Ab -ZH -oj -qL -Uo -qf -As -sq -Lq -GI -Et -xG -dQ -Bo -sp -jc -PQ -PQ -sf -Ir -nu -Lt -hN -aL -vc -ui -eP -fz -qE -MG -eY -kr -fS -kf -Kj -ja -aU -ja -dG -Gr -Gr -oZ -zm -ti -II -lc -Gr -Vp -Vp -Vp ZZ ZZ ZZ @@ -54555,6 +56648,8 @@ ZZ ZZ ZZ ZZ +"} +(162,1,1) = {" ZZ ZZ ZZ @@ -54579,60 +56674,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(148,1,1) = {" ZZ ZZ ZZ @@ -54669,73 +56710,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -eC -kx -Mf -yE -hx -hx -sc -If -oJ -wR -LJ -dX -op -eD -nV -jO -vT -qL -CN -IQ -vL -sq -Lq -Mk -du -yW -dv -tv -sp -rb -qh -qh -iE -SI -Tv -Lt -Nq -aL -iW -ui -eP -qT -qT -qT -qT -qT -qT -jf -jf -Hu -yG -Hu -sj -jf -Gr -Gr -Gr -Gr -Gr -Gr -Gr -Zw -Vp -Vp ZZ ZZ ZZ @@ -54751,6 +56725,28 @@ ZZ ZZ ZZ ZZ +KD +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +pi +Aa +qr +zI +ye +kG +ZN +pi +ZZ +Nh +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -54773,60 +56769,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(149,1,1) = {" ZZ ZZ ZZ @@ -54863,73 +56805,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -tu -Df -Mf -Mf -OQ -hx -hx -hx -jk -zs -yJ -fL -Rd -MN -gD -Rb -Ew -qL -gl -jC -sq -sq -sJ -lh -Et -id -id -VI -sp -be -UF -UF -Lt -Ob -zJ -Lt -hN -aL -xM -ui -eP -qT -hZ -qT -vP -qT -oM -jf -MZ -LB -NO -GN -Hn -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Vp -Vp ZZ ZZ ZZ @@ -54967,60 +56842,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(150,1,1) = {" +(163,1,1) = {" ZZ ZZ ZZ @@ -55057,72 +56880,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -ta -Ma -Fu -kn -Mf -oz -qP -Tm -we -Dg -dV -Mf -fL -jA -Iu -RA -Oq -rz -qL -Jo -aO -dy -Gk -aI -kP -BD -pD -cA -Nr -sp -vj -vj -vj -Lt -lk -lk -Lt -hN -aL -OD -ui -kN -qT -ul -qT -ep -qT -fc -jf -LB -wL -gE -wL -tf -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55160,61 +56917,8 @@ ZZ ZZ ZZ ZZ +Nh ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(151,1,1) = {" ZZ ZZ ZZ @@ -55222,7 +56926,16 @@ ZZ ZZ ZZ ZZ +TY +aY +YP +xC +hE +XF +sV +TY ZZ +Ey ZZ ZZ ZZ @@ -55252,71 +56965,6 @@ ZZ ZZ ZZ ZZ -Zw -ta -ta -uT -yR -uT -uT -yF -uT -PS -zg -NZ -Mf -fL -fL -fL -fL -fL -fL -qL -Lq -zZ -Lq -qL -qL -PT -Pt -Oi -sp -za -sp -Lt -Lt -Lt -Lt -Lt -Lt -Lt -hN -aL -aE -qW -mS -ED -GM -Qj -Ok -oG -SU -jf -Sp -wL -iI -fR -jf -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55355,60 +57003,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(152,1,1) = {" ZZ ZZ ZZ @@ -55442,75 +57036,12 @@ ZZ ZZ ZZ ZZ +"} +(164,1,1) = {" ZZ ZZ ZZ ZZ -Zw -Zw -Zw -uT -dT -yV -hL -Kf -uT -Cm -zg -Ws -Xr -GY -bI -xm -vG -ut -LK -dv -lI -vI -wP -LK -dH -qO -KZ -fV -sp -KL -sp -iK -oB -eV -BG -BG -BG -BG -IT -aL -aE -om -KY -qT -xj -kZ -uA -dP -Pf -jf -jf -jf -jf -jf -jf -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55549,60 +57080,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(153,1,1) = {" ZZ ZZ ZZ @@ -55640,71 +57117,21 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -uT -nU -Vw -wZ -Yv -uT -IJ -Hs -pK -qM -Dd -qM -YK -qM -Wk -HE -HE -CG -gG -ka -HE -HE -HE -JG -VA -sp -KM -sp -Vm -AL -aL -Pa -Zr -ty -AU -Ym -aL -iM -vp -Sd -qT -qT -qT -qT -qT -qT -qT -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw +ZZ +ZZ +ZZ +TY +Ov +YP +jl +Xi +rw +yX +TY +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -55743,60 +57170,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(154,1,1) = {" ZZ ZZ ZZ @@ -55835,70 +57208,7 @@ ZZ ZZ ZZ ZZ -Zw -Zw -uT -uT -uT -uT -tM -Wi -He -FI -sE -rs -qN -rs -Ez -Cr -ut -tO -dk -Ol -KC -YB -rN -vJ -UN -Ae -Ec -sp -wI -sp -ny -Pj -aL -aL -aL -aL -aL -aL -aL -xN -IX -xN -um ZZ -CW -CW -CW -AY -AY -CW -CW -CW -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -55920,6 +57230,8 @@ ZZ ZZ ZZ ZZ +"} +(165,1,1) = {" ZZ ZZ ZZ @@ -55937,60 +57249,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(155,1,1) = {" ZZ ZZ ZZ @@ -56029,65 +57287,7 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -Zw -uT -vu -Mv -uT -Mf -Mf -Kc -Kc -Kc -Kc -Mf -Mf -Mf -sp -sp -IY -IY -IY -IY -sp -sp -sp -sp -sp -Eg -Eg -uO -uO -uO -Zw -Zw -Zw -Zw -um -ao -Vk -fX -ue -um ZZ -CW -lP -CW -xv -xg -CW -CB -CW -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -56114,6 +57314,14 @@ ZZ ZZ ZZ ZZ +qi +KX +Yw +Gz +nA +UZ +mb +qi ZZ ZZ ZZ @@ -56131,60 +57339,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(156,1,1) = {" ZZ ZZ ZZ @@ -56196,6 +57350,7 @@ ZZ ZZ ZZ ZZ +ST ZZ ZZ ZZ @@ -56225,63 +57380,11 @@ ZZ ZZ ZZ ZZ -Zw -Zw -uT -uT -uT -uT -Zw -tE -tE -tE -tE -tE -ls -Zw -Zw -Zw -tE -tE -tE -tE -tE -tE -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -um -GF -Zd -dm -Ri -um ZZ -QV -av -Gd -EQ -Zy -Nb -hC -QV ZZ ZZ ZZ ZZ -Zw -Zw -Zw ZZ ZZ ZZ @@ -56321,64 +57424,12 @@ ZZ ZZ ZZ ZZ +"} +(166,1,1) = {" ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(157,1,1) = {" ZZ ZZ ZZ @@ -56420,30 +57471,10 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ ZZ -tE -tE -Zw -Zw -tE -tE -tE -tE -tE -tE -tE -Zw -Zw ZZ ZZ ZZ @@ -56454,21 +57485,7 @@ ZZ ZZ ZZ ZZ -um -nJ -JW -iS -Oe -um ZZ -CW -BR -hM -as -Ai -Mc -WV -CW ZZ ZZ ZZ @@ -56491,6 +57508,28 @@ ZZ ZZ ZZ ZZ +fp +fp +Hj +sn +DN +Tx +fp +pi +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -56519,60 +57558,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(158,1,1) = {" ZZ ZZ ZZ @@ -56615,12 +57600,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw -Zw -Zw -Zw ZZ ZZ ZZ @@ -56628,13 +57607,6 @@ ZZ ZZ ZZ ZZ -tE -tE -tE -Zw -Zw -tE -tE ZZ ZZ ZZ @@ -56646,23 +57618,10 @@ ZZ ZZ ZZ ZZ +"} +(167,1,1) = {" ZZ ZZ -um -hG -ck -qX -ak -um -um -CW -CW -CW -tD -CK -CW -CW -CW ZZ ZZ ZZ @@ -56713,60 +57672,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(159,1,1) = {" ZZ ZZ ZZ @@ -56797,6 +57702,14 @@ ZZ ZZ ZZ ZZ +dp +fp +gO +fE +IS +FR +NX +JZ ZZ ZZ ZZ @@ -56824,9 +57737,6 @@ ZZ ZZ ZZ ZZ -Zw -Zw -Zw ZZ ZZ ZZ @@ -56842,21 +57752,6 @@ ZZ ZZ ZZ ZZ -um -LV -ck -pP -Jn -WG -oA -xd -ju -cF -ab -hQ -DF -pB -OL ZZ ZZ ZZ @@ -56907,60 +57802,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(160,1,1) = {" ZZ ZZ ZZ @@ -56971,6 +57812,8 @@ ZZ ZZ ZZ ZZ +"} +(168,1,1) = {" ZZ ZZ ZZ @@ -57036,21 +57879,6 @@ ZZ ZZ ZZ ZZ -um -Jx -Sq -Vk -Vk -hh -sX -jI -Xy -oR -mk -oq -pz -Yq -pi ZZ ZZ ZZ @@ -57069,6 +57897,12 @@ ZZ ZZ ZZ ZZ +fp +fp +oi +kI +fp +fp ZZ ZZ ZZ @@ -57101,60 +57935,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(161,1,1) = {" ZZ ZZ ZZ @@ -57226,25 +58006,12 @@ ZZ ZZ ZZ ZZ +"} +(169,1,1) = {" ZZ ZZ ZZ ZZ -um -yT -yT -yT -yT -um -um -pi -pi -pi -eH -pX -OS -pi -pi ZZ ZZ ZZ @@ -57295,60 +58062,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(162,1,1) = {" ZZ ZZ ZZ @@ -57379,6 +58092,14 @@ ZZ ZZ ZZ ZZ +fp +DK +DK +fp +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -57424,23 +58145,13 @@ ZZ ZZ ZZ ZZ -KD ZZ ZZ ZZ ZZ ZZ ZZ -pi -Aa -qr -zI -ye -kG -ZN -pi ZZ -Nh ZZ ZZ ZZ @@ -57489,60 +58200,9 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(163,1,1) = {" +(170,1,1) = {" +ZZ ZZ ZZ ZZ @@ -57616,7 +58276,6 @@ ZZ ZZ ZZ ZZ -Nh ZZ ZZ ZZ @@ -57625,14 +58284,6 @@ ZZ ZZ ZZ ZZ -jE -aY -YP -xC -hE -XF -sV -TY ZZ ZZ ZZ @@ -57683,60 +58334,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(164,1,1) = {" ZZ ZZ ZZ @@ -57797,6 +58394,8 @@ ZZ ZZ ZZ ZZ +"} +(171,1,1) = {" ZZ ZZ ZZ @@ -57819,14 +58418,6 @@ ZZ ZZ ZZ ZZ -jE -Ov -YP -jl -Xi -rw -yX -TY ZZ ZZ ZZ @@ -57877,60 +58468,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(165,1,1) = {" ZZ ZZ ZZ @@ -58013,14 +58550,6 @@ ZZ ZZ ZZ ZZ -qi -KX -Yw -Gz -nA -UZ -mb -qi ZZ ZZ ZZ @@ -58049,7 +58578,6 @@ ZZ ZZ ZZ ZZ -ST ZZ ZZ ZZ @@ -58060,6 +58588,8 @@ ZZ ZZ ZZ ZZ +"} +(172,1,1) = {" ZZ ZZ ZZ @@ -58071,60 +58601,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(166,1,1) = {" ZZ ZZ ZZ @@ -58207,14 +58683,6 @@ ZZ ZZ ZZ ZZ -fp -fp -Hj -sn -DN -Tx -fp -pi ZZ ZZ ZZ @@ -58265,60 +58733,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(167,1,1) = {" ZZ ZZ ZZ @@ -58368,6 +58782,8 @@ ZZ ZZ ZZ ZZ +"} +(173,1,1) = {" ZZ ZZ ZZ @@ -58401,14 +58817,6 @@ ZZ ZZ ZZ ZZ -dp -fp -gO -fE -IS -FR -NX -JZ ZZ ZZ ZZ @@ -58459,60 +58867,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(168,1,1) = {" ZZ ZZ ZZ @@ -58596,12 +58950,39 @@ ZZ ZZ ZZ ZZ -fp -fp -oi -kI -fp -fp +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +"} +(174,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -58653,60 +59034,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(169,1,1) = {" ZZ ZZ ZZ @@ -58791,10 +59118,6 @@ ZZ ZZ ZZ ZZ -fp -DK -DK -fp ZZ ZZ ZZ @@ -58847,60 +59170,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(170,1,1) = {" +(175,1,1) = {" ZZ ZZ ZZ @@ -59041,60 +59312,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(171,1,1) = {" ZZ ZZ ZZ @@ -59147,6 +59364,8 @@ ZZ ZZ ZZ ZZ +"} +(176,1,1) = {" ZZ ZZ ZZ @@ -59207,6 +59426,7 @@ ZZ ZZ ZZ ZZ +GE ZZ ZZ ZZ @@ -59235,60 +59455,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(172,1,1) = {" ZZ ZZ ZZ @@ -59392,6 +59558,23 @@ ZZ ZZ ZZ ZZ +"} +(177,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -59429,60 +59612,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(173,1,1) = {" ZZ ZZ ZZ @@ -59623,60 +59752,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(174,1,1) = {" +(178,1,1) = {" ZZ ZZ ZZ @@ -59817,60 +59894,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(175,1,1) = {" ZZ ZZ ZZ @@ -59923,6 +59946,8 @@ ZZ ZZ ZZ ZZ +"} +(179,1,1) = {" ZZ ZZ ZZ @@ -60011,60 +60036,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(176,1,1) = {" ZZ ZZ ZZ @@ -60125,7 +60096,6 @@ ZZ ZZ ZZ ZZ -GE ZZ ZZ ZZ @@ -60170,6 +60140,49 @@ ZZ ZZ ZZ ZZ +"} +(180,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -60205,60 +60218,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(177,1,1) = {" ZZ ZZ ZZ @@ -60375,6 +60334,36 @@ ZZ ZZ ZZ ZZ +"} +(181,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -60399,60 +60388,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(178,1,1) = {" ZZ ZZ ZZ @@ -60593,60 +60528,8 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(179,1,1) = {" +(182,1,1) = {" ZZ ZZ ZZ @@ -60787,60 +60670,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(180,1,1) = {" ZZ ZZ ZZ @@ -60893,6 +60722,28 @@ ZZ ZZ ZZ ZZ +"} +(183,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -60981,60 +60832,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(181,1,1) = {" ZZ ZZ ZZ @@ -61119,6 +60916,8 @@ ZZ ZZ ZZ ZZ +"} +(184,1,1) = {" ZZ ZZ ZZ @@ -61175,60 +60974,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(182,1,1) = {" ZZ ZZ ZZ @@ -61365,64 +61110,12 @@ ZZ ZZ ZZ ZZ +"} +(185,1,1) = {" ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(183,1,1) = {" ZZ ZZ ZZ @@ -61563,60 +61256,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(184,1,1) = {" ZZ ZZ ZZ @@ -61665,6 +61304,46 @@ ZZ ZZ ZZ ZZ +"} +(186,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -61757,60 +61436,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(185,1,1) = {" ZZ ZZ ZZ @@ -61873,6 +61498,8 @@ ZZ ZZ ZZ ZZ +"} +(187,1,1) = {" ZZ ZZ ZZ @@ -61951,60 +61578,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(186,1,1) = {" ZZ ZZ ZZ @@ -62119,6 +61692,34 @@ ZZ ZZ ZZ ZZ +"} +(188,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -62145,60 +61746,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(187,1,1) = {" ZZ ZZ ZZ @@ -62339,60 +61886,36 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} -(188,1,1) = {" +(189,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -62533,60 +62056,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(189,1,1) = {" ZZ ZZ ZZ @@ -62611,6 +62080,8 @@ ZZ ZZ ZZ ZZ +"} +(190,1,1) = {" ZZ ZZ ZZ @@ -62727,60 +62198,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(190,1,1) = {" ZZ ZZ ZZ @@ -62857,6 +62274,8 @@ ZZ ZZ ZZ ZZ +"} +(191,1,1) = {" ZZ ZZ ZZ @@ -62921,60 +62340,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(191,1,1) = {" ZZ ZZ ZZ @@ -63103,6 +62468,48 @@ ZZ ZZ ZZ ZZ +"} +(192,1,1) = {" +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ +ZZ ZZ ZZ ZZ @@ -63115,60 +62522,6 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -"} -(192,1,1) = {" ZZ ZZ ZZ @@ -63309,56 +62662,4 @@ ZZ ZZ ZZ ZZ -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey -Ey "} diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm index 103d823c66..dd080830c6 100644 --- a/maps/tether/levels/station2.dmm +++ b/maps/tether/levels/station2.dmm @@ -16,7 +16,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/office) "ad" = ( /obj/item/paper, @@ -107,7 +107,7 @@ "am" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/department/cargo, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "an" = ( /obj/machinery/door/airlock/maintenance/common, @@ -169,10 +169,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "as" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -271,7 +268,7 @@ /area/shuttle/excursion/cargo) "aB" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "aC" = ( /obj/structure/flora/pottedplant/fern, @@ -305,34 +302,26 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "aI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) +/turf/simulated/wall/prepainted/cargo, +/area/tether/exploration) "aJ" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "aK" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 + dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 6 }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -463,11 +452,7 @@ /area/quartermaster/belterdock) "aX" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -503,12 +488,8 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "bb" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration) "bc" = ( @@ -620,11 +601,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/full/nogrille, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "bm" = ( @@ -640,8 +620,12 @@ /turf/simulated/open, /area/engineering/locker_room) "bo" = ( -/turf/simulated/wall, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "bp" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -651,19 +635,14 @@ "bq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "br" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/engineering/locker_room) "bs" = ( @@ -684,8 +663,6 @@ /turf/simulated/floor/tiled, /area/security/customs) "bu" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, @@ -695,6 +672,12 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "bv" = ( @@ -744,7 +727,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2r"; name = "interior access button"; @@ -776,8 +759,15 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "bB" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/quartermaster/foyer) +"bC" = ( +/obj/machinery/door/airlock/maintenance/cargo{ + name = "Magmatic Rift Leap Pad"; + req_one_access = list(1,5,31,38,47,48) + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "bD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -785,13 +775,30 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "bE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "shopdressingroom" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "shopdressingroom"; + name = "Shop Dressing room" }, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/laundry) +"bF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/station/burial) "bG" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -898,7 +905,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/cargo) "bR" = ( /obj/effect/floor_decal/borderfloor{ @@ -922,6 +929,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"bS" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "bT" = ( /obj/structure/bed/chair{ dir = 4 @@ -1045,7 +1062,7 @@ dir = 8; icon_state = "propulsion_l" }, -/turf/simulated/shuttle/plating/airless/carry, +/turf/simulated/shuttle/plating/carry, /area/shuttle/mining_outpost/shuttle) "ch" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1063,7 +1080,7 @@ /area/maintenance/station/cargo) "cj" = ( /obj/machinery/status_display/supply_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "ck" = ( /obj/structure/bed/chair/sofa/brown/left{ @@ -1072,14 +1089,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "cl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/shuttle/wall/voidcraft/green, +/area/shuttle/belter) "cm" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -1103,8 +1114,14 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "cp" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/mining_outpost/shuttle) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "cq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1129,15 +1146,16 @@ /turf/simulated/floor/wood, /area/tether/station/visitorhallway/lounge) "cs" = ( -/obj/structure/grille, -/obj/structure/sign/securearea, -/obj/machinery/door/firedoor/border_only, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/ai_monitored/storage/eva) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/foyer) "ct" = ( /obj/map_helper/airlock/atmos/pump_out_external, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ @@ -1164,15 +1182,21 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "cw" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/turf/simulated/wall/prepainted/medical, +/area/ai_monitored/storage/eva) "cx" = ( -/turf/simulated/wall/r_wall, -/area/quartermaster/belterdock) +/obj/machinery/button/remote/blast_door{ + id = "belter_blast_left"; + name = "Shuttle Blast Doors"; + pixel_y = 25 + }, +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_left" + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "cy" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -1203,29 +1227,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/foyer) -"cB" = ( -/obj/machinery/computer/guestpass{ - pixel_y = 32 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "cC" = ( /turf/space, /area/mine/explored/upper_level) @@ -1277,9 +1278,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "cF" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Chapel Services"; + dir = 8; + name = "Chapel Services" + }, +/obj/machinery/door/firedoor{ dir = 8 }, /turf/simulated/floor/wood, @@ -1295,11 +1298,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "cH" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -1333,9 +1332,8 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cockpit) "cK" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "cL" = ( @@ -1371,7 +1369,7 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "cQ" = ( /obj/effect/floor_decal/techfloor{ @@ -1432,18 +1430,11 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "cV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/office) "cW" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -1469,9 +1460,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "cY" = ( /obj/structure/catwalk, @@ -1480,6 +1470,12 @@ }, /turf/simulated/open, /area/engineering/foyer_mezzenine) +"cZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "da" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1670,9 +1666,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "du" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) @@ -1772,12 +1766,12 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "dG" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Evacuation Hallway" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/station/port) "dH" = ( @@ -1788,14 +1782,18 @@ /turf/simulated/floor/wood, /area/hallway/station/port) "dJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/obj/machinery/air_alarm{ + breach_detection = 0; + dir = 8; + pixel_x = 25; + rcon_setting = 3; + report_danger_level = 0 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "dK" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -1833,13 +1831,14 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "dP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -1876,7 +1875,7 @@ /obj/machinery/door/airlock/glass_external, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "eva_port_airlock"; name = "exterior access button"; @@ -1923,12 +1922,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "ea" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "eb" = ( @@ -1970,18 +1968,11 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/machinery/air_alarm{ pixel_y = 22 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "ef" = ( @@ -1997,13 +1988,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "eh" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" - }, -/turf/simulated/floor, -/area/chapel/office) +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "ei" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -2021,14 +2008,23 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "ej" = ( -/obj/structure/shuttle/window, /obj/effect/shuttle_landmark{ base_area = /area/quartermaster/belterdock; - base_turf = /turf/simulated/floor/tiled/asteroid_steel/airless; + base_turf = /turf/simulated/floor/tiled/monotile; landmark_tag = "belter_station"; - name = "Tether Parking Spot" + name = "Belter Parking Spot" }, -/turf/simulated/floor/airless, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "belter_blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/full, +/turf/simulated/shuttle/floor/voidcraft/lythios43c, /area/shuttle/belter) "ek" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2067,10 +2063,7 @@ "en" = ( /obj/structure/closet/wardrobe/black, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/corner/lime{ dir = 10 }, @@ -2169,7 +2162,6 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "ex" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2183,6 +2175,12 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "ey" = ( @@ -2191,16 +2189,12 @@ /area/vacant/vacant_restaurant_upper) "ez" = ( /obj/structure/sign/deck2, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "eA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/suit_cycler/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "eB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2234,7 +2228,7 @@ /area/tether/station/visitorhallway/lounge) "eE" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "eF" = ( /obj/structure/table/rack/steel, @@ -2301,12 +2295,11 @@ /turf/simulated/floor/wood, /area/tether/station/visitorhallway/office) "eJ" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "eK" = ( @@ -2361,9 +2354,12 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "eQ" = ( -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/foyer) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "eR" = ( /obj/structure/railing{ dir = 4 @@ -2442,18 +2438,23 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "eZ" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 8; - id_tag = "belter_docking"; - pixel_x = 26 +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/shuttle/floor/yellow/airless, +/turf/simulated/floor, /area/shuttle/belter) "fa" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "fb" = ( /obj/structure/cable{ @@ -2560,7 +2561,7 @@ /area/maintenance/station/eng_upper) "fi" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_cshutt"; name = "interior access button"; @@ -2571,6 +2572,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "fj" = ( @@ -2609,8 +2614,10 @@ /area/hallway/station/port) "fo" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor/plating, +/area/quartermaster/office) "fp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2664,7 +2671,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "fw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/chapel/main) "fx" = ( /obj/structure/table/glass, @@ -2685,12 +2692,21 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "fA" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" +/obj/machinery/button/remote/blast_door{ + id = "belter_blast_right"; + name = "Shuttle Blast Doors"; + pixel_y = 25 }, -/obj/structure/grille, -/turf/simulated/floor/tiled, -/area/quartermaster/qm) +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_right" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "fB" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -2706,34 +2722,15 @@ /area/tether/exploration/pilot_office) "fC" = ( /obj/structure/sign/department/chapel, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hallway/station/port) -"fD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "fE" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/port) "fF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/wall/prepainted/command, +/area/mine/explored/upper_level) "fG" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -2774,6 +2771,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"fJ" = ( +/obj/effect/paint_stripe/beastybrown, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/office) "fK" = ( /obj/structure/table/woodentable, /obj/item/folder/yellow{ @@ -2822,13 +2824,8 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "fO" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "visitor_meeting" - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor, -/area/tether/station/visitorhallway/office) +/turf/simulated/wall/prepainted/civilian, +/area/tether/station/stairs_two) "fP" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -2862,21 +2859,14 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "fT" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "fU" = ( @@ -2946,7 +2936,7 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "gb" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "gc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2958,14 +2948,9 @@ /turf/simulated/floor/airless, /area/space) "ge" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/suit_cycler/pilot, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "gf" = ( /obj/machinery/light, /turf/simulated/floor/tiled, @@ -3012,7 +2997,7 @@ }, /area/tether/exploration) "gl" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "gm" = ( /obj/structure/table/bench/standard, @@ -3030,19 +3015,20 @@ /turf/simulated/floor/tiled/white, /area/tether/station/visitorhallway/laundry) "gn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "go" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" + }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/tiled, /area/quartermaster/qm) "gp" = ( @@ -3078,12 +3064,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "gu" = ( @@ -3096,11 +3082,12 @@ /turf/simulated/floor, /area/storage/tech) "gv" = ( -/obj/structure/closet/crate, /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "gw" = ( /obj/structure/disposalpipe/segment, @@ -3134,7 +3121,7 @@ /area/tether/station/burial) "gA" = ( /obj/machinery/mineral/processing_unit_console, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/refinery) "gB" = ( /obj/effect/floor_decal/borderfloor{ @@ -3193,6 +3180,29 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +"gF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "gG" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3237,15 +3247,8 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/refinery) "gK" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/quartermaster/foyer) +/turf/simulated/wall/prepainted/engineering, +/area/maintenance/station/eng_upper) "gL" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -3266,7 +3269,25 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/camera/network/mining{ + dir = 4 + }, +/obj/structure/closet/walllocker{ + dir = 8; + pixel_x = -28 + }, +/obj/item/clothing/head/helmet/space/void/mining, +/obj/item/clothing/suit/space/void/mining, +/obj/item/clothing/shoes/magboots, +/obj/item/pickaxe/silver, +/obj/item/pickaxe/silver, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "gN" = ( /turf/simulated/floor/bluegrid, @@ -3326,7 +3347,15 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 1 }, -/obj/machinery/suit_cycler/pilot, +/obj/structure/closet{ + name = "voidsuit accessories" + }, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/tank/oxygen, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) "gT" = ( @@ -3391,10 +3420,12 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "hb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad" + }, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled, /area/quartermaster/office) "hc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3500,7 +3531,8 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/yellow, +/obj/structure/closet/emcloset, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "hl" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -3515,8 +3547,8 @@ /turf/simulated/open, /area/vacant/vacant_restaurant_upper) "hn" = ( -/turf/simulated/wall/r_wall, -/area/tether/station/visitorhallway/lounge) +/turf/simulated/wall/prepainted/engineering, +/area/ai_monitored/storage/eva) "ho" = ( /obj/structure/closet/emcloset, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -3543,8 +3575,12 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "hq" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor/yellow, +/obj/machinery/door/airlock/voidcraft{ + frequency = 2020; + id_tag = "mining_docking"; + name = "mining outpost ferry hatch" + }, +/turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/mining_outpost/shuttle) "hr" = ( /obj/machinery/conveyor{ @@ -3574,7 +3610,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "hu" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/engineering/shaft) "hv" = ( /obj/structure/cable/green{ @@ -3597,8 +3633,15 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/large_escape_pod1) "hy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/qm) +"hz" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "hA" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -3767,8 +3810,10 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor/plating, +/area/quartermaster/office) "hO" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -3797,17 +3842,21 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "hR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "hS" = ( /turf/simulated/floor/tiled, /area/engineering/locker_room) +"hT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "hU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3821,8 +3870,9 @@ /turf/simulated/floor/tiled/techfloor, /area/hallway/station/port) "hW" = ( -/turf/simulated/wall, -/area/quartermaster/storage) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, +/area/tether/station/visitorhallway/lounge) "hX" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3985,9 +4035,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "in" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/hallway/station/port) "io" = ( @@ -4027,7 +4075,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "iq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/chapel/office) "ir" = ( /obj/structure/disposalpipe/segment{ @@ -4063,6 +4111,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) +"iu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "iv" = ( /obj/machinery/light_switch{ name = "light switch "; @@ -4091,9 +4148,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor, /area/quartermaster/storage) "iy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4174,8 +4231,7 @@ /obj/machinery/light_switch{ pixel_y = -28 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -4193,8 +4249,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "iG" = ( -/turf/simulated/wall, -/area/gateway/prep_room) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "iH" = ( /obj/structure/table/rack/steel, /obj/random/tech_supply/component, @@ -4286,11 +4346,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/storage/tech) @@ -4361,28 +4417,6 @@ }, /turf/space, /area/space) -"iW" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/item/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "iX" = ( /obj/machinery/light/spot{ dir = 8; @@ -4397,21 +4431,18 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "iZ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor, /area/maintenance/station/cargo) "ja" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/tiled, /area/quartermaster/qm) "jb" = ( @@ -4466,7 +4497,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "ji" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/pilot_office) "jj" = ( /obj/machinery/door/firedoor/glass, @@ -4540,7 +4571,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "jq" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/gateway) "jr" = ( /obj/machinery/door/airlock/maintenance/common, @@ -4760,10 +4791,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "jM" = ( @@ -4845,18 +4875,11 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, /obj/machinery/light{ dir = 1 }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "jV" = ( @@ -4876,6 +4899,22 @@ /obj/item/folder/red, /turf/simulated/floor/wood, /area/tether/station/visitorhallway/office) +"jY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/cargo) "jZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -4968,10 +5007,7 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "kh" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/quartermaster/foyer) "ki" = ( @@ -5032,13 +5068,17 @@ }, /obj/structure/closet/secure_closet/miner, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "ko" = ( /obj/machinery/camera/network/mining{ dir = 8 }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "kp" = ( /obj/machinery/light{ @@ -5076,7 +5116,7 @@ /area/hallway/station/port) "kt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "ku" = ( /obj/structure/disposalpipe/segment{ @@ -5099,7 +5139,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai) "kx" = ( /obj/machinery/light_switch{ @@ -5208,8 +5248,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -5277,22 +5316,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "kP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "shuttle blast"; - name = "Shuttle Blast Doors"; - opacity = 0 +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/shuttle/excursion/general) +/turf/simulated/floor/tiled/monotile, +/area/maintenance/station/cargo) "kQ" = ( /obj/structure/closet/crate, /obj/random/maintenance/clean, @@ -5315,8 +5345,8 @@ /turf/simulated/floor/tiled, /area/security/customs) "kS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/office) "kT" = ( @@ -5442,12 +5472,10 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "ld" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "le" = ( @@ -5485,8 +5513,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -5519,7 +5546,7 @@ /area/hallway/station/port) "li" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "lj" = ( /obj/effect/floor_decal/corner/lightgrey{ @@ -5529,11 +5556,7 @@ dir = 10 }, /obj/structure/table/wooden_reinforced, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/tiled, /area/hallway/station/port) @@ -5693,6 +5716,9 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "lC" = ( @@ -5705,21 +5731,18 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "lD" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) -"lE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, +/turf/simulated/floor/plating, +/area/quartermaster/office) +"lE" = ( /obj/structure/cable/green{ icon_state = "0-4" }, @@ -5727,7 +5750,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "lF" = ( @@ -5771,11 +5795,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "lJ" = ( -/obj/structure/closet/emcloset, /obj/machinery/light{ dir = 4 }, -/turf/simulated/shuttle/floor/yellow, +/obj/structure/table/steel_reinforced, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "lK" = ( /obj/effect/floor_decal/borderfloor, @@ -5786,8 +5810,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -5838,11 +5861,11 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "lQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/polarized/full{ - id = "pilot_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "pilot_office"; + name = "Pilot's office" }, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/pilot_office) "lR" = ( @@ -5885,7 +5908,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "lV" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/station/cargo) "lW" = ( /obj/structure/table/reinforced, @@ -5923,6 +5946,9 @@ dir = 1 }, /obj/machinery/vending/coffee, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "ma" = ( @@ -5965,9 +5991,9 @@ /obj/structure/disposalpipe/sortjunction/untagged/flipped{ dir = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor, /area/quartermaster/storage) "mf" = ( /obj/machinery/atmospherics/portables_connector{ @@ -6032,8 +6058,8 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "ml" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "mm" = ( @@ -6058,6 +6084,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/window/reinforced/tinted, /turf/simulated/floor/tiled, /area/quartermaster/office) "mo" = ( @@ -6066,8 +6093,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6165,11 +6191,7 @@ dir = 8 }, /obj/structure/flora/pottedplant/shoot, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -6333,14 +6355,14 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "mQ" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "mR" = ( @@ -6367,24 +6389,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) -"mV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "mW" = ( /obj/machinery/light{ dir = 1 @@ -6398,17 +6402,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "mY" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/vending/cola{ - dir = 1 +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor/plating, +/area/quartermaster/office) "mZ" = ( /obj/structure/lattice, /turf/simulated/mineral/floor/cave, @@ -6478,9 +6485,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_one) "nh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "ni" = ( @@ -6501,22 +6506,14 @@ /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "nk" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "nl" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -6575,10 +6572,7 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "nr" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/maintenance/station/eng_upper) "ns" = ( @@ -6599,11 +6593,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "nu" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether/station/visitorhallway/office) "nv" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -6625,17 +6619,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) "nx" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "ny" = ( @@ -6677,6 +6671,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) +"nD" = ( +/obj/machinery/hyperpad/centre{ + map_pad_id = "lavaland_station"; + map_pad_link_id = "lavaland_away"; + newcolor = "#fcba03" + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "nE" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 8 @@ -6696,7 +6698,6 @@ /area/tether/station/visitorhallway/office) "nG" = ( /obj/structure/disposalpipe/segment, -/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/quartermaster/office) "nH" = ( @@ -6738,7 +6739,13 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "nL" = ( /turf/simulated/open, @@ -6801,7 +6808,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "nS" = ( @@ -6818,11 +6828,9 @@ /area/tether/exploration/pathfinder_office) "nT" = ( /obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "nU" = ( @@ -6831,10 +6839,7 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "nV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "nW" = ( @@ -7069,9 +7074,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "os" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor, /area/quartermaster/storage) "ot" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -7080,7 +7085,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "ou" = ( @@ -7102,20 +7106,6 @@ }, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) -"ox" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -7145,8 +7135,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "oB" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -7169,18 +7158,11 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "oE" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) +/obj/machinery/suit_storage_unit/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "oF" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7221,22 +7203,6 @@ /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) -"oJ" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/cable, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "oK" = ( /obj/machinery/air_alarm{ dir = 4; @@ -7301,11 +7267,7 @@ /area/storage/tech) "oP" = ( /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -7366,10 +7328,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "oU" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -7490,6 +7449,7 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "pi" = ( +/obj/machinery/atmospherics/valve/digital, /turf/simulated/floor/airless, /area/quartermaster/belterdock) "pj" = ( @@ -7537,7 +7497,7 @@ /obj/machinery/camera/network/mining{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "pp" = ( /obj/structure/cable{ @@ -7551,10 +7511,7 @@ dir = 4 }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/tether/station/visitorhallway/lounge) "pr" = ( @@ -7655,8 +7612,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "pD" = ( @@ -7667,8 +7624,10 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "pE" = ( -/turf/simulated/wall, -/area/tether/station/stairs_two) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/violet, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "pF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7683,17 +7642,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "pG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, -/area/tether/station/visitorhallway/lounge) +/turf/simulated/wall/prepainted/command, +/area/ai_monitored/storage/eva) "pH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7798,11 +7748,15 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "pQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/cargo) "pR" = ( /obj/machinery/light, /obj/structure/bed/chair/shuttle{ @@ -7811,11 +7765,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) "pS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7851,14 +7801,15 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "pV" = ( -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/foyer) "pW" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7873,11 +7824,12 @@ /obj/machinery/status_display{ pixel_y = 30 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -7906,11 +7858,7 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "pZ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/cyan{ icon_state = "0-2" }, @@ -7923,32 +7871,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"qb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/sign/poster/nanotrasen{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "qc" = ( /obj/machinery/newscaster{ pixel_x = 28 @@ -7995,7 +7924,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/storage/tech) "qg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8030,10 +7959,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "qj" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/main) "qk" = ( @@ -8071,7 +7998,7 @@ /obj/machinery/computer/shuttle_control/surface_mining_outpost{ dir = 8 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "qo" = ( /obj/structure/cable/cyan{ @@ -8095,9 +8022,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "qp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cargo) "qq" = ( @@ -8179,7 +8104,7 @@ /area/gateway/prep_room) "qy" = ( /obj/structure/sign/department/eng, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer_mezzenine) "qz" = ( /turf/simulated/floor/wood, @@ -8195,7 +8120,7 @@ /area/tether/station/stairs_two) "qC" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2b"; name = "interior access button"; @@ -8274,15 +8199,12 @@ /turf/simulated/floor/carpet/oracarpet, /area/chapel/main) "qK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/floor/wood, +/area/tether/station/burial) "qL" = ( /obj/machinery/light/small{ dir = 1 @@ -8296,6 +8218,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "qN" = ( @@ -8312,7 +8237,7 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "qO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/engineering/foyer_mezzenine) "qP" = ( /obj/structure/cable/green{ @@ -8335,18 +8260,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "qS" = ( @@ -8571,11 +8487,11 @@ /area/hallway/station/port) "rn" = ( /obj/structure/sign/warning/secure_area, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/security/nuke_storage) "ro" = ( -/turf/simulated/wall, -/area/tether/station/burial) +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "rp" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -8743,10 +8659,7 @@ dir = 1 }, /obj/structure/flora/pottedplant/tropical, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "rG" = ( @@ -8768,6 +8681,9 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 5 }, +/obj/machinery/camera/network/tether{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/station/port) "rH" = ( @@ -8902,15 +8818,14 @@ "rT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "shopdressingroom" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "shopdressingroom"; + name = "Shop Dressing room" }, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/laundry) "rU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/storage/tech) "rV" = ( /obj/machinery/holopad, @@ -8985,11 +8900,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "sc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock) "sd" = ( @@ -9075,19 +8987,37 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "sm" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/polarized/full{ - id = "shopdressingroom" +/obj/structure/sign/warning/secure_area, +/turf/simulated/wall/r_wall/prepainted/command, +/area/security/nuke_storage) +"sn" = ( +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/tether/station/visitorhallway/laundry) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "so" = ( -/turf/simulated/wall/r_wall, -/area/hallway/station/port) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "sp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/spacedorm1) "sq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9099,12 +9029,16 @@ /turf/simulated/floor/wood, /area/tether/station/burial) "sr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals_central6, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -9116,9 +9050,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "st" = ( @@ -9239,11 +9171,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "sG" = ( -/obj/structure/table/rack, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/security, -/obj/item/clothing/head/helmet/space/void/security, +/obj/machinery/suit_storage_unit/security, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "sH" = ( @@ -9270,7 +9198,13 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "sK" = ( /obj/effect/floor_decal/borderfloor{ @@ -9289,8 +9223,8 @@ /area/hallway/station/port) "sL" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Stairwell"; - dir = 8 + dir = 8; + name = "Stairwell" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/firedoor/glass, @@ -9388,15 +9322,6 @@ }, /turf/simulated/floor, /area/maintenance/station/cargo) -"sT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "sU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9412,7 +9337,7 @@ /area/maintenance/station/eng_upper) "sW" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "sX" = ( /obj/item/stool, @@ -9525,11 +9450,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/bluegrid, /area/ai_core_foyer) "tg" = ( @@ -9566,29 +9487,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) -"tk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "tl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9636,10 +9534,7 @@ "tq" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) @@ -9679,7 +9574,18 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "tv" = ( -/turf/simulated/shuttle/wall, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "belter_blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/turf/simulated/shuttle/floor/voidcraft/lythios43c, /area/shuttle/belter) "tw" = ( /obj/machinery/door/firedoor, @@ -9793,12 +9699,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "tI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/maintenance/station/cargo) "tJ" = ( @@ -9828,14 +9729,18 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"tL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"tL" = ( +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -9932,7 +9837,7 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "tW" = ( /obj/structure/disposalpipe/segment, @@ -9981,25 +9886,6 @@ /obj/random/contraband, /turf/simulated/floor/tiled/dark, /area/tether/station/visitorhallway/lounge) -"ua" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -10018,13 +9904,15 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "ud" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor, -/area/chapel/office) +/area/shuttle/belter) "ue" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techmaint, @@ -10088,8 +9976,15 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "um" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_right" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "un" = ( /obj/structure/table/wooden_reinforced, @@ -10140,8 +10035,14 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "ut" = ( -/turf/simulated/wall, -/area/tether/station/dock_one) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "uu" = ( /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) @@ -10266,7 +10167,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "uD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/quartermaster/foyer) "uE" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -10365,9 +10266,8 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock) "uL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/station/public_meeting_room) "uM" = ( @@ -10424,11 +10324,13 @@ pixel_x = -22 }, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "uR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/r_wall, -/area/quartermaster/belterdock) +/obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "uS" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 5 @@ -10477,9 +10379,7 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "uX" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted, /area/maintenance/station/eng_upper) "uY" = ( /obj/machinery/light_switch{ @@ -10521,7 +10421,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "GateShut"; - layer = 3.3; name = "Gateway Shutter" }, /obj/machinery/door/firedoor/glass, @@ -10570,8 +10469,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/vending/fitness, @@ -10686,9 +10584,6 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "vs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -10697,6 +10592,8 @@ name = "Engineering Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/engineering/foyer_mezzenine) "vt" = ( @@ -10754,15 +10651,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = 28 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "vz" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 8 @@ -10774,7 +10664,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/structure/cable/green{ @@ -10814,9 +10703,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "vD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -10844,9 +10730,6 @@ /obj/machinery/disposal/deliveryChute{ dir = 4 }, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/quartermaster/office) "vG" = ( @@ -10947,10 +10830,7 @@ "vP" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -10960,13 +10840,8 @@ /turf/simulated/floor/tiled/techfloor, /area/hallway/station/port) "vR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "vS" = ( @@ -11064,11 +10939,7 @@ dir = 1 }, /obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -11124,10 +10995,10 @@ /obj/structure/bed/chair/shuttle{ dir = 1 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "wg" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_restaurant_upper) "wh" = ( /obj/structure/disposalpipe/tagger/partial{ @@ -11135,17 +11006,13 @@ sort_tag = "Sorting Office" }, /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "wi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "wj" = ( @@ -11224,12 +11091,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/quartermaster/storage) "wp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/shuttle/floor/voidcraft/light, +/area/shuttle/mining_outpost/shuttle) "wq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11253,21 +11118,16 @@ /turf/simulated/floor/tiled, /area/engineering/locker_room) "ws" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "wt" = ( @@ -11328,6 +11188,9 @@ dir = 8; pixel_x = 22 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/tether/station/burial) "wz" = ( @@ -11362,6 +11225,19 @@ /obj/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) +"wC" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "wD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -11388,14 +11264,10 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "wG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai_core_foyer) "wH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11411,13 +11283,25 @@ /obj/machinery/computer/shuttle_control/tether_backup{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "wJ" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + id_tag = "belter_docking"; + pixel_x = 26 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "wK" = ( /obj/machinery/computer/supplycomp/control, @@ -11447,7 +11331,7 @@ /obj/structure/sign/directions/cargo{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/starboard) "wO" = ( /turf/simulated/floor/tiled/dark, @@ -11533,7 +11417,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "wX" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11611,7 +11495,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "xf" = ( /obj/machinery/light/small{ @@ -11644,18 +11528,14 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/gateway/prep_room) "xj" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "visitor_meeting" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "visitor_meeting"; + name = "Visitor Meeting Room" }, -/obj/structure/grille, /turf/simulated/floor, /area/tether/station/visitorhallway/office) "xk" = ( @@ -11689,8 +11569,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "xo" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -11699,7 +11578,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "xq" = ( /obj/structure/disposalpipe/segment{ @@ -11709,6 +11588,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "xr" = ( @@ -11752,8 +11634,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -11926,15 +11807,11 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "xM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/sign/directions/cargo{ + dir = 4 }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "xN" = ( /obj/structure/bed/chair/sofa/brown/right{ dir = 8 @@ -11943,7 +11820,13 @@ /area/chapel/office) "xO" = ( /obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/button/remote/blast_door{ + id = "belter_blast"; + name = "Shuttle Blast Doors"; + pixel_x = -23; + pixel_y = -25 + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "xP" = ( /obj/random/junk, @@ -11958,13 +11841,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "xR" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/cable/green, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "xS" = ( @@ -12036,7 +11918,8 @@ "xX" = ( /obj/machinery/light, /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/yellow, +/obj/structure/closet/emcloset, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "xY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -12139,7 +12022,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "yj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "yk" = ( /obj/structure/flora/ausbushes/brflowers, @@ -12175,12 +12058,11 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/structure/cable/green, +/obj/machinery/suit_storage_unit/pathfinder, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) "yp" = ( @@ -12344,7 +12226,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "yF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12359,11 +12241,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) "yG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -12378,6 +12256,7 @@ icon_state = "4-8" }, /obj/machinery/camera/network/civilian, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "yI" = ( @@ -12413,6 +12292,9 @@ /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/machinery/vending/cola{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "yL" = ( @@ -12440,28 +12322,36 @@ /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) "yO" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "yP" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/exploration/pilot_office) +"yQ" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "yR" = ( /obj/machinery/media/jukebox, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/foyer) "yS" = ( -/turf/simulated/wall/r_wall, -/area/hallway/station/starboard) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "yT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12588,7 +12478,7 @@ /obj/structure/shuttle/engine/propulsion{ dir = 8 }, -/turf/simulated/shuttle/plating/airless/carry, +/turf/simulated/shuttle/plating/carry, /area/shuttle/mining_outpost/shuttle) "ze" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12600,6 +12490,13 @@ /obj/overmap/entity/visitable/sector/virgo3b, /turf/space, /area/space) +"zg" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/valve/digital/open, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "zh" = ( /obj/machinery/light{ dir = 4 @@ -12643,7 +12540,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/dark, @@ -12700,16 +12596,15 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "zq" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "zr" = ( @@ -12825,11 +12720,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/bluegrid, /area/ai) "zF" = ( @@ -12838,7 +12729,7 @@ dir = 1; pixel_y = 24 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "zG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -13019,6 +12910,14 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/exploration) +"Ad" = ( +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "belter_blast_left" + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "Ae" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -13099,15 +12998,7 @@ layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/station/dock_one) "Am" = ( @@ -13148,6 +13039,12 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) +"As" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "At" = ( /obj/item/paper_bin, /turf/simulated/floor, @@ -13181,17 +13078,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "Ax" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -13225,11 +13120,11 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/cargo) "AC" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "chapel"; + name = "Chaplain Office" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/office) "AD" = ( @@ -13288,10 +13183,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/visitorhallway/lounge) "AL" = ( -/obj/machinery/power/apc{ +/obj/machinery/power/apc/south_mount{ alarms_hidden = 1; - name = "south bump"; - pixel_y = -28; req_access = list(); req_one_access = list(11,67) }, @@ -13373,8 +13266,7 @@ /area/ai_monitored/storage/eva) "AS" = ( /obj/structure/closet/emcloset, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -13389,10 +13281,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24; +/obj/machinery/power/apc/east_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -13403,13 +13292,6 @@ /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) -"AU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) "AV" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -13647,15 +13529,13 @@ /turf/simulated/floor/tiled/dark, /area/tether/exploration) "Bs" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/dark, @@ -13668,12 +13548,18 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/station/visitorhallway/office) "Bu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "shuttle blast"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/tether/station/visitorhallway/lounge) +/area/shuttle/excursion/general) "Bv" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -13756,11 +13642,11 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "BC" = ( -/obj/structure/closet/crate, /obj/machinery/light{ dir = 8 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "BD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13845,9 +13731,7 @@ /area/shuttle/excursion/general) "BK" = ( /obj/machinery/light, -/obj/machinery/suit_cycler/mining{ - req_access = null - }, +/obj/machinery/suit_cycler/exploration, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "BL" = ( @@ -13868,6 +13752,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"BM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "BN" = ( /obj/machinery/air_alarm{ dir = 4; @@ -13997,7 +13885,7 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "BZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/chapel/chapel_morgue) "Ca" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -14060,6 +13948,9 @@ dir = 4 }, /obj/machinery/holopad, +/obj/structure/window/reinforced/polarized/full{ + id = "qm_office" + }, /turf/simulated/floor/wood, /area/quartermaster/qm) "Cg" = ( @@ -14110,11 +14001,8 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "Cl" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/wall/prepainted/civilian, +/area/hallway/station/port) "Cm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -14175,6 +14063,8 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_one) "Ct" = ( @@ -14262,19 +14152,16 @@ /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) "Cz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "CA" = ( /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "CB" = ( @@ -14408,7 +14295,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "CP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/public_meeting_room) "CQ" = ( /obj/structure/cable/green{ @@ -14452,18 +14339,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/pilot_office) "CU" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "CV" = ( @@ -14493,13 +14376,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "CX" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "CY" = ( @@ -14541,10 +14423,11 @@ /area/crew_quarters/sleep/spacedorm1) "Dc" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -14588,7 +14471,12 @@ /obj/machinery/computer/shuttle_control/belter{ dir = 1 }, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the belter shuttle systems, to help miners find where they left their shuttle."; + gps_tag = "BELTER"; + name = "belter beacon" + }, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "Dh" = ( /turf/simulated/floor/plating, @@ -14706,7 +14594,7 @@ /area/tether/exploration) "Du" = ( /obj/structure/sign/department/mail, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "Dv" = ( /obj/structure/cable/green{ @@ -14742,7 +14630,7 @@ dir = 1 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "belter_access_airlock"; name = "exterior access button"; @@ -14750,10 +14638,16 @@ pixel_y = -25; req_one_access = list(48,65,66) }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "Dz" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/security/nuke_storage) "DA" = ( /obj/structure/bed/chair/bay/chair/padded/beige, @@ -14807,10 +14701,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) -"DG" = ( -/obj/item/radio/beacon, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "DH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14932,15 +14822,19 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) "DU" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "DV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14963,15 +14857,6 @@ /obj/machinery/door/airlock/maintenance/cargo, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) -"DX" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) "DY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14994,24 +14879,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) -"Ea" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Eb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -15033,9 +14900,6 @@ dir = 8; id = "packageSort1" }, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, /obj/structure/plasticflaps, /turf/simulated/floor/tiled, /area/quartermaster/office) @@ -15065,14 +14929,12 @@ /turf/simulated/wall/rshull, /area/shuttle/excursion/cockpit) "Eh" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/dock_one) "Ei" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15090,10 +14952,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "Ek" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -15127,11 +14987,7 @@ "Eo" = ( /obj/structure/table/rack/shelf, /obj/item/suit_cooling_unit, -/obj/item/clothing/mask/gas/half, /obj/item/tank/oxygen, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration/pathfinder, -/obj/item/clothing/head/helmet/space/void/exploration/pathfinder, /obj/item/binoculars, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -15156,11 +15012,7 @@ /turf/simulated/floor/bluegrid, /area/ai) "Er" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/chapel/main) "Es" = ( @@ -15215,8 +15067,6 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "Ew" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -15224,7 +15074,8 @@ icon_state = "0-2" }, /obj/structure/cable/green, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "Ex" = ( @@ -15251,14 +15102,14 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Ey" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -15270,7 +15121,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Funerary Services" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/tether/station/burial) "EA" = ( @@ -15348,7 +15199,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "EG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/customs) "EH" = ( /obj/machinery/mineral/equipment_vendor/survey, @@ -15384,11 +15235,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15403,8 +15250,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -15413,12 +15259,6 @@ /turf/simulated/mineral/vacuum, /area/mine/explored/upper_level) "EN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -15431,6 +15271,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "EO" = ( @@ -15442,6 +15283,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"EP" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "EQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15466,7 +15319,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "ES" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -15523,14 +15376,8 @@ /turf/simulated/floor/tiled, /area/tether/station/stairs_two) "EY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/turf/simulated/wall/prepainted, +/area/tether/station/stairs_two) "EZ" = ( /obj/machinery/camera/network/exploration{ dir = 9 @@ -15558,7 +15405,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "Fc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/locker_room) "Fd" = ( /obj/structure/cable{ @@ -15618,7 +15465,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "Fi" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration) "Fj" = ( /obj/structure/railing{ @@ -15632,9 +15479,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) -"Fk" = ( -/turf/simulated/wall/r_wall, -/area/ai_monitored/storage/eva) "Fl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15708,9 +15552,8 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "Fr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/security/customs) "Fs" = ( @@ -15720,9 +15563,6 @@ /turf/simulated/floor/airless, /area/maintenance/station/eng_upper) "Ft" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -15732,6 +15572,7 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "Fu" = ( @@ -15746,7 +15587,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Fv" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/port) "Fw" = ( /obj/item/storage/secure/safe{ @@ -15770,8 +15611,8 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "Fy" = ( -/turf/simulated/wall/r_wall, -/area/chapel/chapel_morgue) +/turf/simulated/wall/prepainted/security, +/area/ai_monitored/storage/eva) "Fz" = ( /obj/structure/disposalpipe/sortjunction/flipped{ dir = 1; @@ -15796,13 +15637,13 @@ /area/tether/station/stairs_two) "FC" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/sign/nanotrasen, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/structure/sign/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_one) "FD" = ( @@ -15816,6 +15657,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) +"FF" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "FG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15826,6 +15674,9 @@ /area/hallway/station/port) "FH" = ( /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "FI" = ( @@ -15901,7 +15752,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "FS" = ( /obj/structure/cable/green{ @@ -15948,14 +15799,7 @@ /turf/simulated/floor/tiled/neutral, /area/shuttle/excursion/general) "FX" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical, -/obj/item/clothing/head/helmet/space/void/medical, +/obj/machinery/suit_storage_unit/medic, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "FY" = ( @@ -15995,7 +15839,13 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "Ge" = ( /obj/effect/floor_decal/industrial/warning{ @@ -16013,7 +15863,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "Gg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/gateway/prep_room) "Gh" = ( /obj/structure/cable/green{ @@ -16034,17 +15884,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) -"Gj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Gk" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -16101,23 +15940,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/cargo) "Gq" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/machinery/camera/network/tether{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, -/area/hallway/station/port) +/area/hallway/station/starboard) "Gr" = ( /obj/machinery/air_alarm{ dir = 1; @@ -16127,7 +15962,7 @@ /turf/simulated/floor/tiled/neutral, /area/shuttle/excursion/general) "Gs" = ( -/obj/structure/shuttle/window, +/obj/spawner/window/reinforced/full/firelocks, /obj/effect/shuttle_landmark{ base_area = /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar; base_turf = /turf/simulated/floor/tiled; @@ -16166,8 +16001,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "Gw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor, @@ -16179,12 +16013,9 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "Gy" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "chapel" - }, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /obj/structure/curtain/black, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/chapel/main) "Gz" = ( @@ -16205,7 +16036,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16215,6 +16045,13 @@ }, /area/gateway/prep_room) "GB" = ( +/obj/machinery/vending/wallmed1/public{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "GC" = ( @@ -16331,7 +16168,7 @@ /area/tether/exploration) "GN" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "eva_port_airlock"; name = "interior access button"; @@ -16386,7 +16223,6 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "chapel_obs"; - layer = 3.3; name = "Chapel Observation Shutters"; pixel_x = -26; pixel_y = 25; @@ -16431,6 +16267,7 @@ departmentType = 2; pixel_y = 30 }, +/obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled, /area/quartermaster/office) "GV" = ( @@ -16491,6 +16328,42 @@ }, /turf/simulated/floor, /area/tether/station/burial) +"Hd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) +"He" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Hf" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16567,23 +16440,13 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "Hk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/window/reinforced{ - dir = 8 + dir = 8; + pixel_x = -4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/suit_storage_unit/pilot, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/exploration/pilot_office) "Hl" = ( /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/bcarpet, @@ -16690,6 +16553,15 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +"Hx" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad"; + req_one_access = list(1,5,31,38,47,48) + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "Hy" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/floor_decal/industrial/warning{ @@ -16699,11 +16571,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "Hz" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -16724,12 +16592,11 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "HB" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "HC" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -16770,6 +16637,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/tether/station/burial) "HI" = ( @@ -16839,7 +16709,7 @@ /area/shuttle/large_escape_pod1) "HQ" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_cshutt"; name = "exterior access button"; @@ -16858,11 +16728,15 @@ }, /area/tether/exploration) "HS" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/area/quartermaster/office) "HT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16884,7 +16758,7 @@ /area/tether/station/visitorhallway/office) "HV" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2b"; name = "exterior access button"; @@ -16941,8 +16815,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -16989,7 +16862,7 @@ /area/tether/station/visitorhallway/lounge) "Ie" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "If" = ( /obj/machinery/conveyor{ @@ -17018,24 +16891,15 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "Ii" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Ij" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/cockpit) "Ik" = ( @@ -17052,10 +16916,10 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "Im" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/burial) "In" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/engineering/foyer_mezzenine) "Io" = ( /obj/machinery/air_alarm{ @@ -17077,16 +16941,34 @@ /area/tether/exploration) "Iq" = ( /obj/structure/closet/coffin, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "Ir" = ( /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"Is" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) +"It" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/camera/network/tether{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Iu" = ( /obj/structure/bed/chair/wood/wings{ dir = 1 @@ -17132,27 +17014,22 @@ /turf/simulated/floor, /area/hallway/station/starboard) "IA" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "IB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "IC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/office) "ID" = ( /obj/machinery/button/remote/blast_door{ @@ -17187,21 +17064,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "IG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/airless, +/area/quartermaster/belterdock) "IH" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -17334,18 +17199,8 @@ /area/tether/exploration) "IV" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/camera/network/cargo{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "IW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -17368,10 +17223,10 @@ /turf/simulated/floor/tiled, /area/tether/station/public_meeting_room) "IY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/hallway/station/atrium) "IZ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/quartermaster/qm) "Ja" = ( /obj/structure/table/woodentable, @@ -17430,9 +17285,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Ji" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "Jj" = ( /obj/structure/disposalpipe/segment{ @@ -17454,7 +17307,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "Jm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/lounge) "Jn" = ( /obj/structure/cable/cyan{ @@ -17548,11 +17401,7 @@ /turf/simulated/floor/wood, /area/hallway/station/port) "Jt" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -17634,7 +17483,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "JB" = ( /obj/effect/shuttle_landmark{ @@ -17669,7 +17518,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock) "JG" = ( /obj/structure/cable/green{ @@ -17738,7 +17587,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/door/firedoor/glass, @@ -17773,13 +17621,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "JQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/station/dock_one) "JR" = ( @@ -17883,6 +17725,7 @@ dir = 9 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Kb" = ( @@ -18021,10 +17864,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "Ko" = ( /turf/simulated/floor/airless, @@ -18055,8 +17896,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/station/visitorhallway/laundry) +"Ks" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "Kt" = ( -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "Ku" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -18153,8 +18001,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -18236,6 +18083,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) "KM" = ( @@ -18259,6 +18110,12 @@ "KO" = ( /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tether/station/visitorhallway/lounge) +"KP" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "KQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -18314,7 +18171,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "KU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/ai) "KV" = ( /obj/machinery/air_alarm{ @@ -18341,7 +18198,7 @@ /obj/structure/sign/directions/cargo{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hallway/station/port) "KZ" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -18361,16 +18218,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/office) "Lc" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor, /area/storage/tech) "Ld" = ( @@ -18472,7 +18325,7 @@ dir = 8; icon_state = "propulsion_r" }, -/turf/simulated/shuttle/plating/airless/carry, +/turf/simulated/shuttle/plating/carry, /area/shuttle/mining_outpost/shuttle) "Lm" = ( /obj/machinery/ai_slipper, @@ -18529,6 +18382,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"Lq" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "Lr" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18546,6 +18405,17 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/hallway/station/starboard) +"Ls" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Lt" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -18652,7 +18522,7 @@ dir = 4; pixel_y = -8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/stairs_two) "LD" = ( /obj/effect/floor_decal/steeldecal/steel_decals8, @@ -18862,7 +18732,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/station/visitorhallway/lounge) "LW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/tether/exploration/pathfinder_office) "LX" = ( /obj/machinery/air_alarm{ @@ -18982,27 +18852,9 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "Mk" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) -"Ml" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Mm" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/airless, @@ -19033,7 +18885,9 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "Mq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted{ + can_open = 1 + }, /area/maintenance/station/eng_upper) "Mr" = ( /obj/structure/closet/emcloset, @@ -19262,7 +19116,7 @@ dir = 8; icon_state = "pipe-j2" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "MP" = ( /obj/effect/floor_decal/techfloor{ @@ -19303,15 +19157,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "MS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/floor, +/area/shuttle/belter) "MT" = ( /obj/structure/cable{ icon_state = "2-4" @@ -19330,22 +19181,14 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "MV" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK" }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "MW" = ( @@ -19399,31 +19242,15 @@ /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "Nc" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/tether/station/burial) "Nd" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/turf/simulated/shuttle/floor/voidcraft, +/area/shuttle/belter) "Ne" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/large, @@ -19442,22 +19269,13 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "Ng" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK" }, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted, /area/quartermaster/foyer) "Nh" = ( /obj/machinery/air_alarm{ @@ -19467,6 +19285,30 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"Ni" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Nj" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -19491,8 +19333,7 @@ dir = 8 }, /obj/structure/dispenser/oxygen, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -19545,7 +19386,7 @@ dir = 8 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "belter_access_airlock"; name = "interior access button"; @@ -19556,6 +19397,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -19601,7 +19448,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "Nu" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "Nv" = ( /obj/effect/floor_decal/corner/brown/border{ @@ -19619,14 +19466,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Nw" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/atmos, +/obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "Nx" = ( @@ -19681,7 +19521,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "NC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/station/starboard) "ND" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19707,15 +19547,9 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "NF" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) +/obj/machinery/camera/network/cargo, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "NG" = ( /obj/machinery/conveyor{ dir = 4; @@ -19815,7 +19649,6 @@ /area/ai_core_foyer) "NP" = ( /obj/structure/shuttle/window, -/obj/structure/grille, /obj/effect/shuttle_landmark{ base_area = /area/hallway/secondary/escape/medical_escape_pod_hallway; base_turf = /turf/simulated/floor/plating; @@ -19905,14 +19738,12 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/machinery/suit_cycler/mining{ - req_access = null - }, +/obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "Oa" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2a"; name = "interior access button"; @@ -19991,18 +19822,15 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "Og" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/area/quartermaster/office) "Oh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20035,14 +19863,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "Ok" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/excursion/cockpit) +/turf/simulated/wall/prepainted, +/area/security/nuke_storage) "Ol" = ( /obj/machinery/newscaster{ pixel_x = 28 @@ -20060,7 +19882,7 @@ /area/shuttle/excursion/general) "On" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2l"; name = "exterior access button"; @@ -20142,7 +19964,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "PubPrepFront"; - layer = 3.3; name = "Gateway Prep Shutter" }, /obj/machinery/door/firedoor/glass, @@ -20211,7 +20032,7 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "OE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/refinery) "OF" = ( /obj/effect/floor_decal/techfloor{ @@ -20265,7 +20086,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/station/visitorhallway/office) "OL" = ( -/turf/simulated/shuttle/floor/yellow/airless, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor, /area/shuttle/belter) "OM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -20274,7 +20096,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "ON" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/maintenance/substation/cargo) "OO" = ( /obj/structure/table/standard, @@ -20339,19 +20161,13 @@ /turf/simulated/floor, /area/storage/tech) "OU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/laundry) "OV" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) "OW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -20360,6 +20176,7 @@ name = "Shuttle Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/excursion/general) "OX" = ( @@ -20370,8 +20187,17 @@ /turf/simulated/floor/tiled, /area/hallway/station/port) "OY" = ( -/turf/space, -/area/space) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/area/quartermaster/belterdock) "OZ" = ( /obj/structure/railing{ dir = 1 @@ -20428,11 +20254,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -20487,19 +20309,12 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, /obj/item/radio/intercom{ dir = 1; pixel_y = 24 }, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Pm" = ( @@ -20556,7 +20371,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "Pr" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "Ps" = ( /obj/structure/table/rack{ @@ -20629,10 +20444,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Py" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm1) @@ -20731,17 +20543,11 @@ /turf/simulated/floor/bluegrid, /area/ai) "PJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/mine/explored/upper_level) "PK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/office) "PL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20783,6 +20589,9 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/item/binoculars, +/obj/item/binoculars{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/belterdock) "PP" = ( @@ -20791,9 +20600,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/table/rack/shelf{ - name = "voidsuit shelving" - }, /obj/machinery/light{ dir = 1 }, @@ -20801,29 +20607,7 @@ dir = 8; pixel_x = -4 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, -/obj/item/clothing/suit/space/void/pilot{ - pixel_x = 3 - }, -/obj/item/clothing/suit/space/void/pilot{ - pixel_x = 3 - }, -/obj/item/clothing/suit/space/void/pilot{ - pixel_x = 3 - }, -/obj/item/clothing/head/helmet/space/void/pilot{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/clothing/head/helmet/space/void/pilot{ - pixel_x = -5 - }, -/obj/item/clothing/head/helmet/space/void/pilot{ - pixel_x = -5; - pixel_y = 5 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) "PQ" = ( @@ -20859,11 +20643,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -20897,15 +20677,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "PX" = ( -/obj/structure/closet/emcloset, -/turf/simulated/shuttle/floor/yellow/airless, +/obj/structure/table/steel_reinforced, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "PY" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "pathfinder_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "pathfinder_office"; + name = "Pathfinder's Office" }, +/obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/tether/exploration/pathfinder_office) "PZ" = ( @@ -20916,17 +20696,38 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/office) "Qa" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/foyer) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Qb" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"Qc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Qd" = ( /turf/simulated/wall, /area/chapel/main) @@ -20951,9 +20752,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/visitorhallway/lounge) -"Qh" = ( -/turf/simulated/wall, -/area/quartermaster/belterdock/gear) "Qi" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -21081,8 +20879,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -21160,17 +20957,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "QC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/tinted/full, /turf/simulated/floor, /area/chapel/main) "QD" = ( @@ -21195,10 +20982,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/tiled/steel_grid, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor, /area/tether/station/visitorhallway/lounge) "QG" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -21211,11 +20996,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "QI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21227,7 +21008,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "QK" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "QL" = ( /obj/structure/disposalpipe/segment{ @@ -21308,11 +21089,11 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/shuttle/floor/yellow/airless, +/turf/simulated/shuttle/floor/voidcraft/lythios43c, /area/shuttle/belter) "QT" = ( /obj/machinery/door/blast/regular, -/turf/simulated/wall, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "QU" = ( /obj/structure/musician/piano, @@ -21375,6 +21156,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Ra" = ( @@ -21435,7 +21219,7 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "Rg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/maintenance/station/eng_upper) "Rh" = ( /obj/machinery/air_alarm{ @@ -21497,7 +21281,7 @@ /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "Rn" = ( /obj/machinery/status_display/supply_display, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/storage) "Ro" = ( /obj/structure/table/steel, @@ -21523,7 +21307,7 @@ /area/maintenance/station/eng_upper) "Rr" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/public_meeting_room) "Rs" = ( /obj/structure/table/rack{ @@ -21736,12 +21520,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" - }, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" + }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "RN" = ( @@ -21749,11 +21533,7 @@ /turf/simulated/floor/bluegrid, /area/ai_core_foyer) "RO" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -21875,11 +21655,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/internals, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "Sd" = ( @@ -21957,7 +21733,7 @@ /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "Sn" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/tether/station/dock_one) "So" = ( /obj/machinery/light/small{ @@ -22081,7 +21857,7 @@ /area/vacant/vacant_restaurant_upper) "SF" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2r"; name = "exterior access button"; @@ -22102,7 +21878,7 @@ /area/tether/station/public_meeting_room) "SH" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "dock_d2a"; name = "exterior access button"; @@ -22161,14 +21937,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "SN" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "SO" = ( -/turf/simulated/shuttle/wall/hard_corner, +/turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/mining_outpost/shuttle) "SP" = ( /obj/machinery/door/airlock/maintenance/common, @@ -22274,8 +22049,8 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Ta" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "Tb" = ( @@ -22315,6 +22090,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning, +/obj/structure/window/reinforced/tinted, /turf/simulated/floor/tiled, /area/quartermaster/office) "Te" = ( @@ -22326,6 +22102,16 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"Tf" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Tg" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor{ @@ -22346,9 +22132,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "Ti" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor/plating, /area/hallway/station/port) "Tj" = ( @@ -22370,7 +22154,6 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "chapel_obs"; - layer = 3.3; name = "Chapel Observation Shutters"; pixel_x = -26; pixel_y = -25; @@ -22384,9 +22167,8 @@ /turf/simulated/floor/wood, /area/tether/station/burial) "Tm" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor, /area/tether/station/burial) "Tn" = ( @@ -22551,17 +22333,17 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "TA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/turf/simulated/open, +/area/tether/elevator) "TB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22571,7 +22353,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/station/visitorhallway/lounge) "TC" = ( /obj/effect/floor_decal/borderfloor{ @@ -22589,14 +22371,17 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/structure/sign/securearea{ + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/hallway/station/port) "TD" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "qm_office"; + name = "QM Office" }, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) "TE" = ( @@ -22613,8 +22398,7 @@ "TG" = ( /obj/structure/closet/wardrobe/xenos, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/lime{ @@ -22673,7 +22457,7 @@ /obj/machinery/camera/network/mining{ dir = 1 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "TO" = ( /obj/item/radio{ @@ -22693,16 +22477,6 @@ dir = 1 }, /area/tether/exploration) -"TP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 5 - }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "TQ" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -22712,6 +22486,10 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "TS" = ( @@ -22725,14 +22503,29 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "TU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/station/dock_one) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "TV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -22798,18 +22591,6 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 6 }, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/obj/structure/closet{ - name = "voidsuit accessories" - }, /turf/simulated/floor/tiled/dark, /area/tether/exploration/pilot_office) "Ub" = ( @@ -22974,6 +22755,13 @@ /obj/item/folder/white, /turf/simulated/floor/wood, /area/tether/station/visitorhallway/office) +"Uq" = ( +/obj/effect/catwalk_plated/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor, +/area/shuttle/belter) "Ur" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -23058,12 +22846,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Uz" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "UA" = ( @@ -23130,7 +22914,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "UJ" = ( /obj/structure/table/standard, @@ -23155,7 +22939,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/warehouse) "UN" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -23164,7 +22948,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/customs) "UO" = ( /obj/random/junk, @@ -23324,11 +23108,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -23339,20 +23119,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "Vh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/turf/simulated/open, +/area/tether/elevator/two) "Vi" = ( /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/floor_decal/borderfloor, @@ -23379,7 +23147,6 @@ /area/tether/exploration) "Vk" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -23452,7 +23219,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/belterdock/gear) "Vr" = ( /obj/machinery/door/firedoor/glass, @@ -23490,25 +23257,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) -"Vv" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Vw" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -23529,8 +23277,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -23587,15 +23334,14 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "VC" = ( -/obj/machinery/door/firedoor/border_only, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-8" }, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) "VD" = ( @@ -23753,7 +23499,7 @@ /area/quartermaster/warehouse) "VR" = ( /obj/structure/ore_box, -/turf/simulated/shuttle/floor/yellow/airless, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/belter) "VS" = ( /obj/structure/railing/grey{ @@ -23867,7 +23613,6 @@ pixel_y = 30 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -23879,7 +23624,7 @@ frequency = 1379; id_tag = "belter_access_pump" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "Wf" = ( /obj/structure/cable/green{ @@ -23908,6 +23653,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "Wi" = ( @@ -23936,11 +23683,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "Wj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -24068,26 +23811,15 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/mining, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/mining, -/obj/item/mining_scanner, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/clothing/shoes/magboots, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/clothing/accessory/holster/waist/kinetic_accelerator, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "Wy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -24314,7 +24046,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; - layer = 3.3; name = "Gateway Access Shutters" }, /turf/simulated/floor/tiled/dark, @@ -24352,11 +24083,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals3, /turf/simulated/floor/tiled{ icon_state = "monotile" @@ -24372,7 +24099,7 @@ id_tag = "mining_docking"; pixel_y = 26 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/mining_outpost/shuttle) "WU" = ( /obj/effect/floor_decal/techfloor{ @@ -24455,15 +24182,12 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "Xd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "Xe" = ( /obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/voidcraft, /area/shuttle/mining_outpost/shuttle) "Xf" = ( /obj/structure/disposalpipe/segment{ @@ -24517,7 +24241,7 @@ /area/hallway/station/port) "Xk" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "dock_d2l"; name = "interior access button"; @@ -24525,8 +24249,7 @@ pixel_y = -26; req_access = list(13) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -24554,7 +24277,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "Xo" = ( @@ -24574,21 +24299,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "Xp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/storage) "Xq" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "packageSort1" - }, -/obj/machinery/camera/network/cargo{ - dir = 1; - name = "security camera" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/quartermaster/office) +/turf/simulated/floor/wood, +/area/tether/station/burial) "Xr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -24705,9 +24426,18 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_upper) +"XD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "XE" = ( /obj/structure/noticeboard, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/quartermaster/office) "XF" = ( /obj/landmark/spawnpoint/job/ai/secondary, @@ -24741,23 +24471,12 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "XI" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/structure/window/reinforced{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "XJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -24793,6 +24512,7 @@ /obj/machinery/light, /obj/structure/closet/secure_closet/miner, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/kinetic_accelerator, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "XN" = ( @@ -24890,7 +24610,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/exploration, /area/quartermaster/qm) "XZ" = ( /obj/structure/cable/green{ @@ -24932,25 +24652,13 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "Yc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/station/visitorhallway/lounge) "Yd" = ( /obj/structure/sign/deck2, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/station/stairs_two) -"Ye" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Yf" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, @@ -25042,17 +24750,12 @@ /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) "Yq" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/tether/station/burial) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "Yr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -25248,19 +24951,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"YM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "YN" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -25346,21 +25036,15 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "YW" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/dock_one) "YX" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -25391,34 +25075,11 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) -"Za" = ( -/obj/machinery/atm{ - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) "Zb" = ( /obj/item/storage/secure/safe{ pixel_x = -24 @@ -25432,14 +25093,13 @@ name = "Cargo Bay"; sortType = "Cargo Bay" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "Zd" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -25489,11 +25149,7 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "Zj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 24 @@ -25604,8 +25260,26 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "Zr" = ( -/turf/simulated/wall/r_wall, -/area/security/customs) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "Zs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25681,13 +25355,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "Zz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/station/starboard) "ZA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille, +/obj/effect/paint_stripe/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "ZB" = ( @@ -25960,24 +25633,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "ZZ" = ( @@ -25990,13853 +25652,13465 @@ /area/chapel/main) (1,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(2,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(2,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (3,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (4,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(5,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(6,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(7,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(8,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(9,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(10,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(11,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(12,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(13,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(14,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(15,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(16,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(17,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(18,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(19,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(20,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(21,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(22,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(23,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(24,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(25,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(26,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(27,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(28,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(29,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(30,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(31,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(32,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(5,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(33,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(6,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(34,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(7,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(8,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(35,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(9,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(36,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(10,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(11,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(37,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(12,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(13,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(38,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(14,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(39,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(15,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(16,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(40,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(17,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(18,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(41,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(19,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(42,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(20,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(21,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(43,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(22,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(23,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(44,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(24,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(45,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(25,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(26,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(46,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(27,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(28,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(47,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(29,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(48,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(30,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(31,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(49,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(32,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(33,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(50,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(34,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(51,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(35,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(36,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(52,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(37,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(38,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(53,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(39,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov ov -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY "} -(54,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -zf -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(40,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(41,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(55,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(42,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(56,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(43,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(44,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(57,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(45,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(46,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(58,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(47,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(59,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(48,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(49,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(60,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(50,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(51,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(61,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(52,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(62,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(53,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(54,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +zf +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(63,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(55,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(56,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(64,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(57,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(65,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(58,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(59,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(66,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(60,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(61,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(67,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(62,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(68,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(63,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(64,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(69,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(65,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(66,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(70,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -Lx -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(67,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(71,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(68,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(69,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(72,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(70,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -39851,186 +39125,380 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +Lx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(71,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(73,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(72,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40045,186 +39513,380 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(73,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (74,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40240,185 +39902,185 @@ gd gd gd yy -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (75,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40434,185 +40096,185 @@ gd gd gd yy -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (76,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40627,186 +40289,186 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (77,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -40821,186 +40483,186 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (78,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -41015,138 +40677,138 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (79,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41154,47 +40816,47 @@ EM EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY rY rY rY rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -41208,137 +40870,137 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (80,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41354,24 +41016,24 @@ EM EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM -OY -OY +ov +ov rY -OY -OY -OY -OY +ov +ov +ov +ov rY rY rY @@ -41387,8 +41049,8 @@ rY rY rY rY -OY -OY +ov +ov gd gd gd @@ -41402,139 +41064,136 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (81,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EM -EM -EM +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41549,41 +41208,9 @@ EM EM EM EM -gd -gd -gd -gd -gd -gd -gd EM EM EM -OY -OY -rY -OY -OY -OY -OY -rY -Mq -EY -EY -EY -Mq -EY -EY -EY -Mq -rY -OY -OY -OY -rY -OY -OY -yy gd gd gd @@ -41591,192 +41218,33 @@ gd gd gd gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(82,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EM -EM -EM -EM -Qu -Qu -mZ -Qu -EM -EM EM EM EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -rY -rY -rY -rY +ov +ov rY +ov +ov +ov +ov rY -TA -Lu -AH -GH -eb -GH -AH -jQ +uX +nV +nV +nV +uX nV +nV +nV +uX rY -OY -OY -OY +ov +ov +ov rY -OY -OY +ov +ov yy gd gd @@ -41790,135 +41258,329 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(82,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +EM +EM +EM +EM +Qu +Qu +mZ +Qu +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +rY +rY +rY +rY +rY +rY +nV +Lu +AH +GH +eb +GH +AH +jQ +nV +rY +ov +ov +ov +rY +ov +ov +yy +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (83,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -41934,28 +41596,28 @@ EM EM jF jF -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -EY -EY -EY -Mq +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +nV +nV +nV +uX BG fk AO @@ -41963,20 +41625,20 @@ sj sj TH wL -Mq -EY -EY -EY -Mq -PK -PK +uX +nV +nV +nV +uX +wi +wi wg -PK -PK -PK +wi +wi +wi wg -PK -PK +wi +wi wg uu gd @@ -41984,134 +41646,134 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (84,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42128,7 +41790,7 @@ EM EM jF jF -Mq +uX kQ cO FU @@ -42152,16 +41814,16 @@ FU Rq sV MA -Mq -Mq -Mq +uX +uX +uX eW RA mK mK pg eR -Mq +uX Dh Dh Dh @@ -42178,134 +41840,134 @@ uu uu gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (85,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42322,7 +41984,7 @@ EM jF jF II -Mq +uX VF pe TH @@ -42346,9 +42008,9 @@ sj sj sj zO -Mq +uX jF -Mq +uX eW rB sj @@ -42373,133 +42035,133 @@ uu EM EM EM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (86,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42512,44 +42174,44 @@ Qu Qu EM EM -Mq +uX jF sE by -Mq +uX dm mg +uX +uX +uX +uX Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX SP -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX +uX +uX SP -Mq -Mq -Mq -Mq +uX +uX +uX +uX jF -Mq -dJ -dJ -Mq -dJ -pV -Mq -Mq +uX +nV +nV +uX +nV +nV +uX +uX Dh Dh Dh @@ -42567,133 +42229,133 @@ uu EM EM uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (87,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42710,31 +42372,31 @@ jF jF by Oz -Mq +uX iY mg -Mq +uX tR Bd Bd Oz PH ki -Mq +uX Oz -Mq +uX uu uu uu uu -Mq +uX Oz Oz Oz Oz Oz Oz -Mq +uX EM uu uu @@ -42761,133 +42423,133 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (88,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -42900,35 +42562,35 @@ Qu EM EM EM -Mq +uX jF Oz Oz -Mq +uX iY Jx -Mq +uX fx Bd Mu Oz Bd Ep -Mq +uX Oz -Mq +uX EM uu uu uu -Mq +uX jW Oz Oz Oz Oz vu -Mq +uX uu uu fT @@ -42955,133 +42617,133 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (89,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43094,188 +42756,188 @@ EM EM EM EM -Mq +uX jF Oz Oz -Mq +uX fQ Jx -Mq +uX Mb Kf Xc Zp MU UF -Mq +uX Oz -Mq +uX EM EM EM uu -Mq +uX Cq Oz Oz Oz Oz xn -Mq -uu -uu -CU -le -LU -te -zq -uu -wg -Dh -Dh -Dh -Dh -jP -SE -yX -Dh -Dh -ln -js -wg -LR -uu -uu -uu +uX uu uu -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +CU +le +LU +te +zq +uu +wg +Dh +Dh +Dh +Dh +jP +SE +yX +Dh +Dh +ln +js +wg +LR +uu +uu +uu +uu +uu +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (90,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43288,35 +42950,35 @@ EM qu EM EM -Mq +uX jF Oz Oz uX iY Jx -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX +uX +uX NU -Mq +uX EM uu uu uu -Mq +uX Kg YV jW FJ Rb Ps -Mq +uX uu uu Ii @@ -43365,112 +43027,112 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (91,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43482,14 +43144,14 @@ EM EM EM EM -Mq +uX jF Oz Oz -Mq +uX fQ Jx -Mq +uX KI NU Oz @@ -43498,7 +43160,7 @@ Oz Oz Oz Oz -Mq +uX EM uu uu @@ -43512,13 +43174,13 @@ Fc Fc Fc Fc -rU +qf rU rU kT rU rU -rU +qf qf Dh Dh @@ -43543,128 +43205,128 @@ uu gd gd gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (92,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43676,23 +43338,23 @@ EM EM EM EM -Mq +uX by Oz Oz -Mq +uX iY Jx -Mq +uX AJ Oz -Mq -Mq -Mq -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX hu hu hu @@ -43753,112 +43415,112 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (93,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -43870,17 +43532,17 @@ EM EM EM EM -Mq +uX by by Oz -Mq +uX xm Jx SP Oz NU -Mq +uX EM EM hu @@ -43944,115 +43606,115 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (94,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44064,17 +43726,17 @@ EM EM EM EM -Mq +uX jF by by -Mq +uX iY Jx -Mq +uX Oz Oz -Mq +uX EM EM hu @@ -44125,128 +43787,128 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (95,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44262,23 +43924,23 @@ jF jF II Sx -Mq +uX iY Jx -Mq +uX eM Oz -Mq +uX EM -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX Fc iU iU @@ -44319,129 +43981,129 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (96,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44451,20 +44113,20 @@ EM EM EM EM -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX LM uh -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX EM EM EM @@ -44513,130 +44175,130 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (97,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44645,15 +44307,15 @@ EM EM EM EM -Mq +uX Rs Jh Rb KI -Mq +uX Ic mg -Rg +uX EM EM EM @@ -44707,131 +44369,131 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (98,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -44839,15 +44501,15 @@ EM EM EM EM -Mq +uX Oz Oz Oz Oz -Mq +uX Ic uh -Rg +uX WB yN EM @@ -44902,146 +44564,146 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (99,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX LX Oz Oz BQ -Mq +uX Ic uh -Rg +uX EM uu EM @@ -45076,14 +44738,14 @@ qO Ti HL Ti -pE -pE -pE -pE -pE -pE -pE -pE +fO +fO +fO +fO +fO +EY +EY +EY EM uu uu @@ -45096,146 +44758,146 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (100,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX Oz Oz Oz Oz -Mq +uX iY Ci -Rg +uX EM uu uu @@ -45260,7 +44922,7 @@ Vi Fc EM EM -qO +In Ul cY jb @@ -45270,14 +44932,14 @@ vs lF Ev ju -pE +fO LP nq qB -pE +fO pz gZ -pE +EY EM EM EM @@ -45291,137 +44953,137 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (101,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX Oz Oz Oz @@ -45429,7 +45091,7 @@ Oz SP iY Ci -Rg +uX EM uu uu @@ -45454,7 +45116,7 @@ Fc Fc EM EM -qO +In Ul yv OZ @@ -45464,14 +45126,14 @@ vs tB Ev zp -pE +fO Be bM ie af vn Dl -pE +EY EM EM EM @@ -45485,145 +45147,145 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (102,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM EM -Mq +uX GG XC Oz iP -Mq +uX rR Ci -Rg +uX EM uu EM @@ -45645,10 +45307,10 @@ In Xv TZ tX -qO -qO -qO -qO +In +In +In +In Ul yv OZ @@ -45658,14 +45320,14 @@ vs tB Ev Tw -pE -pE -pE -pE +fO +fO +fO +fO Yd bc GE -pE +EY EM EM EM @@ -45680,144 +45342,144 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (103,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM EM -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX Ic Ci -Rg +uX EM uu EM @@ -45852,20 +45514,20 @@ vs tB Ev zp -pE +EY qU Gb Gb Gb vx wF -pE +EY EM -Fy -Fy -Fy -Fy -Fy +BZ +BZ +BZ +BZ +BZ uu uu uu @@ -45874,131 +45536,131 @@ uu uu uu uu -Yq -DX -DX -DX -xM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Tm +Tm +Tm +Tm +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (104,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -46008,10 +45670,10 @@ EM EM uu EM -Mq +uX Ic Ci -Rg +uX EM uu uu @@ -46046,152 +45708,152 @@ vs tB Ev jw -pE +EY Gb Gb Gb Gb Ef eP -pE +EY EM BZ BZ UZ DT BZ -DX -DX +Tm +Tm Im -DX -DX -DX -DX -DX +Tm +Tm +Tm +Tm +Tm Tm yb up ED -oE -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (105,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -46202,10 +45864,10 @@ PJ uu uu uu -Mq +uX iY Ci -Rg +uX EM EM uu @@ -46227,9 +45889,9 @@ In tC lP OH -qO -qO -qO +In +In +In qy my AV @@ -46241,147 +45903,147 @@ tB nC zp LC -pE -pE -pE -pE +EY +EY +EY +EY se sL -pE +EY EM -BZ -tp -zK -as -BZ -sq -gz -Ez -gz -gz -gz -gz -gz -Zu -BS -PG -Sk -oE -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +BZ +tp +zK +as +BZ +sq +gz +Ez +gz +gz +qK +Xq +gz +Zu +BS +PG +Sk +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (106,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -46396,10 +46058,10 @@ PJ uu uu uu -Mq +uX iY Ci -Rg +uX EM EM uu @@ -46424,7 +46086,7 @@ In In EM EM -qO +In ih AV OZ @@ -46441,7 +46103,7 @@ CR Fp bA EX -pE +EY EM BZ tp @@ -46450,7 +46112,7 @@ qt Lh Vz qz -qz +tw qz qz HH @@ -46460,122 +46122,122 @@ xs je pc Au -oE -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Tm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (107,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -46590,10 +46252,10 @@ PJ EM uu uu -Mq +uX iY XG -Rg +uX EM EM EM @@ -46612,13 +46274,13 @@ uu uu uu uu -Rg +uX NR mD -Rg -Rg +uX +uX EM -qO +In ih AV jM @@ -46635,7 +46297,7 @@ vU dH qV dH -pE +EY EM BZ tp @@ -46644,132 +46306,132 @@ Gw BZ EB tw -ro -ro -ro -ro -ro -ro -ro -XK -Nx -ro Im Im -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Im +Im +Im +Im +Im +XK +Nx +Im +Im +Im +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (108,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -46784,10 +46446,10 @@ EM EM EM EM -Mq +uX iY Mv -Rg +uX EM EM EM @@ -46806,13 +46468,13 @@ uu uu uu uu -Rg +uX Lj ru XX -Rg +uX EM -qO +In hA yz Ky @@ -46829,7 +46491,7 @@ YS hj Vl gZ -pE +fO iq iq iq @@ -46838,150 +46500,150 @@ Ox iq Tb ym -ro +Im eu Zn zR CY wv -ro +Im sQ qz WK XO Hc -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (109,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX fQ Mi -Rg +uX EM EM EM @@ -47000,13 +46662,13 @@ uu uu uu uu -Rg -Rg +uX +uX wT -Rg -Rg +uX +uX EM -qO +In Vf XL sD @@ -47029,141 +46691,141 @@ xQ pI Xb VD -eh +AC om oB -ro -Th -PQ -zR -CY -Vx -ro -qz -Ja Im -Im -Im -uu -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Th +PQ +zR +CY +Vx +Im +qz +Ja +Im +Im +Im +uu +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (110,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -TA +nV Fs Oz SZ @@ -47175,7 +46837,7 @@ Yz bp TI ys -Rg +uX EM EM EM @@ -47195,11 +46857,11 @@ uu uu uu uu -Rg +uX Gm -Rg -Rg -Rg +uX +uX +uX In Bi ph @@ -47223,20 +46885,20 @@ QM Lb Iu EI -eh +AC om qz -ro +Im bm PQ zR CY hQ -ro +Im rz -ro -ro -ro +Im +Im +Im Im uu gd @@ -47251,107 +46913,107 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (111,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd nz Mm @@ -47366,10 +47028,10 @@ Oz NU nr Rb -Mq +uX fQ ch -Rg +uX EM EM EM @@ -47381,190 +47043,190 @@ EM EM EM uu -uu -uu -uu -uu -uu -uu -uu -uu -Rg -Kq -Rg -SS -Jt -Rg -Rg -XT -Rg -Rg -Rg -Rg -Ae -xV -lg -CP -Mk -ne -ne -ne -hG -Gx -iq -ku -zl -JP -Wb -mj -wl -fl -qz -ro -Qp -PQ -zR -Jl -CJ -ro -CY -jV -jV -FI -Im -uu -uu -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +uu +uu +uu +uu +uu +uu +uu +uu +uX +Kq +uX +SS +Jt +gK +gK +XT +gK +gK +gK +gK +Ae +xV +lg +CP +Mk +ne +ne +ne +hG +Gx +iq +ku +zl +JP +Wb +mj +wl +fl +qz +Im +Qp +PQ +zR +Jl +CJ +Im +CY +jV +jV +FI +Im +uu +uu +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (112,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -Mq +uX Ma Oz NU NU -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX Ic wX -Rg -Rg +uX +uX EM EM EM @@ -47583,7 +47245,7 @@ uu uu uu uu -Rg +uX zM Es hc @@ -47594,7 +47256,7 @@ Jj JY rI Gu -Mq +uX ap xV da @@ -47639,126 +47301,126 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (113,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -TA +nV tH NU QQ bT -Mq +uX uu uu EM -Mq +uX iY Jx Oz -Rg +uX EM EM EM @@ -47777,9 +47439,9 @@ uu uu uu uu -Rg +uX FY -Mq +uX rd hh vL @@ -47788,7 +47450,7 @@ wR fP dC DD -Mq +uX Wy eO hH @@ -47805,16 +47467,16 @@ rA kz xN ck -eh +AC xz qz -ro +Im kp nk -ro +Im mJ nx -ro +Im jV Pu Iq @@ -47830,136 +47492,136 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (114,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -TA +nV YV Oz dh Us -Mq +uX EM uu uu -Mq +uX iY uh Oz -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Rg +uX +uX +uX +uX +uX +uX +uX +uX uu uu uu @@ -47971,9 +47633,9 @@ uu uu uu uu -Rg +uX FY -Rg +uX Mz Xa Fj @@ -47982,7 +47644,7 @@ ww oG UO NE -Mq +uX lG ic NS @@ -47997,18 +47659,18 @@ iq iq iq iq -ud -ud +AC +AC iq -xz +bF cF -ro -ro -ro -ro -ro -ro -ro +Im +Im +Im +Im +Im +Im +Im Im Im Im @@ -48016,144 +47678,144 @@ Im Im LR uu -OY +ov gd gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (115,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd gd gd -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX EM uu EM -Mq +uX iY uh Oz -Mq +uX uj Bj Oz uj uj CO -Rg +uX uu uu uu @@ -48164,10 +47826,10 @@ uu uu uu uu -Rg -Rg +uX +uX xC -Rg +uX xf BR Tx @@ -48184,144 +47846,144 @@ Rr CP CP CP -CP -CP -CP -Fv -Fv -Fv -Qd -mq -un -XV -VG -CF -ZZ -aZ -CF -Yj -CF -mk -wS -qj -uu -uu -uu -uu -uu -uu -cC -OY -OY -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +CP +CP +CP +Cl +Cl +Cl +fw +mq +un +XV +VG +CF +ZZ +aZ +CF +Yj +CF +mk +wS +qj +uu +uu +uu +uu +uu +uu +cC +ov +ov +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (116,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48336,18 +47998,18 @@ PJ EM uu EM -Mq +uX iY eW Oz -Mq +uX BA Oz fu Oz fu Oz -Rg +uX uu uu uu @@ -48358,10 +48020,10 @@ uu uu uu uu -Rg +uX cR hg -Rg +uX Ji Ji Ji @@ -48370,7 +48032,7 @@ Ji Ji Yl GR -Rg +uX ZN DY mh @@ -48384,7 +48046,7 @@ Fm AY qi lr -Qd +fw mW Xt CF @@ -48405,117 +48067,117 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (117,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48530,18 +48192,18 @@ uu EM uu uu -Mq +uX iY eW Oz -Mq +uX Oz ad At Oz Oz Oz -Rg +uX uu uu uu @@ -48552,19 +48214,19 @@ uu uu uu uu -Rg +uX vj Gh -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji Yl -Rg -so +uX +Fv Vp RJ ya @@ -48599,117 +48261,117 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (118,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48724,40 +48386,40 @@ uu uu uu EM -Mq +uX iY wX Oz -Mq +uX UW Oz XQ Oz Bj uj -Rg +uX uu uu -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX Wj Mx -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji Yl -Rg +uX uy vl yq @@ -48793,117 +48455,117 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (119,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -48913,26 +48575,26 @@ gd gd EM EM -Mq -Mq -Mq -Mq -Mq -Mq +uX +uX +uX +uX +uX +uX iY ch Oz -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX Ze vj Oz @@ -48940,18 +48602,18 @@ Oz Oz Oz Oz -Rg +uX gH Nt -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji bk -Rg +uX wn ZN DO @@ -48988,116 +48650,116 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (120,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49105,9 +48767,9 @@ gd gd gd gd -Mq -Mq -Mq +uX +uX +uX Oz MT bw @@ -49116,7 +48778,7 @@ GZ ae di NB -Mq +uX Oz Oz BN @@ -49137,15 +48799,15 @@ bw bw bw qh -Rg +uX Ji -Hb -Hb -Hb -Hb +TA +TA +TA +TA Ji dB -Rg +uX Of ZN yZ @@ -49160,7 +48822,7 @@ ks AY qi lr -Qd +fw mW Wa CF @@ -49183,115 +48845,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (121,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49299,14 +48961,14 @@ gd gd gd EM -Mq +uX xL bw bw Qo -Mq -Mq -Mq +uX +uX +uX Kz RH bw @@ -49320,41 +48982,41 @@ bw Qo wY aL -Mq +uX +Rg +Rg Rg Rg Rg Rg Rg Rg -Oz -Oz Oz ZP -Rg +uX Ji Ji Hb Hb ez Ji -Rg -Rg -so +uX +uX +Fv av pF IM KY -Fv -Fv -Fv -Fv -Fv -Fv -Fv -Fv -Fv -Qd +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +fw rK jS gj @@ -49377,115 +49039,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (122,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49493,28 +49155,28 @@ gd gd gd EM -Mq +uX kK -Mq -Mq -Mq -Mq +uX +uX +uX +uX EM -Mq +uX fh xD Az -Mq +uX vj Xs jd mM Kv Kv -Rg -Rg -Rg -Rg +uX +uX +uX +uX Dz Dz Dz @@ -49523,7 +49185,7 @@ Dz Dz Rg Rg -Rg +uX qF Iz WQ @@ -49548,16 +49210,16 @@ sK Yh Fv gp -Qd -Qd -Qd -Qd -Qd -Qd +fw +fw +fw +fw +fw +fw AA Qd fs -Qd +fw Ec fw fw @@ -49571,115 +49233,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (123,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49687,29 +49349,29 @@ gd gd EM EM -Mq +uX kK -Mq +uX KU KU KU EM -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Rg +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX uu uu uu -rn +sm Dz ky Bq @@ -49717,163 +49379,163 @@ hE aX sH Dz -Dz +Ok rn -yS +NC gB WS WS WS -YM +qS aJ ot nR wW -Xj -wz -pl -FG -jR -FG -FG -FG -FG -jp -zH -Fv -gp -lV -aH -Sh -iZ -sS -Qd -Eu -QC -kU -Qd -gp -gp -FK -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Xj +wz +pl +FG +jR +FG +FG +FG +FG +jp +zH +Fv +gp +lV +aH +Sh +iZ +sS +fw +Eu +QC +kU +fw +gp +gp +lV +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (124,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -49881,7 +49543,7 @@ gd gd EM EM -Mq +uX kK KU KU @@ -49917,9 +49579,9 @@ Ym xT pp pp -Ye +pp ws -ox +pp ZY qR Gq @@ -49941,14 +49603,14 @@ Jk gp Ei KV -Qd -Qd -Qd -Qd -Qd +fw +fw +fw +fw +fw yA gp -FK +lV Vw hx hx @@ -49959,115 +49621,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (125,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd gd @@ -50111,12 +49773,12 @@ UP EJ EJ EJ -Gj +EJ dP -cm -wN -NC -Fv +KP +Qc +XD +so fE Pt Fv @@ -50127,145 +49789,145 @@ Js Fv ht bK -zp -Fv -gp -gp -Jk -gp -Ei -cu -an -ci -ST -Dr -Dr -Dr -dg -FK -HO -VW -VW -VW -HO -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +zp +Fv +gp +gp +Jk +gp +Ei +cu +an +ci +ST +Dr +Dr +Dr +dg +lV +HO +VW +VW +VW +HO +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (126,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd EM EM @@ -50303,15 +49965,15 @@ wk eG gG Ld -WS -DG -sT -Vh -cm -NC -PB -gp -gp +Sb +Sb +Sb +Lw +Ls +TU +ut +EP +lV VB gp Fv @@ -50336,7 +49998,7 @@ gp gp gp oy -FK +lV HO HE md @@ -50347,118 +50009,118 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (127,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -50485,7 +50147,7 @@ uu uu uu uu -rn +sm Dz jz vB @@ -50493,19 +50155,19 @@ iQ YQ eK Dz -Dz +Ok rn -yS -fD -WS -WS -sT -Vh -cm NC -Ca +Is +Is +Cz +Cz +Is +xM +Qa +bS tK -mO +pQ kD mr Fv @@ -50529,130 +50191,130 @@ qY Fv Fv Fv -Fv -so -HO -oH -HP -bf -HO -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Fv +Fv +HO +oH +HP +bf +HO +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (128,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -50687,19 +50349,19 @@ Dz Dz Dz Dz -Dz -Dz +Ok +Ok NC -TP -iW -eG -ua +Is Vh -cm -NC -gp -VB -gp +Vh +Vh +Vh +Is +Qa +ut +gF +lV So PB Fv @@ -50724,7 +50386,7 @@ xv Ht WD uC -so +Fv HO oH HP @@ -50733,120 +50395,120 @@ HO uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (129,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -50884,15 +50546,15 @@ jq jq EM NC -NC -NC -NC -Vv -Ea -oJ -NC -gp -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV lV lV @@ -50903,144 +50565,144 @@ Dk Tv ht Vo -KN -dG -pr -xk -hw -OX -hw -KN -dG -pr -hw -bL -gI -iz -FT -nX -Ns -RP -HP -tn -HO -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +KN +dG +pr +xk +hw +OX +hw +KN +dG +pr +hw +bL +gI +iz +FT +nX +Ns +RP +HP +tn +HO +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (130,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -51078,15 +50740,15 @@ Zx jq EM EM -EM -EM -NC -cB -mV -qb -NC -gp -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV EM EM @@ -51098,14 +50760,14 @@ Fv nm bK ZB -Wl +yQ kN Wl Wl Wl Wl ZB -Wl +yQ kN Wl Wl @@ -51119,122 +50781,122 @@ HP tn HO uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (131,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd gd EM @@ -51272,15 +50934,15 @@ VZ jq jq EM -EM -EM -NC -Za -vD -cm -NC -jc -VB +Is +Vh +Vh +Vh +Vh +Is +Qa +ut +gF lV EM uu @@ -51306,7 +50968,7 @@ WA VL WA PE -so +Fv HO oH HP @@ -51314,122 +50976,122 @@ pR HO uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (132,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gd EM EM @@ -51447,7 +51109,7 @@ rg ZT nL nL -ji +wG EM EM EM @@ -51466,15 +51128,15 @@ HG Ny jq EM -EM -EM -NC -tk -vD -Ml -NC -gp -VB +Is +Is +Is +Is +Is +Is +Qa +ut +gF lV EM uu @@ -51492,15 +51154,15 @@ Fv Fv Fv Fv -so -so -so -so -so -so -so -so -so +Fv +Fv +Fv +Fv +Fv +Fv +Fv +Fv +Fv HO oH HP @@ -51508,123 +51170,123 @@ bf HO uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (133,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM KU @@ -51642,9 +51304,9 @@ wG wG wG wG -EM -EM -EM +ji +ji +ji EM EM EM @@ -51663,12 +51325,12 @@ EM EM EM NC -MD -vD +sn aK -NC -PB -VB +aK +Zr +ut +Ni lV EM uu @@ -51686,138 +51348,138 @@ EM EM EM EM -EM -EM -EM -EM -EM -EM -EM -EM -EM -HO -Vk -HP -Rk -HO -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +EM +EM +EM +EM +EM +EM +EM +EM +EM +HO +Vk +HP +Rk +HO +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (134,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -51834,11 +51496,11 @@ EM EM EM EM -EM -EM -EM -EM -EM +ji +yk +tQ +yP +ji EM EM EM @@ -51858,11 +51520,11 @@ EM EM NC pW -vD -cm -NC -gp -VB +FF +FF +Tf +Hd +gF lV EM uu @@ -51897,120 +51559,120 @@ HO uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (135,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -52029,9 +51691,9 @@ Fi Fi Fi ji -ji -ji -ji +Cv +vt +Po ji EM EM @@ -52054,154 +51716,154 @@ NC MD Ax bu -NC -gp -VB -lV -EM -uu -uu -uu -uu -EM -Fv -ht -bK -zH -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -Fk -EM -EM -uu -HO -NP -HO -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +wC +It +He +lV +EM +uu +uu +uu +uu +EM +Fv +ht +bK +zH +cw +cw +cw +cw +hn +hn +hn +pG +pG +pG +pG +pG +pG +EM +EM +uu +HO +NP +HO +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (136,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov EM EM EM @@ -52223,9 +51885,9 @@ Ek py py ji -yk -tQ -yP +re +lv +oe ji EM EM @@ -52249,8 +51911,8 @@ tA vD Bm NC -gp -VB +lV +jY lV EM uu @@ -52262,19 +51924,19 @@ Fv ht bK zp -Fk +cw FX AR -Fk +cw Zt AR -Fk +hn JW vh sv oR -Fk -Fk +pG +pG EM EM uu @@ -52284,113 +51946,113 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (137,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi Fi Fi @@ -52417,9 +52079,9 @@ wd gk gk ji -Cv -vt -Po +jG +FQ +oN ji IY IY @@ -52444,147 +52106,147 @@ gt em NC gp -VB -lV -EM -uu -uu -uu -EM -EM -Fv -ht -bK -zp -Fk -FX -fz -Fk -Nw -fz -Fk -Yk -fz -fz -fz -Fk -Fk -EM -EM -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +VB +lV +EM +uu +uu +uu +EM +EM +Fv +ht +bK +zp +cw +FX +fz +cw +Nw +fz +hn +Yk +fz +fz +fz +pG +pG +EM +EM +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (138,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi ik zI @@ -52611,13 +52273,13 @@ KZ KZ bI ji -re -lv -oe +DM +kJ +wD ji Mr ho -iG +Gg Nh fv sU @@ -52649,20 +52311,20 @@ EM Fv ht bK -zp -Fk +DU +cw eJ nA -Fk +cw eJ bj -Fk +hn eJ hB yO SN -Fk -Fk +pG +pG EM EM uu @@ -52673,112 +52335,112 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (139,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb lT @@ -52805,13 +52467,13 @@ kf ef zP ji -jG -FQ -oN +Hk +ro +Hk ji lo Sv -iG +Gg uP bD Zi @@ -52828,151 +52490,151 @@ oz oz Zz bR -BU -EL -NC -gp -VB -lV -EM -uu -uu -uu -EM -EM -Fv -ht -bK -rv -cs -Zq -fN -Nk -CH -fN -CN -Qx -fN -lW -vr -kr -Fk -EM -EM -EM -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +BU +EL +NC +gp +VB +lV +EM +uu +uu +uu +EM +EM +Fv +ht +bK +rv +ea +Zq +fN +Nk +CH +fN +CN +Qx +fN +lW +vr +kr +pG +EM +EM +EM +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (140,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi LA XP @@ -52999,9 +52661,9 @@ Or ef ef ji -DM -kJ -wD +oE +ro +eA ji EO ob @@ -53050,7 +52712,7 @@ fz yI fz Dq -Fk +pG EM EM EM @@ -53061,112 +52723,112 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (141,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi Ry tY @@ -53204,163 +52866,163 @@ LN Wu YB Pg -AD -oU -rJ -Nj -Dp -Ou -im -im -im -wx -Lr -Rd -Li -UY -FP -jI -Bk -lV -EM -uu -uu -uu -uu -EM -Fv -nm -lS -PD -mQ -XZ -vi -OC -nn -hU -QN -Zs -Bh -yI -fz -qH -Fk -EM -EM -EM -EM -EM -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +AD +oU +rJ +Nj +Dp +Ou +im +im +im +wx +Lr +Rd +Li +UY +FP +jI +Bk +lV +EM +uu +uu +uu +uu +EM +Fv +nm +lS +PD +mQ +XZ +vi +OC +nn +hU +QN +Zs +Bh +yI +fz +qH +pG +EM +EM +EM +EM +EM +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (142,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -53393,13 +53055,13 @@ kE ji RO Pq -iG +Gg Aq eB Zi Mp Uk -iG +Gg Hn jh jk @@ -53438,7 +53100,7 @@ lN CM Pa vP -Fk +pG EM EM EM @@ -53448,113 +53110,113 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (143,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -53587,13 +53249,13 @@ kE ji vK vK -iG +Gg id eB Zi Mp UC -iG +Gg zJ Uo NZ @@ -53607,148 +53269,148 @@ Wi BU cm NC -gp +PB VB lV -EM -uu -uu -uu -EM -EM -Fv -ht -Wl -DE -cs -YI -tU -UG -dd -zh -JZ -Ww -KJ -kA -zy -RG -Fk -EM -EM -EM -EM -EM -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +EM +uu +uu +uu +EM +EM +Fv +ht +Wl +DE +ea +YI +tU +UG +dd +zh +JZ +Ww +KJ +kA +zy +RG +pG +EM +EM +EM +EM +EM +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (144,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -53761,7 +53423,7 @@ nh sA sy Eg -Ok +Ij Kj Eg pZ @@ -53781,16 +53443,16 @@ gS ji vK vK -iG +Gg Qb mt Zi Mp nQ -iG +Gg Hn Uo -hC +ge Gg Lz Np @@ -53814,10 +53476,10 @@ Fv RY TM TC -Fk +Fy ld fm -Fk +Fy ea xR Ew @@ -53825,8 +53487,8 @@ SN Aj VC SN -Fk -Fk +pG +pG EM EM EM @@ -53835,126 +53497,126 @@ EM uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (145,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY qZ qZ KM -kP +OW UV uI Cb qs -aI +Ij lR Qi Eg @@ -53981,174 +53643,174 @@ Gf jk RS nQ -iG +Gg zJ Uo BK Gg oz -Np -Np -oz -Zz -bR -BU -cm -NC -gp -VB -lV -uu -uu -EM -EM -EM -EM -Fv -Fv -hV -Fv -Fk -sG -fz -Fk -OI -fz -fz -fz -jK -ce -fz -Uu -Fk -EM -EM -EM -EM -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Np +Np +oz +Zz +bR +BU +cm +NC +gp +VB +lV +uu +uu +EM +EM +EM +EM +Fv +Fv +hV +Fv +Fy +sG +fz +Fy +OI +fz +fz +fz +jK +ce +fz +Uu +pG +EM +EM +EM +EM +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (146,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi vE Cx qZ qZ oM -kP +OW uv ue tS VP -aI +Ij CB cJ Eg @@ -54175,7 +53837,7 @@ Lt kM Sm Ik -iG +Gg Hn xt hC @@ -54202,10 +53864,10 @@ lV DQ DQ zV -Fk +Fy sG CZ -Fk +Fy OI fz nB @@ -54214,7 +53876,7 @@ pD GN fz Uu -Fk +pG EM EM EM @@ -54223,126 +53885,126 @@ EM uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (147,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi jT tY qZ qZ oM -kP +OW EH eo Tt hJ -aI +Ij Kw AL Eg @@ -54374,172 +54036,172 @@ Gg Gg Gg Gg -NC -NC -NC -NC -NC -JX -BU -cm -NC -gp -LQ -lV -lV -uu -lV -dS -QJ -kv -lV -vQ -DQ -DQ -Fk -Fk -Fk -Fk -Fk -Fk -ES -Fk -Fk -cW -Fk -Fk -EM -EM -EM -EM -EM -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +NC +NC +NC +NC +NC +JX +BU +cm +NC +gp +LQ +lV +lV +uu +lV +dS +QJ +kv +lV +vQ +DQ +DQ +Fy +Fy +Fy +Fy +pG +pG +ES +pG +pG +cW +pG +pG +fF +EM +EM +EM +EM +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (148,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi NV Br qZ qZ oM -kP +OW uv UL hF kd -aI +Ij Ap Yo -wp +Ij Wr xU Ds @@ -54595,12 +54257,12 @@ EM EM EM EM -Fk +pG qL to -Fk +pG Bf -Fk +pG EM EM EM @@ -54612,125 +54274,125 @@ EM uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (149,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb XP qZ qZ oM -kP +OW Pd uI Ur wb -aI +Ij jO pf qT @@ -54768,151 +54430,151 @@ tb zk kq Vd -Un -cm -NC -gp -VB -gp -lV -lV -lV -lV -lV -jr -lV -lV -lV -lV -lV -lV -lV -EM -EM -Fk -mu -mf -Fk -xW -Fk -EM -EM -EM -EM -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Un +cm +NC +gp +VB +gp +lV +lV +lV +lV +lV +jr +lV +lV +lV +lV +lV +lV +lV +EM +EM +pG +mu +mf +pG +xW +pG +EM +EM +EM +EM +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (150,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -54983,12 +54645,12 @@ lV lV uu EM -Fk -Fk -Fk -Fk +pG +pG +pG +pG dV -Fk +pG EM EM EM @@ -54998,115 +54660,115 @@ uu uu uu uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (151,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -55149,158 +54811,158 @@ Uj QK aq jg -TX -Te -xc -xc -Af -WS -qS -sP -fO -IC -IC -IC -gp -gp -gp -Ir -su -la -Pp -Ir -Ir -fI -Ir -at -tt -lV -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +TX +Te +xc +xc +Af +WS +qS +sP +xj +IC +IC +IC +gp +gp +gp +Ir +su +la +Pp +Ir +Ir +fI +Ir +at +tt +lV +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +uu +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (152,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb tY @@ -55345,13 +55007,13 @@ yd jg TX Te -fO -fO -fO -fO +xj +xj +xj +xj xr -fO -fO +xj +xj yW Dm sp @@ -55386,115 +55048,115 @@ Ge Ge Ge uu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (153,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi Ry tY @@ -55539,7 +55201,7 @@ Nu eC TX AP -fO +xj vO vO vO @@ -55563,132 +55225,132 @@ OU ry Ir lV -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (154,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi LA BE @@ -55706,7 +55368,7 @@ Pz ct OV Mt -OW +Bu Ug iX nt @@ -55714,10 +55376,10 @@ qZ Or ef xH -My -My -My -My +Fi +Fi +Fi +Fi hy oF kY @@ -55733,7 +55395,7 @@ Nu hK CI Te -fO +xj vO DA nF @@ -55762,127 +55424,127 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (155,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Fi nb nE @@ -55908,7 +55570,7 @@ RI ay ef WL -My +Fi DS rN Wn @@ -55927,155 +55589,155 @@ Du nf Uy Te -fO +xj vO DA IP -yu -Ys -NJ -KF -BP -sp -HI -LG -bG -sp -oZ -op -sm -lw -Kr -Xh -OU -lV -EV -lV -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +yu +Ys +NJ +KF +BP +sp +HI +LG +bG +sp +oZ +op +bE +lw +Kr +Xh +OU +lV +EV +lV +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (156,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY Fi RV @@ -56121,8 +55783,8 @@ li fG TX Te -fO -vO +IC +nu MY Dj HU @@ -56150,125 +55812,125 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (157,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY Fi @@ -56296,7 +55958,7 @@ sh sh sh mx -My +Fi My rD vv @@ -56310,12 +55972,12 @@ Oe rx mU kg -Xq +HD kS DB TX Te -fO +xj vO lL lA @@ -56344,126 +56006,126 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (158,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY po yE @@ -56477,25 +56139,25 @@ yE yE yE UI -cx +yj UX uK -cx +yj Fi bb bb -My -My +Fi +Fi kF -Xp +pE dk -My -My -My -My -My +Fi +Fi +aI +aI +aI hy -fA +ja fg go ja @@ -56509,7 +56171,7 @@ Nu cE Tn Te -fO +xj vO dp gx @@ -56525,7 +56187,7 @@ JO sp ol gL -rT +bE Sw Jc TG @@ -56538,140 +56200,140 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (159,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI +cl +cl +cx +Ad +cl tv tv -tv -tv -tv -tv -tv -tv +cl OA FR -cx +yj UX UX Pr @@ -56679,7 +56341,7 @@ Ka aU pA kn -hW +gb bX km Aw @@ -56703,7 +56365,7 @@ Nu PL TX vY -fO +xj vO vO vO @@ -56732,140 +56394,140 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (160,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI QS BC OL +MS gM -gM -gM -PX -tv -tv +HB +eh +cl +cl FR -cx +yj UX UX Pr @@ -56873,7 +56535,7 @@ jL Sd TJ XM -hW +gb tJ TS TS @@ -56897,11 +56559,11 @@ Nu Tq Sf Te -fO -fO -fO -fO -fO +xj +xj +xj +xj +xj ac rw IC @@ -56926,142 +56588,142 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (161,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI QS VR OL -OL +Uq OL OL xO Dg ej TN -cx -cx -cx +yj +yj +yj Pr Eb QD @@ -57096,10 +56758,10 @@ xc xc xc pt -pG +QF hv NX -Yc +hW LV oq Qg @@ -57117,141 +56779,141 @@ at lV gd gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (162,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI QS gv eZ -OL -wJ +ud wJ +Nd PX -tv -tv +cl +cl Dy nw sJ @@ -57261,7 +56923,7 @@ LH gr Na KT -hW +gb wH mz EW @@ -57293,7 +56955,7 @@ Od bq DL dM -Yc +hW UQ oq oq @@ -57314,139 +56976,139 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (163,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Ie GI -tv -tv -tv +cl +cl +fA um +cl tv tv -tv -tv +cl OA -FR +OY xp nK We @@ -57455,11 +57117,11 @@ ee Xl cb tq -hW -hW +gb +gb Xp -hW -hW +gb +gb lp Cp SL @@ -57508,138 +57170,138 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (164,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY xe +cZ +cZ +cZ +hT +cp +zg +eQ KL -KL -KL -KL -KL -KL -KL -KL -KL -KL +yS +yS fa xp Gd @@ -57649,7 +57311,7 @@ jU ri yl hI -Qh +Pr wo aC iF @@ -57702,142 +57364,142 @@ gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (165,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY rY rY ko +BM pi -pi -pi -pi -cx -cx -cx +IG +As +yj +yj +yj IB Tz -uR +sW JA Pl ri @@ -57865,7 +57527,7 @@ Bl yg XE JK -Xm +iu dA PF PF @@ -57884,149 +57546,149 @@ rV Jb iy jJ -HY -pq -Jm -Jm -Jm -Id -hn -gd -gd -gd -gd -gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +HY +pq +Jm +Jm +Jm +Id +Jm +gd +gd +gd +gd +gd +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (166,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY rY -cx +yj sc sc sc -cx -cx +yj +yj KC TY QL @@ -58084,138 +57746,138 @@ jE Kx WE ug -Bu +hR gd gd gd gd gd -OY -OY +ov +ov tT -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov iV -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (167,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY rY -cx +yj dR PO Ms @@ -58231,7 +57893,7 @@ qg YH ab jC -Qh +Pr GO Ia Su @@ -58245,7 +57907,7 @@ Nq vI RF VT -hW +gb iv rx rx @@ -58253,10 +57915,10 @@ gC yx Nu lZ -Xm +XI nT -xc -xc +lb +Lq VN gf bB @@ -58278,138 +57940,138 @@ RK RR RR GL -Bu +hR gd gd gd gd gd -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (168,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov rY -cx +yj aW pw Ph @@ -58431,21 +58093,21 @@ Sg zQ gb Uz -nu +Uz wB Ig -pQ +Uz Ig Fq -nu Uz -hW +Uz +gb BL tO tO zw ds -kS +fJ mY hN lD @@ -58472,137 +58134,137 @@ Jb Jb Jb DV -Bu +hR gd gd gd gd -OY -OY -Hk +ov +ov +Al SH -MS -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov Al HV -DU -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (169,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj JF -uR +sW ER yj yj @@ -58625,15 +58287,15 @@ gl gl gb Ws -Eh +Uz Vm TS -pQ +Uz TS lO -cw +Uz Xz -hW +gb qc Ai aM @@ -58641,9 +58303,9 @@ Zy nG hb Og -lb +iG HS -xc +Hx mX TR eX @@ -58665,136 +58327,136 @@ co co co hf -mw -Bu -gd -gd -gd -OY -OY -OY -cl -kV -AU -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -ge -lm -HB -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +mw +hR +gd +gd +gd +ov +ov +ov +JQ +kV +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +JQ +lm +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (170,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj MH lz BX @@ -58819,27 +58481,27 @@ ly gl Ws Ws -XI +MV wB Ig MV Ig Fq -YW +MV cM -hW +gb Nu cj EK PU rc -li cV IV -vy -fo +IV +IV +uR xq -xc +Xm eU Ol EG @@ -58860,135 +58522,135 @@ oc oc oo DV -hn -TU -TU -TU +Jm +JQ +JQ +JQ Sn -TU -TU -eA +JQ +JQ +JQ ha -eA -TU -TU -TU +JQ +JQ +JQ +JQ Sn -TU -TU -TU -TU +JQ +JQ +JQ +JQ Sn -TU -TU -TU -Cl +JQ +JQ +JQ +JQ wA -Cl -ut -TU -TU -TU -ut -ut -TU -TU -IG -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +Sn +JQ +JQ +JQ +Sn +Sn +JQ +JQ +Al +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (171,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj To lz gU @@ -59022,21 +58684,21 @@ gd gd gd gd -OY +ov ON ON DW ON ON NF -lV -lV -FH +nD +hz +Nu lB FH uD uD -Zr +EG jB mo EG @@ -59056,7 +58718,7 @@ oo sN AW OP -OP +Yq qv Rh OP @@ -59066,7 +58728,7 @@ Oa Oo OP tF -OP +Yq oD OP qv @@ -59074,127 +58736,127 @@ WY OP OP qv -OP +Yq WY OG qC MB IK OP -qv +tF OP Xk Ly bN eY JS -OY +ov Hm -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (172,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj IB OO Rx yj -bo -bo -bo +OE +OE +OE Qe bl Qe -bo -bo +OE +OE gl gl Uf @@ -59222,15 +58884,15 @@ QH Fb Ho ON -Cz -tt -lV -GB -qM +PK +PK +vy +Nu +pV GB uD rY -Zr +EG bt CS EG @@ -59250,7 +58912,7 @@ oo bO gq Oh -Oh +YW qN ng vN @@ -59260,7 +58922,7 @@ rW Jg ze nJ -ze +Eh GP ze Nl @@ -59268,13 +58930,13 @@ VA JC ze iM -ze +Eh FC -ty +JC Wh -ty +JC Cs -ty +JC CA ty qq @@ -59282,106 +58944,106 @@ lf eS xJ On -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (173,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj lH UX eL -bo +OE xS ZR lI @@ -59392,11 +59054,11 @@ wm ml ia Uf -cp +SO yn yn yn -cp +SO kk gl gd @@ -59416,15 +59078,15 @@ aN DR qD ON -Dc -Qt -lV -eQ +Nu +bC +Nu +Nu qM -GB +cs uD rY -Zr +EG cH Xx EG @@ -59444,7 +59106,7 @@ oo rE VS Mg -Qs +bo qv au Qs @@ -59454,7 +59116,7 @@ pS Qs Qs wE -Qs +bo Lg Qs CK @@ -59462,120 +59124,120 @@ bz Qs Lg qv -Qs +bo BY -Qs +dJ qv Qs ss Qs -qv +wE Qs HA -eA -fF -fF -qK -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(174,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx +JQ +JQ +JQ +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(174,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj lH UX eL -bo +OE jo no XW @@ -59586,11 +59248,11 @@ Md IO ek rM -cp +SO hk -Xe +wp xX -cp +SO UK gl gd @@ -59611,18 +59273,18 @@ SA iK YE Dc -Ir -lV -GB +Ks +Ks +kP fi wI uD rY -Zr -Zr -Zr -Zr -hn +EG +EG +EG +EG +Jm XA Vc ZE @@ -59638,137 +59300,137 @@ uZ AG AG Sn -fF -fF +JQ +JQ Sn -fF -fF -fF +JQ +JQ +JQ Sn -fF -fF -fF -fF +JQ +JQ +JQ +JQ Sn -fF -Cl +JQ +JQ wA -Cl +JQ Sn -fF -fF -fF -ut -fF -fF -ut -fF -fF -fF -ut -ut -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +JQ +JQ +Sn +JQ +JQ +Sn +JQ +JQ +JQ +Sn +Sn +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (175,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -cx -cx -cx -cx +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +yj +yj +yj +yj OE Fe Ha @@ -59805,18 +59467,18 @@ Gv ON ON OR -Ir -FK -Qa +Qt +lV +uD Rf -Qa +kh uD rY rY rY rY rY -hn +Jm lu Dn tZ @@ -59831,138 +59493,138 @@ VS bZ do CV -hn -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -Cl +Jm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +JQ Fg -HB -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +JQ +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (176,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE dY ZA @@ -60000,8 +59662,8 @@ xx Vr zv tt -FK -Qa +lV +uD oI kh rY @@ -60010,10 +59672,10 @@ rY rY rY rY -hn +Jm hR hR -hn +Jm OJ IJ Jm @@ -60025,138 +59687,138 @@ do AG AG KO -Bu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -Nd +hR +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +Al SF JQ -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (177,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE If ZA @@ -60168,11 +59830,11 @@ lc gl kx pX -cp +SO zF Kt wf -cp +SO JH gl gd @@ -60186,7 +59848,7 @@ gd gd gd gd -OY +ov lV Ir Ir @@ -60194,10 +59856,10 @@ Ir lV bQ lV -FK +lV Ng HQ -gK +kh rY rY rY @@ -60205,12 +59867,12 @@ rY rY rY rY -OY -OY -hn -hn -hn -hn +ov +ov +Jm +Jm +Jm +Jm CV aa tG @@ -60219,138 +59881,138 @@ tG CV KO rj -Bu -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +hR +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (178,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE NG ZA @@ -60362,11 +60024,11 @@ Ck gl Hz BD -cp +SO WT Kt wf -cp +SO kk gl rY @@ -60387,358 +60049,358 @@ Uc wc lV vd -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov rY rY rY rY -OY -OY -OY -OY +ov +ov +ov +ov QE -OY -hn -hn +ov +Jm +Jm hR hR -hn +Jm hR hR -hn -hn -hn -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +Jm +Jm +Jm +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov AM -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(179,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OE -Il -bo -Zj -mi -Xo -bo -Ck -gl -Rm -Xr -cp -lJ -cP -lJ -cp -kk -gl -rY -rY -rY -OY -OY -OY -OY -OY -OY -OY -rY -rY -lV -tI -tI -tI -lV -vd -OY -OY -OY -uM -OY -OY -OY -rY -rY -rY -rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(179,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +OE +Il +OE +Zj +mi +Xo +OE +Ck +gl +Rm +Xr +SO +lJ +cP +lJ +SO +kk +gl +rY +rY +rY +ov +ov +ov +ov +ov +ov +ov +rY +rY +lV +tI +tI +tI +lV +vd +ov +ov +ov +uM +ov +ov +ov +rY +rY +rY +rY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (180,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE NG ZA @@ -60750,189 +60412,189 @@ Ck gl mB kO -cp +SO SO qn SO -cp +SO UK gl rY rY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov rY -OY -OY -OY -OY +ov +ov +ov +ov rY vd -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov rY rY rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (181,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov OE mS ed @@ -60945,390 +60607,390 @@ gl du sl rh -cp +SO Gs -cp +SO rh kk gl rY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov oi -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(182,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OE -OE -OE -OE -OE -OE -OE -OE -gl -rh -Rp -Kp -Kp -Kp -Kp -Kp -px -gl -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(182,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +OE +OE +OE +OE +OE +OE +OE +OE +gl +rh +Rp +Kp +Kp +Kp +Kp +Kp +px +gl +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (183,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov gl gl gl @@ -61339,1901 +61001,1901 @@ QT QT gl gl -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (184,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(185,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(186,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(185,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(186,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (187,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (188,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -"} -(189,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} -(190,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +(189,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +"} +(190,1,1) = {" +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (191,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} (192,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov +ov "} diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm index f0d2852cac..bc5b92ef90 100644 --- a/maps/tether/levels/surface1.dmm +++ b/maps/tether/levels/surface1.dmm @@ -119,7 +119,7 @@ /obj/machinery/door/airlock/mining, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "aei" = ( /obj/structure/extinguisher_cabinet{ @@ -183,10 +183,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "aga" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "agi" = ( @@ -194,6 +192,9 @@ icon_state = "1-4" }, /obj/effect/floor_decal/industrial/warning/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "agK" = ( @@ -243,7 +244,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "aic" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_one) "aih" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -304,11 +305,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "ajN" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -425,12 +422,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "amh" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "amv" = ( @@ -479,22 +475,18 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "anu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "aob" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/structure/curtain/black{ + icon_state = "open" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/engineering/atmos_intake) +/area/crew_quarters/visitor_dining) "aoc" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -610,6 +602,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"aqB" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "aqJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -650,10 +645,7 @@ /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "arB" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -718,6 +710,9 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "atu" = ( @@ -730,15 +725,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"atv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/rnd/outpost/mixing) "atJ" = ( /obj/structure/railing{ dir = 8 @@ -799,14 +785,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "auv" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/tram) "auC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -846,8 +826,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -868,7 +847,7 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) "avD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/tether/surfacebase/outside/outside1) "avJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -950,23 +929,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) -"axp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "axr" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -1015,7 +977,7 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "azD" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lowmedbaymaint) "azH" = ( /obj/machinery/door/firedoor/glass, @@ -1045,7 +1007,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "aAw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/mimeoffice) "aAF" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -1193,7 +1155,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "aEl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/holodeck_control) "aEI" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -1250,10 +1212,7 @@ /obj/effect/floor_decal/corner/blue/border, /obj/machinery/light, /obj/structure/cable/orange, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "aFW" = ( @@ -1377,7 +1336,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "aIm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/primary) "aIF" = ( /obj/effect/floor_decal/borderfloor{ @@ -1450,9 +1409,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"aKe" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "aKB" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -1684,7 +1658,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -1724,11 +1697,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -1938,7 +1907,7 @@ }, /area/tether/surfacebase/old_tram) "aVW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/tankstorage) "aWe" = ( /obj/structure/catwalk, @@ -2019,7 +1988,7 @@ }, /area/tether/surfacebase/old_tram) "baG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/storage/surface_eva) "baS" = ( /obj/machinery/air_alarm{ @@ -2066,8 +2035,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -2197,6 +2165,20 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) +"bhf" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "bhU" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -2296,8 +2278,8 @@ /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Construction Site"; - dir = 8 + dir = 8; + name = "Construction Site" }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/surface_one_hall) @@ -2339,7 +2321,6 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "blB" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2352,6 +2333,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "bmn" = ( @@ -2547,8 +2531,8 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "bre" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/public_garden_one) "brf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -2679,22 +2663,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"bwo" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "bws" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2771,8 +2739,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc/high{ - dir = 4; +/obj/machinery/power/apc/high/east_mount{ pixel_x = 28 }, /turf/simulated/floor/tiled, @@ -2800,11 +2767,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -2846,7 +2809,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) "byY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/emergency_storage/atrium) "bzF" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ @@ -2927,8 +2890,8 @@ /turf/simulated/floor/tiled/steel_ridged, /area/rnd/outpost/mixing) "bAS" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) +/turf/simulated/wall/prepainted/science, +/area/tether/surfacebase/outside/outside1) "bAT" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -2942,7 +2905,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "bBd" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/processing) "bBx" = ( /obj/structure/cable/green{ @@ -3006,17 +2969,14 @@ }, /obj/structure/table/standard, /obj/item/bikehorn/rubberducky, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "bEk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/door/firedoor{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -3064,7 +3024,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_4) "bEZ" = ( @@ -3090,9 +3052,27 @@ /obj/machinery/atmospherics/pipe/tank/oxygen, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"bFr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "bFv" = ( /obj/structure/sign/biohazard, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/mimeoffice) "bFx" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3161,7 +3141,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 10 }, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -3249,7 +3228,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) "bJY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/atmos) "bKt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3302,7 +3281,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "bLp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/research) "bLs" = ( /obj/structure/cable/heavyduty{ @@ -3318,7 +3297,6 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "bLI" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/medical{ id_tag = "Psych"; name = "Mental Health" @@ -3336,16 +3314,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "bLN" = ( /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -3489,10 +3465,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -3501,14 +3473,13 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "bRr" = ( /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 8; - pixel_x = -25 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -3549,11 +3520,10 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) "bSz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/lowernortheva/external) "bSA" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -3645,11 +3615,11 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/cave) "bWi" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "psych_office_inside" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "psych_office_inside"; + name = "Psych Office - Inside" }, -/obj/structure/grille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "bWA" = ( @@ -3705,7 +3675,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_7) "bXz" = ( @@ -3755,8 +3727,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -3788,9 +3759,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/processing) "bYF" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted/medical, /area/maintenance/lowmedbaymaint) "bYP" = ( /obj/landmark{ @@ -3855,9 +3824,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "cbm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "cbt" = ( @@ -3886,7 +3854,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -3916,7 +3884,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ccx" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/clownoffice) "cdo" = ( /obj/effect/floor_decal/industrial/warning/dust, @@ -3925,6 +3893,20 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) +"cdp" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "cdU" = ( /obj/structure/railing{ dir = 8 @@ -4218,10 +4200,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "ckK" = ( @@ -4337,8 +4316,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = 33; + pixel_y = 24 + }, +/obj/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled, -/area/tether/surfacebase/lowernorthhall) +/area/tether/surfacebase/lowernortheva) "cnc" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -4484,7 +4468,9 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -4569,7 +4555,7 @@ /obj/structure/sign/directions/evac{ name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/xenoflora) "cug" = ( /obj/effect/floor_decal/borderfloor{ @@ -4718,7 +4704,7 @@ dir = 4 }, /obj/machinery/door/firedoor{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -4727,18 +4713,20 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "cwT" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "cxs" = ( -/turf/simulated/wall, -/area/tether/surfacebase/security/weaponsrange) +/turf/simulated/wall/r_wall/prepainted/engineering/atmos, +/area/engineering/atmos) "cxv" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4758,11 +4746,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -4843,6 +4827,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "cAy" = ( @@ -4905,14 +4892,47 @@ /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) "cBT" = ( -/turf/simulated/wall/r_wall, -/area/engineering/atmos_intake) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/north_stairs_one) "cCl" = ( /obj/structure/table/borosilicate, /turf/simulated/floor/wood, /area/vacant/vacant_bar) +"cCq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"cCs" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "cCw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/lower/solars) "cCy" = ( /obj/machinery/button/remote/blast_door{ @@ -4954,11 +4974,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -5033,10 +5049,7 @@ /turf/simulated/floor/tiled, /area/maintenance/lower/atmos) "cGj" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -5106,11 +5119,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "cHI" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "psych_birdcage" - }, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "cHP" = ( @@ -5216,11 +5226,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "cKB" = ( @@ -5353,7 +5359,7 @@ /area/crew_quarters/sleep/Dorm_6) "cMx" = ( /obj/structure/sign/electricshock, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/solars) "cNH" = ( /obj/structure/table/marble, @@ -5375,7 +5381,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "cNN" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/brig/bathroom) "cNV" = ( /obj/structure/window/reinforced, @@ -5418,7 +5424,7 @@ /area/maintenance/lowmedbaymaint) "cPy" = ( /obj/structure/sign/warning/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "cPE" = ( /obj/structure/table/alien/blue{ @@ -5493,10 +5499,7 @@ /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "cRX" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "cSe" = ( @@ -5812,8 +5815,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -5839,11 +5841,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "cZI" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -5887,7 +5886,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -6040,7 +6039,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ name = "Unisex Showers" }, @@ -6050,8 +6051,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "die" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -6111,6 +6111,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"djJ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "dkx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6161,10 +6167,23 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "dkS" = ( -/turf/simulated/wall, -/area/maintenance/lower/atmos) +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "dlE" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/centralstairwell) "dlX" = ( /obj/machinery/portable_atmospherics/powered/pump, @@ -6297,10 +6316,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/portables_connector{ dir = 1 }, @@ -6384,11 +6400,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "dqu" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -6433,10 +6445,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) -"drC" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "drK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6474,15 +6482,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "dsk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/curtain/black{ icon_state = "open" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "dsp" = ( @@ -6567,7 +6573,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "dtJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "dtW" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -6592,7 +6598,7 @@ /area/tether/surfacebase/security/brig) "dtY" = ( /obj/structure/sign/department/toxins, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "dud" = ( /obj/effect/floor_decal/borderfloor, @@ -6702,7 +6708,7 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) "dxH" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_1) "dyl" = ( /obj/structure/railing{ @@ -6717,9 +6723,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/rnd) "dyy" = ( -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "dzq" = ( @@ -6788,11 +6792,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "dBK" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/orange{ icon_state = "0-4" }, @@ -6813,10 +6813,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "dCa" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, @@ -6935,17 +6932,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"dEV" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall/prepainted, +/area/maintenance/substation/civ_west) "dFB" = ( /obj/machinery/bomb_tester, /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/testing_lab) "dFO" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "dFS" = ( @@ -6962,10 +6966,7 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -7021,11 +7022,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost) "dGO" = ( @@ -7254,6 +7251,9 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance) +"dNT" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/surface_one_hall) "dOp" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -7301,9 +7301,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"dQI" = ( +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/surface_one_hall) "dQJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "dRg" = ( @@ -7313,9 +7317,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "dRq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/art) "dRA" = ( @@ -7400,6 +7402,11 @@ }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) +"dTk" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cargostore) "dTD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -7425,8 +7432,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "dVi" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7497,10 +7503,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "dWg" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/vacant/vacant_bar) "dWq" = ( @@ -7580,18 +7583,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/storage/surface_eva) -"dYB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/button/remote/airlock{ - id = "elevescaper"; - name = "elevator escape button"; - pixel_y = 32 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "dYC" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 @@ -8082,7 +8073,7 @@ /turf/simulated/floor/tiled, /area/rnd/external) "elf" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/brig/storage) "elh" = ( /obj/machinery/vending/cola{ @@ -8188,10 +8179,7 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ pixel_x = 12; pixel_y = -24 @@ -8270,9 +8258,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "era" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/primary) "erh" = ( @@ -8300,12 +8286,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) -"erH" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "esy" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -8371,7 +8351,7 @@ /turf/simulated/floor/tiled, /area/security/checkpoint) "ewh" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/xenoarch_storage) "ewK" = ( /obj/structure/cable/orange{ @@ -8390,25 +8370,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig/bathroom) "ewT" = ( +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) -"exA" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, +"exw" = ( +/turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/surface_one_hall) "exV" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "eyc" = ( -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/structure/cable/green{ @@ -8420,6 +8392,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "eyh" = ( @@ -8460,6 +8435,12 @@ /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) +"ezv" = ( +/obj/structure/sign/directions/evac{ + dir = 4 + }, +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/surface_one_hall) "ezH" = ( /obj/structure/cable{ icon_state = "2-4" @@ -8507,10 +8488,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "eBc" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -8594,7 +8572,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/testing) "eCJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost) "eCR" = ( /obj/structure/cable/heavyduty{ @@ -8606,7 +8584,12 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "eDq" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "eDJ" = ( @@ -8663,19 +8646,6 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) -"eFe" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "eFC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -8715,7 +8685,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "eGP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/lowernortheva) "eHb" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -8846,7 +8816,7 @@ /obj/structure/sign/directions/cargo{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_one) "eKy" = ( /obj/turbolift_map_holder/tether{ @@ -8881,12 +8851,8 @@ /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 1 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "eMc" = ( @@ -8910,9 +8876,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "eMp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "eMB" = ( @@ -8945,7 +8910,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "eOw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker) "eOE" = ( /obj/effect/floor_decal/industrial/danger{ @@ -9127,6 +9092,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"eVq" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/sleep/Dorm_7) "eXs" = ( /obj/machinery/button/windowtint{ id = "holodeck"; @@ -9163,9 +9131,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "eXH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/structure/curtain/black, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) @@ -9286,7 +9252,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "eZZ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virology) "fae" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9338,12 +9304,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "faJ" = ( -/obj/structure/closet/secure_closet/xenoarchaeologist, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/turf/simulated/wall/prepainted/science, +/area/hallway/lower/first_west) "faP" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -9397,7 +9359,7 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "fci" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/chemistry_lab) "fcm" = ( /obj/structure/disposalpipe/segment{ @@ -9430,31 +9392,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site) -"fdb" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "fdG" = ( /mob/living/simple_mob/animal/passive/gaslamp, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -9467,19 +9404,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "fea" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fey" = ( @@ -9685,8 +9611,7 @@ /turf/simulated/floor/maglev/virgo3b, /area/tether/surfacebase/outside/outside1) "fjm" = ( -/obj/machinery/power/apc/high{ - dir = 4; +/obj/machinery/power/apc/high/east_mount{ pixel_x = 28 }, /obj/structure/cable/green{ @@ -9714,6 +9639,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/camera/network/tether{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fjH" = ( @@ -9729,7 +9657,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ dir = 8 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virology) "fkh" = ( /obj/effect/floor_decal/borderfloor{ @@ -9856,10 +9784,7 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "fmo" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9964,7 +9889,7 @@ /obj/structure/sign/directions/evac{ name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_one) "fny" = ( /obj/item/bone/skull/unathi, @@ -10066,7 +9991,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_5) "fpi" = ( @@ -10193,7 +10120,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "ftm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_5) "ftG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -10306,7 +10233,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 1 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor{ dir = 1 }, @@ -10349,6 +10278,10 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, +/obj/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 25 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/storage/surface_eva/external) "fzG" = ( @@ -10542,8 +10475,7 @@ "fDW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -10561,8 +10493,7 @@ /obj/structure/dispenser{ phorontanks = 0 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/corner/paleblue{ @@ -10599,8 +10530,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "fEX" = ( -/turf/simulated/wall, -/area/rnd/xenoarch_storage) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/outside/outside1) "fFc" = ( /obj/machinery/fitness/punching_bag/clown, /turf/simulated/floor/plating, @@ -10704,11 +10635,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor, /area/rnd/outpost/atmos) @@ -10784,6 +10712,25 @@ "fJF" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) +"fJH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "fJW" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -10801,15 +10748,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_2) "fKN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/orange{ icon_state = "0-4" }, @@ -10836,7 +10781,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "fLr" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/first_west) "fLC" = ( /obj/machinery/door/firedoor/glass, @@ -10853,10 +10798,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/gas_storage) "fLE" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -10896,7 +10838,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "fNh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/tram) "fNu" = ( /obj/structure/catwalk, @@ -10910,11 +10852,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "fNI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11206,15 +11144,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "fTT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 9 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "fTY" = ( @@ -11224,11 +11158,7 @@ pixel_y = 4 }, /obj/item/storage/box/masks, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -11409,10 +11339,7 @@ dir = 1 }, /obj/structure/cable, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "fWF" = ( @@ -11513,7 +11440,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "fZN" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/external) "fZP" = ( /obj/structure/table/woodentable, @@ -11554,7 +11481,7 @@ /area/maintenance/lower/trash_pit) "gbQ" = ( /obj/structure/sign/warning/compressed_gas, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/storage) "gbR" = ( /obj/effect/floor_decal/borderfloor, @@ -11601,11 +11528,7 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "gdI" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11739,12 +11662,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "ggL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) "ggR" = ( @@ -11831,10 +11749,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/table/standard, /obj/item/stack/cable_coil/random_belt, /obj/item/stack/cable_coil/random_belt, @@ -11929,10 +11844,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -12174,7 +12086,7 @@ /obj/structure/sign/warning{ name = "\improper STAND AWAY FROM TRACK EDGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/tram) "gqk" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, @@ -12251,12 +12163,6 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "gst" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12267,7 +12173,8 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/brig) "gsy" = ( @@ -12389,12 +12296,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/mixing) "gwy" = ( @@ -12673,21 +12576,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) -"gCI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/computer/timeclock/premade/south, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "gCK" = ( /obj/structure/bed/chair/comfy/black, /obj/effect/floor_decal/borderfloor{ @@ -12699,21 +12587,13 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "gCQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/surfaceservicesubstation) "gDl" = ( /obj/machinery/light/small, /turf/simulated/floor/wood, /area/crew_quarters/visitor_dining) "gDT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "psych_office" - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -12725,6 +12605,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "psych_office"; + name = "Psych Office" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "gEn" = ( @@ -12793,11 +12678,7 @@ }, /area/hallway/lower/first_west) "gFJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -12839,7 +12720,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "gGA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/mentalhealth) "gHF" = ( /obj/effect/floor_decal/borderfloor{ @@ -12981,9 +12862,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost/eva) "gJF" = ( @@ -13023,7 +12902,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "gKQ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab/storage) "gKV" = ( /obj/structure/cable/yellow{ @@ -13035,10 +12914,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -13047,14 +12922,12 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "gLq" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -13093,10 +12966,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, @@ -13227,11 +13097,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -13308,10 +13174,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "gSb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/visitor_dining) "gSh" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/anomaly_lab/analysis) "gSQ" = ( /obj/effect/floor_decal/borderfloor{ @@ -13382,10 +13248,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "gUt" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "gVu" = ( @@ -13407,15 +13272,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) "gVG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "gVJ" = ( @@ -13491,8 +13348,7 @@ /area/rnd/hallway) "gZb" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/reagent_dispensers/water_cooler/full, @@ -13528,7 +13384,7 @@ /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker/laundry_arrival) "hdk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13553,22 +13409,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"hdA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "hdR" = ( /obj/machinery/conveyor{ dir = 4; @@ -13685,20 +13525,8 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "hhh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/tether/surfacebase/cargostore/office) -"hhC" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "hhW" = ( /obj/structure/bed/psych, /turf/simulated/floor/carpet/blue, @@ -13738,11 +13566,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -13895,12 +13719,11 @@ /turf/simulated/floor, /area/rnd/outpost/atmos) "hmK" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "hna" = ( @@ -13928,7 +13751,7 @@ /area/rnd/outpost/anomaly_lab) "hnn" = ( /obj/structure/sign/science, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/breakroom) "hnH" = ( /obj/effect/floor_decal/industrial/warning, @@ -13949,7 +13772,7 @@ /area/maintenance/lower/vacant_site) "hoc" = ( /obj/structure/sign/department/anomaly, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/hallway/lower/first_west) "hoo" = ( /obj/effect/floor_decal/borderfloor{ @@ -13972,11 +13795,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -14020,9 +13839,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "hpc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/first_aid_west) "hpi" = ( @@ -14363,24 +14180,13 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "hxV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/rnd/outpost/mixing) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/lowerhall) "hyb" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "hyj" = ( @@ -14390,8 +14196,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "hyG" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/lower/atmos) +/obj/machinery/door/blast/regular, +/turf/simulated/floor/maglev, +/area/tether/surfacebase/tram) "hzu" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -14411,11 +14218,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "hzG" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/medical{ name = "Mental Health"; req_one_access = list() }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "hzL" = ( @@ -14480,7 +14287,7 @@ /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_one) "hCr" = ( /turf/simulated/floor/wood, @@ -14544,6 +14351,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hDY" = ( @@ -14600,8 +14408,7 @@ /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/item/melee/umbrella/random, @@ -14731,12 +14538,12 @@ name = "Mental Health"; req_access = list(64) }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/mentalhealth) "hIz" = ( @@ -14818,6 +14625,18 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) +"hKr" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "hKC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14875,6 +14694,15 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"hLB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "hLP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -14928,7 +14756,7 @@ /area/tether/surfacebase/medical/lowerhall) "hMM" = ( /obj/structure/sign/department/anomaly, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab) "hNg" = ( /obj/structure/bed, @@ -14947,11 +14775,10 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "hND" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/heavyduty{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "hNG" = ( @@ -15134,11 +14961,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) "hRB" = ( @@ -15158,24 +14981,23 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "hRQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "hSe" = ( @@ -15193,7 +15015,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) "hSy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lowerhall) "hTC" = ( /obj/random/junk, @@ -15256,26 +15078,6 @@ }, /turf/simulated/floor/greengrid, /area/rnd/outpost/testing_lab) -"hVK" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "holodeck"; - name = "Holodeck Privacy Shutters"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "holodeck" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "holodeck" - }, -/turf/simulated/floor/plating, -/area/holodeck_control) "hVM" = ( /obj/machinery/camera/network/research_outpost{ dir = 4 @@ -15308,7 +15110,7 @@ /area/maintenance/lower/mining_eva) "hWL" = ( /obj/structure/sign/signnew/biohazard, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/outside/outside1) "hWM" = ( /obj/machinery/shower{ @@ -15414,6 +15216,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) +"hYQ" = ( +/obj/effect/step_trigger/teleporter/to_mining, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/lowernortheva/external) "hYS" = ( /obj/machinery/light/small{ dir = 8 @@ -15617,14 +15423,10 @@ /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) "ifE" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/curtain/black{ icon_state = "open" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/tram) "ifV" = ( @@ -15764,32 +15566,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) -"iiJ" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera/network/northern_star{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "iji" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, @@ -15811,6 +15587,10 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) +"ijH" = ( +/obj/effect/step_trigger/teleporter/to_plains, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside1) "ijY" = ( /obj/structure/table/standard{ name = "plastic table frame" @@ -15823,8 +15603,7 @@ /area/crew_quarters/locker) "ikl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "ikn" = ( @@ -15837,8 +15616,7 @@ /obj/structure/cable/cyan{ icon_state = "0-4" }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 28 }, /turf/simulated/floor/tiled, @@ -16130,11 +15908,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "iqO" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/anomaly_lab/airlock) "irQ" = ( /obj/structure/sign/warning/hot_exhaust, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/chamber) "irT" = ( /obj/structure/disposalpipe/segment{ @@ -16179,7 +15957,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "isQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/outside/outside1) "itU" = ( /obj/effect/floor_decal/borderfloor{ @@ -16314,7 +16092,7 @@ /area/tether/surfacebase/lowernorthhall) "ixT" = ( /obj/machinery/door/firedoor{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -16384,12 +16162,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "izd" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "izA" = ( @@ -16532,14 +16309,10 @@ dir = 1 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /obj/structure/bed/roller, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) @@ -16582,7 +16355,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "iEF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/visitor_laundry) "iEN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16696,7 +16469,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "iIW" = ( @@ -16730,6 +16502,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "iKs" = ( @@ -16799,7 +16574,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "iMm" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1379; @@ -16829,10 +16603,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "iMr" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_site/east) "iMz" = ( /obj/structure/catwalk, @@ -16903,8 +16680,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -16972,8 +16748,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "iQX" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/brig/bathroom) "iRw" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -17025,10 +16801,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "iSm" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "iSA" = ( @@ -17123,11 +16896,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "iUX" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -17381,10 +17150,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/maintenance/substation/SurfMedsubstation) "jbL" = ( @@ -17605,7 +17371,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/outpost/solars_shed) "jgm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -17630,7 +17396,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenance) "jii" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm2) "jiJ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, @@ -17676,12 +17442,6 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) "jmi" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -17689,7 +17449,9 @@ id = "gogogo"; opacity = 0 }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/testingroom) "jmr" = ( /obj/machinery/light{ @@ -17915,11 +17677,8 @@ "jrU" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/cyan{ icon_state = "0-4" @@ -17941,6 +17700,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"jsX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "jta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18010,7 +17777,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "juN" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/hardstorage) "jvw" = ( /obj/structure/closet/crate, @@ -18167,11 +17934,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/purple{ dir = 6 }, @@ -18311,6 +18074,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) +"jEh" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "jEQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -18337,17 +18115,21 @@ /turf/simulated/floor/tiled, /area/rnd/hardstorage) "jFz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/mining_eva) "jGa" = ( /obj/machinery/camera/network/research, /obj/machinery/floodlight, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 1; + pixel_y = 24 + }, +/obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "jGl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -18378,10 +18160,7 @@ /area/crew_quarters/sleep/maintDorm3) "jGz" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "jGL" = ( @@ -18393,7 +18172,7 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "jHU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/art) "jIl" = ( /obj/machinery/door/firedoor/glass, @@ -18462,10 +18241,10 @@ }, /area/tether/surfacebase/lowernorthhall) "jJq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/breakroom) "jJw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/lowernorthhall) "jJE" = ( /obj/machinery/light/flamp/noshade, @@ -18511,8 +18290,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - dir = 1; - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -18761,7 +18539,7 @@ /area/tether/surfacebase/outside/outside1) "jRi" = ( /obj/structure/symbol/lo, -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/atmos) @@ -18926,13 +18704,10 @@ }, /area/crew_quarters/visitor_lodging) "jVz" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_3) "jVN" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/bed/chair/wood{ dir = 4 @@ -19113,8 +18888,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -19287,8 +19061,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -19464,7 +19237,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_site/east) "kpo" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_4) "kpK" = ( /obj/effect/floor_decal/corner/lightorange{ @@ -19574,7 +19347,7 @@ dir = 4; name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/research) "ksf" = ( /obj/effect/floor_decal/borderfloor{ @@ -19740,7 +19513,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "kwf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/showers) "kwg" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -19821,10 +19594,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, @@ -19910,11 +19680,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "kAK" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19950,8 +19716,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -19975,15 +19740,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "kCc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/outside/outside1) "kCg" = ( @@ -20052,7 +19809,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "kDE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_7) "kDZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -20163,8 +19920,7 @@ pixel_x = 4; pixel_y = -28 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20197,6 +19953,7 @@ /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "kGS" = ( @@ -20213,18 +19970,19 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "kHm" = ( -/obj/structure/disposalpipe/up{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) -"kHy" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lightgrey/bordercorner, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "kHK" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet, @@ -20245,10 +20003,12 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore) "kHQ" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "kIr" = ( /obj/machinery/atmospherics/valve/digital{ dir = 4 @@ -20292,6 +20052,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"kKu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "kLL" = ( /obj/structure/window/reinforced{ dir = 1 @@ -20334,10 +20110,7 @@ pixel_x = 12; pixel_y = -24 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/storage/primary) "kMt" = ( @@ -20353,8 +20126,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) "kNt" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -20458,11 +20230,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -20479,6 +20247,15 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) +"kRe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_one_hall) "kRR" = ( /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's on the fishing channel. I wonder what else is on?"; @@ -20542,23 +20319,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) -"kSL" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "kSO" = ( /obj/structure/closet/crate/bin, /obj/machinery/light{ @@ -20699,10 +20459,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "kUp" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 25 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20758,18 +20515,9 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "kVl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/gasstorage) "kWm" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/blast/regular{ density = 0; @@ -20778,7 +20526,9 @@ id = "gogogo"; opacity = 0 }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/testingroom) "kWC" = ( /obj/machinery/power/smes/buildable{ @@ -20877,11 +20627,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -20903,9 +20650,8 @@ /turf/simulated/floor/tiled, /area/storage/primary) "kXZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/analysis) "kYi" = ( @@ -21133,8 +20879,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "lea" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/medical/virology) "lfc" = ( @@ -21143,13 +20889,18 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "lfi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 }, -/obj/structure/flora/pottedplant, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "lfB" = ( @@ -21339,10 +21090,7 @@ "ljC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange, /turf/simulated/floor/tiled, /area/security/checkpoint) @@ -21474,7 +21222,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /obj/machinery/door/airlock{ name = "Unisex Showers" }, @@ -21560,27 +21310,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor, /area/rnd/outpost/atmos) -"lqT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "lqW" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "lqX" = ( @@ -21628,6 +21359,15 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"lrw" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "lsw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21778,7 +21518,7 @@ /area/maintenance/lowmedbaymaint) "lwj" = ( /obj/structure/symbol/sa, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_bar) "lwR" = ( /obj/structure/table/glass, @@ -21794,6 +21534,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"lwW" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "lxe" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -22118,10 +21876,9 @@ "lHD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor, /area/rnd/outpost/anomaly_lab) "lHE" = ( /obj/effect/floor_decal/borderfloor, @@ -22146,7 +21903,7 @@ dir = 4 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/border, /obj/structure/cable/orange{ @@ -22194,7 +21951,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/surfaceservicesubstation) "lLS" = ( /obj/effect/floor_decal/corner/lightgrey{ @@ -22247,8 +22004,7 @@ dir = 1 }, /obj/machinery/door/firedoor{ - dir = 1; - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -22271,7 +22027,7 @@ /turf/simulated/floor/tiled, /area/rnd/testingroom) "lNB" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_6) "lOA" = ( /obj/effect/floor_decal/borderfloor{ @@ -22326,12 +22082,7 @@ /area/engineering/atmos) "lPI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lPP" = ( @@ -22436,11 +22187,8 @@ /area/tether/surfacebase/security/brig) "lRY" = ( /obj/effect/floor_decal/industrial/warning/dust, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -22448,27 +22196,27 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "lSg" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "lSi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/vacant_site) "lSZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, @@ -22615,7 +22363,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_1) "lYh" = ( @@ -22802,10 +22552,7 @@ /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "mbh" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "mbn" = ( @@ -22871,9 +22618,6 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mcw" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -22886,6 +22630,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, +/obj/machinery/door/firedoor{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "mcD" = ( @@ -22901,11 +22648,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/surface_atmos) "mcI" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -22949,15 +22692,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "mfs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "mfX" = ( @@ -23064,15 +22803,12 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/analysis) "mhr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "surfcargooffice"; - layer = 3.3; name = "Cargo Office Shutters" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore/office) "miK" = ( @@ -23085,7 +22821,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "mjr" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/crew_quarters/sleep/Dorm_5) "mkH" = ( /obj/machinery/air_alarm{ @@ -23208,7 +22944,6 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) "mop" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23219,18 +22954,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/brig) "moy" = ( @@ -23274,7 +22998,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "moZ" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -23282,18 +23005,11 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/brig) "mpa" = ( @@ -23312,7 +23028,9 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, @@ -23420,7 +23138,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -23438,9 +23156,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -23501,8 +23216,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -23831,9 +23545,16 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) "mCf" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/closet/firecloset, +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "mCy" = ( @@ -23911,18 +23632,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "mEc" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled, /area/rnd/testingroom) "mEi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_1) "mEM" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ @@ -24046,10 +23763,10 @@ dir = 4 }, /obj/structure/catwalk, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/external{ - name = "Evacuation Route" +/obj/machinery/door/firedoor/glass{ + dir = 8 }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/lower/research) "mGM" = ( @@ -24080,11 +23797,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "mHj" = ( @@ -24133,8 +23846,8 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "mIE" = ( -/turf/simulated/wall, -/area/maintenance/lower/research) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/brig/storage) "mIF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -24185,9 +23898,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "mJX" = ( @@ -24406,6 +24117,7 @@ /area/rnd/outpost/anomaly_lab/storage) "mPG" = ( /obj/effect/floor_decal/rust, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "mPO" = ( @@ -24444,22 +24156,18 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mQc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "mQq" = ( /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint) "mQI" = ( /obj/machinery/camera/network/research_outpost{ @@ -24471,11 +24179,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/extinguisher_cabinet{ dir = 1; @@ -24548,10 +24253,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"mSA" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "mSR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24568,8 +24269,8 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) "mTg" = ( -/turf/simulated/wall/r_wall, -/area/storage/surface_eva/external) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/north_stairs_one) "mTH" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -24578,10 +24279,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "mUT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost) "mVl" = ( @@ -24604,11 +24303,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mWc" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/camera/network/civilian, /obj/structure/table/standard, /obj/random/soap, @@ -24619,11 +24314,7 @@ "mWv" = ( /obj/structure/table/woodentable, /obj/item/toy/plushie/therapy/blue, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -24699,10 +24390,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, @@ -24755,11 +24443,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "mYB" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "mYG" = ( @@ -24773,9 +24457,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"mYW" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/security/brig) "mYZ" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -24787,11 +24468,7 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "mZa" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -24935,7 +24612,6 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "nfZ" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1379; @@ -24960,6 +24636,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "ngA" = ( @@ -25037,8 +24716,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = 26; + pixel_y = -1 + }, /turf/simulated/floor/tiled, -/area/rnd/hallway) +/area/rnd/external) "nis" = ( /obj/structure/cable{ icon_state = "1-2" @@ -25119,10 +24803,7 @@ /obj/item/toy/nanotrasenballoon, /obj/item/deck/cards, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light/small{ dir = 1 }, @@ -25133,11 +24814,7 @@ frequency = 1379; scrub_id = "civ_airlock_scrubber" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -25200,40 +24877,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"nlW" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "nmq" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/atmos) "nmF" = ( @@ -25302,11 +24951,7 @@ /turf/simulated/floor/tiled, /area/rnd/hardstorage) "npe" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/orange{ icon_state = "0-4" }, @@ -25386,15 +25031,11 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "nrW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/maintenance/substation/outpost) "nsA" = ( @@ -25532,7 +25173,7 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -25576,7 +25217,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "nwh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/civ_west) "nwj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -25616,16 +25257,14 @@ /turf/simulated/floor/plating, /area/storage/surface_eva) "nxC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/engi{ - id_tag = "elevescaper"; - name = "Elevator Maintenance" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "nxI" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -25643,13 +25282,11 @@ dir = 4; pixel_x = -30 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "nxL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/outpost) "nyg" = ( /obj/effect/floor_decal/borderfloor{ @@ -25921,13 +25558,12 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "nIk" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "nIl" = ( /obj/machinery/atmospherics/portables_connector, @@ -25941,13 +25577,12 @@ dir = 1 }, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) +"nIE" = ( +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/surface_one_hall) "nIL" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_external{ @@ -26007,11 +25642,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "nJE" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26051,8 +25682,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "nLH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "nLT" = ( @@ -26068,8 +25698,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "nMi" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/camera/network/civilian{ @@ -26111,16 +25740,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "nMN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/old_tram) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/lowernorthhall) "nMO" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_one_hall) "nMZ" = ( /obj/structure/window/reinforced, @@ -26358,10 +25982,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "nUU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "nVv" = ( @@ -26430,8 +26052,8 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundry"; - dir = 8 + dir = 8; + name = "Laundry" }, /obj/structure/cable/orange{ icon_state = "4-8" @@ -26461,22 +26083,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple, /turf/simulated/floor/tiled, /area/engineering/atmos/processing) -"nYy" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "nYA" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -26487,22 +26093,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "nYQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; +/obj/spawner/window/low_wall/reinforced/full/firelocks{ id = "holodeck"; - name = "Holodeck Privacy Shutters"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "holodeck" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "holodeck" + name = "holodeck" }, /turf/simulated/floor/plating, /area/holodeck_control) @@ -26537,11 +26130,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "nZU" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -26580,12 +26169,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "oaj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "oay" = ( @@ -26687,9 +26282,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "ofa" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "ofq" = ( @@ -26712,6 +26305,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ofG" = ( @@ -26870,7 +26466,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "oiD" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/weaponsrange) "oiL" = ( /obj/structure/table/rack, @@ -26913,14 +26509,16 @@ /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/dropper, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) +"oln" = ( +/turf/simulated/wall/prepainted/science, +/area/rnd/testingroom) "olq" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -26971,7 +26569,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "omk" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/hallway) "omN" = ( /obj/structure/railing, @@ -26982,7 +26580,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "onC" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/tunnel) "onO" = ( /obj/machinery/air_alarm{ @@ -27001,13 +26599,20 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/outpost/chamber) "oou" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "opd" = ( @@ -27072,17 +26677,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "oqT" = ( /turf/simulated/wall, /area/storage/surface_eva) "orl" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -27099,10 +26701,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "orU" = ( @@ -27208,11 +26807,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "oxa" = ( @@ -27229,7 +26824,7 @@ /area/tether/surfacebase/outside/outside1) "oxb" = ( /obj/machinery/holoposter, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/first_west) "oxq" = ( /obj/structure/stairs/spawner/north, @@ -27297,7 +26892,7 @@ /area/maintenance/lower/research) "oyX" = ( /obj/structure/sign/warning/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/tram) "ozq" = ( /obj/landmark{ @@ -27384,8 +26979,7 @@ /area/crew_quarters/visitor_dining) "oDh" = ( /obj/machinery/disposal, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/disposalpipe/trunk{ @@ -27401,32 +26995,28 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oDt" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "oDS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; id = "cafe"; layer = 3.1; name = "Cafe Shutters" }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_dining) "oEs" = ( @@ -27494,7 +27084,7 @@ /area/storage/primary) "oId" = ( /obj/machinery/holoposter, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/visitor_laundry) "oIn" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -27653,7 +27243,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oMf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/brig) "oMr" = ( /obj/structure/disposalpipe/segment, @@ -27714,10 +27304,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "oOh" = ( @@ -27890,7 +27477,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "oSm" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos) "oSy" = ( /obj/structure/cable/green{ @@ -27983,20 +27570,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) -"oUb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/structure/catwalk, -/obj/machinery/door/airlock/glass_external/public{ - name = "Evacuation Route" - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/surface_one_hall) "oUl" = ( /turf/simulated/floor/plating, /area/engineering/atmos/processing) @@ -28084,24 +27657,8 @@ /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "oYn" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "gogogo"; - opacity = 0 - }, -/turf/simulated/floor/tiled, -/area/rnd/testingroom) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/tram) "oYu" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 @@ -28381,7 +27938,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "pgf" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/medical/first_aid_west) "pgk" = ( /obj/machinery/door/firedoor/glass, @@ -28398,7 +27955,7 @@ /area/tether/surfacebase/security/brig/bathroom) "pgr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virology) "pgv" = ( /obj/effect/floor_decal/industrial/warning, @@ -28455,9 +28012,7 @@ /area/tether/surfacebase/surface_one_hall) "pha" = ( /obj/structure/sign/deck/first, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "phe" = ( /obj/random/junk, @@ -28588,7 +28143,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "pkY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/maintenance/lower/mining_eva) "plq" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -28619,14 +28174,10 @@ /area/engineering/atmos) "plG" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "cdorm1" }, -/obj/structure/window/reinforced/polarized{ - id = "cdorm1" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) "plI" = ( /obj/effect/shuttle_landmark{ @@ -28661,7 +28212,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "pmc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm3) "pms" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -28688,7 +28239,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "pnj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/lowerhall) "pnK" = ( /obj/structure/cable/green{ @@ -29102,6 +28653,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) +"pwO" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "pxc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -29227,7 +28796,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -29243,7 +28812,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -29422,7 +28990,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "pDO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/maintenance/substation/SurfMedsubstation) "pDX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -29512,8 +29080,8 @@ /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Cafe"; - dir = 8 + dir = 8; + name = "Cafe" }, /obj/structure/cable/orange{ icon_state = "4-8" @@ -29651,10 +29219,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 9 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -29664,10 +29229,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "pMb" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "holodeck" +/obj/spawner/window/low_wall/reinforced/full/firelocks{ + id = "holodeck"; + name = "holodeck" }, /turf/simulated/floor, /area/holodeck_control) @@ -29679,8 +29243,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "pMr" = ( @@ -29690,8 +29253,12 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 30 }, +/obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = -25 + }, /turf/simulated/floor/tiled, -/area/storage/surface_eva) +/area/storage/surface_eva/external) "pMt" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -29757,7 +29324,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "pRw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/mixing) "pRF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -29830,7 +29397,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "surfcargooffice"; - layer = 3.3; name = "Cargo Office Shutters" }, /turf/simulated/floor/tiled, @@ -29845,6 +29411,9 @@ /obj/structure/cable, /turf/simulated/floor, /area/maintenance/substation/surfaceservicesubstation) +"pSv" = ( +/turf/simulated/wall/prepainted, +/area/security/checkpoint) "pTr" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -29892,6 +29461,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pUj" = ( @@ -29908,16 +29478,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenance) "pUN" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/station_map{ - pixel_y = 32 + dir = 9 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "pUR" = ( @@ -29984,15 +29553,9 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "pXc" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -30000,6 +29563,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "pXd" = ( @@ -30046,11 +29611,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) -"pYd" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 +"pXK" = ( +/obj/machinery/light, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"pYd" = ( +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/light_switch{ dir = 8; @@ -30066,11 +29641,7 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/orange{ icon_state = "0-2" @@ -30167,11 +29738,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -30212,15 +29779,7 @@ /turf/unsimulated/mineral/virgo3b, /area/tether/surfacebase/outside/outside1) "qbk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "qbr" = ( @@ -30273,11 +29832,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "qdo" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/testingroom) "qdD" = ( @@ -30400,7 +29958,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "qgR" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_2) "qgX" = ( /obj/effect/floor_decal/rust, @@ -30446,10 +30004,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "qjR" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -30486,7 +30041,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "qlp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/outpost/solars_shed) "qmk" = ( /obj/structure/cable{ @@ -30637,7 +30192,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "qpi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/storage/surface_eva/external) "qpj" = ( /obj/effect/floor_decal/borderfloor{ @@ -30684,8 +30239,17 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "qqd" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -30732,11 +30296,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -30883,18 +30443,8 @@ /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) -"qvs" = ( -/obj/structure/sign/directions/evac{ - name = "\improper Secondary Evacuation Route" - }, -/turf/simulated/wall, -/area/tether/surfacebase/surface_one_hall) "qvz" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -31096,14 +30646,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "qBc" = ( -/obj/structure/grille, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "qBh" = ( @@ -31269,12 +30815,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "qEE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "qEX" = ( @@ -31357,7 +30899,7 @@ /area/rnd/outpost/atmos) "qJd" = ( /obj/structure/sign/poster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/first_west) "qJp" = ( /obj/structure/catwalk, @@ -31391,7 +30933,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_3) "qKa" = ( @@ -31658,10 +31202,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "qPj" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -31717,7 +31258,7 @@ /area/tether/surfacebase/medical/centralstairwell) "qPU" = ( /obj/structure/sign/warning/high_voltage, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/outpost) "qPY" = ( /obj/effect/floor_decal/corner/purple{ @@ -31729,8 +31270,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) "qQj" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -31756,15 +31296,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "qRv" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -31772,6 +31306,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "qRz" = ( @@ -31807,10 +31343,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -31923,8 +31456,13 @@ /area/tether/surfacebase/north_stairs_one) "qVb" = ( /obj/machinery/light, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 1; + pixel_y = -24 + }, +/obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) +/area/tether/surfacebase/lowernortheva) "qVm" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -31996,7 +31534,7 @@ }, /area/storage/surface_eva) "qWF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab/airlock) "qWX" = ( /obj/machinery/floodlight, @@ -32017,14 +31555,14 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) "qYz" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/machinery/door/firedoor/glass{ + dir = 1; + req_one_access = list(18,47) + }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "qYE" = ( @@ -32058,7 +31596,7 @@ dir = 8 }, /obj/machinery/power/apc/high{ - pixel_y = -28 + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -32072,8 +31610,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/corner/purple{ @@ -32087,7 +31624,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "qZX" = ( @@ -32121,17 +31657,17 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "raL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-8" + }, +/obj/machinery/door/firedoor/glass{ + dir = 1; + req_one_access = list(18,47) }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) @@ -32212,12 +31748,10 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/processing) "rbS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/curtain/black{ icon_state = "open" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_one_hall) "rcP" = ( @@ -32263,9 +31797,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "ree" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "ren" = ( /obj/effect/floor_decal/borderfloor{ @@ -32401,11 +31933,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "rfS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -32418,12 +31946,8 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "rfX" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "rga" = ( @@ -32512,21 +32036,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) -"rik" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "rjV" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/light/small, @@ -32595,10 +32104,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "rly" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/public_garden_maintenance) "rmA" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/gas_storage) "rmC" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -32732,9 +32241,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 6 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -32843,6 +32350,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/research) +"rwM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_one_hall) "rxf" = ( /obj/structure/cable{ icon_state = "1-2" @@ -32866,8 +32384,7 @@ /area/storage/primary) "ryp" = ( /obj/machinery/door/firedoor{ - dir = 8; - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost) @@ -32946,9 +32463,7 @@ /area/maintenance/lower/xenoflora) "rzQ" = ( /obj/structure/cable/orange, -/obj/machinery/power/apc/high{ - pixel_y = -28 - }, +/obj/machinery/power/apc/high, /obj/machinery/light, /obj/structure/bed/chair/wood{ dir = 8 @@ -33077,8 +32592,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "rEm" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -33167,11 +32681,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -33257,12 +32767,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/reinforced, /area/rnd/testingroom) -"rIq" = ( -/obj/structure/sign/directions/evac{ - dir = 4 - }, -/turf/simulated/wall, -/area/tether/surfacebase/surface_one_hall) "rIs" = ( /obj/structure/railing{ dir = 1 @@ -33319,10 +32823,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/crew_quarters/sleep/maintDorm1) "rJU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/testingroom) "rKa" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/paramed) "rKg" = ( /obj/effect/floor_decal/rust, @@ -33566,7 +33070,7 @@ /turf/simulated/floor/tiled, /area/rnd/testingroom) "rOS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_one_hall) "rPf" = ( /obj/structure/cable/green{ @@ -33645,10 +33149,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -33694,9 +33195,8 @@ /turf/simulated/floor/plating, /area/rnd/hallway) "rSR" = ( -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor, -/area/rnd/outpost/anomaly_lab/storage) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/brig) "rTb" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -33817,7 +33317,7 @@ dir = 1; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_one) "rUA" = ( /obj/machinery/gear_painter, @@ -34397,8 +33897,7 @@ }, /obj/structure/table/standard, /obj/random/plushie, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -34410,15 +33909,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/testingroom) +"skO" = ( +/turf/simulated/wall/prepainted, +/area/rnd/testingroom) "sld" = ( -/obj/machinery/camera/network/northern_star, -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/structure/flora/pottedplant, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "sle" = ( @@ -34572,7 +34081,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/paramed) "soy" = ( @@ -34595,7 +34103,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "spx" = ( -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "spB" = ( @@ -34669,10 +34179,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) -"sqv" = ( -/obj/structure/table, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "sqw" = ( /obj/structure/grille, /obj/structure/railing{ @@ -34701,9 +34207,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "srn" = ( @@ -34812,11 +34316,7 @@ /obj/structure/table/standard, /obj/item/hand_labeler, /obj/item/hand_labeler, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -34856,11 +34356,6 @@ /obj/structure/table/bench/wooden, /turf/simulated/floor/grass, /area/tether/surfacebase/surface_one_hall) -"suw" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lightgrey/bordercorner, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "sux" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -34893,15 +34388,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_8) "suS" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -34917,6 +34413,9 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) +"svt" = ( +/turf/simulated/wall/prepainted, +/area/crew_quarters/sleep/Dorm_8) "svy" = ( /obj/structure/table/steel, /obj/item/paper_bin, @@ -34946,8 +34445,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "swx" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/table/woodentable, @@ -34962,12 +34460,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "swM" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/eva) "swU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "sxr" = ( @@ -34977,11 +34474,10 @@ /area/rnd/outpost/atmos) "sxt" = ( /obj/machinery/door/blast/regular, -/turf/simulated/wall, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "syr" = ( -/obj/machinery/power/apc/super{ - dir = 4; +/obj/machinery/power/apc/super/east_mount{ name = "east bump"; pixel_x = 24 }, @@ -35023,7 +34519,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "szR" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/anomaly_lab/testing) "sAL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -35099,10 +34595,7 @@ /obj/structure/cable/orange{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -35115,7 +34608,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "sCF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/asmaint2) "sDb" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply, @@ -35130,10 +34623,10 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Cargo Shop" }, -/obj/machinery/door/firedoor/multi_tile, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "sDy" = ( @@ -35162,9 +34655,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, @@ -35389,30 +34880,29 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "sMA" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/turbolift_map_holder/tether/two, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) +"sML" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "sMV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -35421,6 +34911,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "sNn" = ( @@ -35507,7 +34999,7 @@ /area/tether/surfacebase/public_garden_one) "sPq" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lowerhall) "sQa" = ( /obj/structure/cable/green{ @@ -35532,7 +35024,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "sQq" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/medical/virologyaccess) "sQy" = ( /obj/structure/railing{ @@ -35550,11 +35042,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ @@ -35604,7 +35093,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "sSd" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_7) "sSg" = ( /obj/structure/anomaly_container, @@ -35639,19 +35128,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "sTk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/security/checkpoint) "sTA" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, @@ -35674,11 +35158,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "1-2" }, @@ -35796,8 +35276,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/anomaly_lab/testing) "sWV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/tram) "sXj" = ( @@ -35861,11 +35340,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "sYF" = ( @@ -35955,13 +35430,6 @@ outdoors = 0 }, /area/tether/surfacebase/old_tram) -"taw" = ( -/obj/structure/closet/crate, -/obj/random/unidentified_medicine, -/obj/random/firstaid, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "taF" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -35981,8 +35449,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -36036,10 +35503,7 @@ /area/tether/surfacebase/security/weaponsrange) "tbR" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "tcX" = ( @@ -36390,6 +35854,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) +"tqc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "tqe" = ( /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) @@ -36433,9 +35915,6 @@ /area/rnd/xenoarch_storage) "tsZ" = ( /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -36483,14 +35962,10 @@ /area/tether/surfacebase/medical/mentalhealth) "tty" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "cdorm2" }, -/obj/structure/window/reinforced/polarized{ - id = "cdorm3" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "ttR" = ( /obj/effect/debris/cleanable/blood/oil, @@ -36523,14 +35998,12 @@ dir = 4 }, /obj/machinery/door/firedoor/glass{ - req_one_access = list(18,47) + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "txw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/storage/surface_eva) "txJ" = ( @@ -36606,9 +36079,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "tzO" = ( @@ -36745,7 +36215,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -36818,8 +36290,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -36873,11 +36344,8 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -36941,7 +36409,7 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) "tIU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/solars) "tJi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36952,10 +36420,7 @@ "tJv" = ( /obj/structure/table/standard, /obj/random/medical, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) @@ -36969,11 +36434,11 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tJK" = ( -/turf/simulated/wall, -/area/rnd/outpost/anomaly_lab) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/security/checkpoint) "tJP" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -37050,25 +36515,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "tLf" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "tLI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/miscellaneous_lab) "tMe" = ( /obj/effect/floor_decal/borderfloor, @@ -37119,10 +36579,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "tNc" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -37176,8 +36633,7 @@ }, /area/tether/surfacebase/old_tram) "tOd" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -37225,11 +36681,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "tOT" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -37324,19 +36776,14 @@ /area/tether/surfacebase/tram) "tSu" = ( /obj/machinery/door/firedoor, -/obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ id = "cdorm2" }, -/obj/structure/window/reinforced/polarized{ - id = "cdorm2" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm2) "tSO" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/testing) "tTq" = ( @@ -37367,10 +36814,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/testing_lab) "tTW" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -37520,10 +36964,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable/orange{ icon_state = "2-8" }, @@ -37597,18 +37038,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) -"tYy" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "tZm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted{ + can_open = 1 + }, /area/engineering/atmos) "tZw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/xenoflora) "uaj" = ( /obj/machinery/atmospherics/portables_connector{ @@ -37736,11 +37172,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ucc" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/substation/surfaceservicesubstation) "ucg" = ( /obj/machinery/disposal, @@ -37750,11 +37185,22 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "ucs" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/security/gasstorage) "ucB" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) +"ucF" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "ucO" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1 @@ -37791,11 +37237,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/sleep/maintDorm3) "uew" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_3) "uez" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint) "ueJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -37806,11 +37252,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) -"ufd" = ( -/obj/structure/grille, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_one_hall) "ufe" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -37862,15 +37303,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenoarch_storage) "ugV" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/cable/cyan{ icon_state = "4-8" }, @@ -37881,6 +37316,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "ugW" = ( @@ -38028,7 +37465,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) "unF" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/chamber) "unK" = ( /obj/machinery/atmospherics/portables_connector, @@ -38129,15 +37566,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "upn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/mimeoffice) "upD" = ( @@ -38300,9 +37729,6 @@ /area/rnd/outpost/testing_lab) "utU" = ( /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -38347,7 +37773,7 @@ /area/rnd/outpost/anomaly_lab) "uvG" = ( /obj/structure/sign/xenobio, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/outside/outside1) "uvH" = ( /obj/effect/floor_decal/borderfloor{ @@ -38444,9 +37870,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"uzf" = ( -/turf/simulated/wall, -/area/maintenance/lower/xenoflora) "uzl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -38514,20 +37937,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "uAv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "surfcargooffice"; - layer = 3.3; name = "Cargo Office Shutters" }, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore/office) "uBk" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/metal{ name = "Shop Warehouse"; req_one_access = list(48) @@ -38538,6 +37957,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) "uBY" = ( @@ -38640,7 +38060,7 @@ /turf/simulated/floor/tiled/techfloor/grid/virgo3b, /area/tether/surfacebase/tunnel) "uFO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/security/checkpoint) "uGu" = ( /obj/structure/disposalpipe/segment, @@ -38696,6 +38116,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"uIm" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) +"uIy" = ( +/obj/structure/sign/warning{ + name = "\improper STAND AWAY FROM TRACK EDGE" + }, +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/tram) "uIE" = ( /obj/machinery/shower{ dir = 4; @@ -38731,7 +38163,6 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/structure/anomaly_container, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "uKS" = ( @@ -38892,11 +38323,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "uNx" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -38923,10 +38350,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) "uOh" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -39035,7 +38459,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "uRP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/tether/surfacebase/cargostore/warehouse) "uSu" = ( /obj/machinery/door/airlock/glass/security{ @@ -39142,12 +38566,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/storage/surface_eva) "uWT" = ( @@ -39240,7 +38659,7 @@ }, /area/tether/surfacebase/old_tram) "uYR" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/emergency_storage/rnd) "uZf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -39282,13 +38701,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "uZS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/medical/first_aid_west) "vaq" = ( /obj/effect/floor_decal/borderfloor/shifted, @@ -39319,10 +38736,7 @@ /turf/simulated/floor, /area/maintenance/substation/surfaceservicesubstation) "vbj" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ dir = 1; pixel_x = -13; @@ -39341,9 +38755,6 @@ /area/tether/surfacebase/lowernorthhall) "vbn" = ( /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -39441,11 +38852,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1452; @@ -39461,7 +38868,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "vdT" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/trash_pit) "vdW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39696,8 +39103,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "vjE" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -39711,7 +39117,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "vjO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/sleep/Dorm_8) "vjQ" = ( /obj/effect/floor_decal/borderfloor{ @@ -39785,8 +39191,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 28 }, /obj/machinery/button/remote/blast_door{ @@ -39892,25 +39297,16 @@ /obj/structure/sign/redcross{ name = "FirstAid" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/medical/first_aid_west) +"vno" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "vny" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "vnS" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 4; @@ -39956,8 +39352,8 @@ /area/tether/surfacebase/outside/outside1) "vpR" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Laundry"; - dir = 8 + dir = 8; + name = "Laundry" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/structure/cable/orange{ @@ -39972,7 +39368,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/crew_quarters/visitor_laundry) "vqc" = ( @@ -39990,7 +39388,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "vqX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_bar) "vre" = ( /obj/structure/disposalpipe/segment, @@ -40025,6 +39423,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"vrR" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/maintenance/lower/research) "vsp" = ( /obj/machinery/atmospherics/component/binary/pump/on{ dir = 1; @@ -40077,7 +39478,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/surface_one_hall) "vtI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm1) "vuc" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, @@ -40141,7 +39542,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/maintenance/substation/SurfMedsubstation) "vvq" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -40149,9 +39550,18 @@ }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside1) -"vwJ" = ( -/turf/simulated/wall/r_wall, -/area/medical/virologyaccess) +"vwP" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "vwW" = ( /obj/machinery/light/small/flicker{ dir = 1 @@ -40189,7 +39599,7 @@ dir = 4 }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; dir = 8; frequency = 1379; master_tag = "virology_airlock_control"; @@ -40223,11 +39633,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "vyN" = ( @@ -40237,9 +39643,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "vyR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) "vze" = ( @@ -40248,9 +39652,7 @@ dir = 4; pixel_x = -22 }, -/obj/machinery/firealarm{ - pixel_y = 25 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "vzw" = ( @@ -40276,8 +39678,27 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "vAn" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "vAp" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) @@ -40469,7 +39890,7 @@ /area/hallway/lower/first_west) "vEJ" = ( /obj/structure/symbol/em, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/outpost/solars_shed) "vER" = ( /obj/machinery/door/airlock/research{ @@ -40517,11 +39938,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -40587,21 +40004,19 @@ /turf/simulated/floor/tiled, /area/security/checkpoint) "vGz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "vGE" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted, /area/maintenance/lower/atmos) "vGW" = ( /obj/structure/closet/secure_closet/brig, @@ -40712,11 +40127,8 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "vIy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/tether/surfacebase/tram) +/turf/simulated/wall/prepainted/security, +/area/maintenance/lower/mining_eva) "vJa" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -40759,12 +40171,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "vJp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -40776,7 +40182,8 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/paramed) "vJq" = ( @@ -40833,10 +40240,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -40885,16 +40289,12 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "vLx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/outpost/heating) "vMn" = ( @@ -40964,7 +40364,7 @@ /turf/simulated/floor/tiled, /area/storage/art) "vOc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/testing_lab) "vOe" = ( /obj/structure/railing, @@ -41072,11 +40472,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/purple/full{ dir = 4 @@ -41085,7 +40481,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) "vQt" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/cargo, /area/tether/surfacebase/cargostore) "vQH" = ( /obj/effect/floor_decal/borderfloor{ @@ -41144,10 +40540,7 @@ "vSa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -41532,7 +40925,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/Dorm_6) "wdw" = ( @@ -41547,10 +40942,7 @@ /area/tether/surfacebase/outside/outside1) "wep" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "wez" = ( @@ -41573,9 +40965,6 @@ /area/rnd/outpost/heating) "weY" = ( /obj/effect/floor_decal/borderfloor, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -41583,15 +40972,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/structure/disposalpipe/junction/yjunction{ +/obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/cable{ + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "wfq" = ( @@ -41653,7 +41041,7 @@ /area/rnd/outpost/breakroom) "wfR" = ( /obj/structure/sign/warning/nosmoking_2, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/tankstorage) "wfU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -41743,7 +41131,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "whS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker/laundry_arrival) "wic" = ( /obj/machinery/door/window{ @@ -41753,7 +41141,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "wik" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/heating) "wiT" = ( /obj/machinery/vending/coffee{ @@ -42046,12 +41434,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "wpy" = ( -/obj/machinery/door/firedoor/glass{ - dir = 1; - req_one_access = list(18,47) - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/turf/simulated/wall/prepainted, +/area/maintenance/substation/SurfMedsubstation) "wpP" = ( /obj/machinery/radiocarbon_spectrometer, /obj/structure/window/reinforced{ @@ -42077,11 +41461,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -42095,14 +41475,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"wqu" = ( -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "wqL" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -42196,22 +41568,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"wsJ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "wsR" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/carpet, @@ -42223,10 +41579,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass{ - dir = 1; - req_one_access = list(18,47) - }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "wtv" = ( @@ -42241,10 +41593,7 @@ /turf/simulated/mineral, /area/storage/surface_eva/external) "wuD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/lightorange{ dir = 6 @@ -42317,17 +41666,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "wwn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/anomaly_container, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/anomaly_lab) "wwo" = ( /obj/effect/floor_decal/corner/lime{ @@ -42436,7 +41775,7 @@ /area/security/checkpoint) "wzb" = ( /obj/structure/sign/biohazard, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/trash_pit) "wzm" = ( /obj/structure/cable/green{ @@ -42642,9 +41981,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wFa" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "wFz" = ( @@ -42670,9 +42008,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "wGb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/hallway/lower/first_west) "wGo" = ( @@ -42841,8 +42177,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -42920,11 +42255,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "wOX" = ( @@ -42938,6 +42269,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "wPq" = ( @@ -43022,8 +42356,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -43038,11 +42371,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "wSe" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -43149,11 +42478,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "wUj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -43215,9 +42540,6 @@ dir = 4 }, /obj/structure/grille, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, /obj/structure/window/phoronreinforced/full{ icon_state = "phoronwindow0" }, @@ -43306,11 +42628,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) -"wXU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) "wXZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -43449,6 +42766,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xaC" = ( @@ -43512,9 +42830,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) "xcL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full, /turf/simulated/floor/plating, /area/tether/surfacebase/old_tram) "xcR" = ( @@ -43522,7 +42838,7 @@ /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "xdh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenoarch_storage) "xee" = ( /obj/structure/fence{ @@ -43942,6 +43258,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xqC" = ( @@ -44074,7 +43394,7 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "xtJ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/funny/hideyhole) "xtL" = ( /obj/structure/closet/firecloset, @@ -44093,6 +43413,18 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"xuk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "xuD" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -44112,11 +43444,8 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 10 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -44138,11 +43467,7 @@ /obj/item/clothing/suit/space/anomaly, /obj/item/clothing/head/helmet/space/anomaly, /obj/item/clothing/mask/breath, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -44176,7 +43501,7 @@ /area/tether/surfacebase/medical/mentalhealth) "xwZ" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/locker) "xxh" = ( /turf/simulated/floor/tiled/steel_dirty, @@ -44203,6 +43528,7 @@ /obj/random/junk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xxM" = ( @@ -44254,10 +43580,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/paramed) "xyy" = ( @@ -44278,7 +43606,7 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "xzc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/storage) "xzO" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -44314,7 +43642,7 @@ /area/hallway/lower/first_west) "xAn" = ( /obj/structure/sign/warning, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/tether/surfacebase/outside/outside1) "xAo" = ( /obj/machinery/door/window/southleft{ @@ -44552,7 +43880,7 @@ /area/maintenance/lower/vacant_site) "xHs" = ( /obj/structure/sign/department/anomaly, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/airlock) "xIj" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -44696,7 +44024,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab/airlock) "xMj" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/maintenance/substation/surface_atmos) "xMv" = ( /obj/structure/cable/yellow{ @@ -44720,8 +44048,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -44760,6 +44087,9 @@ /obj/item/stack/cable_coil/random_belt, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"xNf" = ( +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/outside/outside1) "xNq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44816,11 +44146,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "xPh" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -44888,7 +44214,7 @@ dir = 4; name = "\improper Secondary Evacuation Route" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/xenoflora) "xTp" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -44905,7 +44231,7 @@ /area/tether/surfacebase/surface_one_hall) "xUl" = ( /obj/structure/sign/warning/caution, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/tankstorage) "xUp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -44983,12 +44309,6 @@ /area/crew_quarters/visitor_dining) "xYl" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -44996,7 +44316,9 @@ id = "gogogo"; opacity = 0 }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/testingroom) "xYJ" = ( /obj/structure/cable/green{ @@ -45005,8 +44327,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/testing_lab) "xYZ" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/steel_dirty, @@ -45026,11 +44347,7 @@ /obj/structure/cable/orange{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) @@ -45102,16 +44419,25 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/airlock) +"yeP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "yeR" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "yfm" = ( @@ -45126,8 +44452,7 @@ "yfP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -53342,7 +52667,7 @@ gzf gzf gzf xqE -gKV +pTr gzf gzf gzf @@ -53355,7 +52680,7 @@ bGE bGE bGE bGE -xqE +ftO gKV bGE bGE @@ -53562,7 +52887,7 @@ tqe tqe tqe mYZ -bre +uXC eJo aFY aFY @@ -53756,7 +53081,7 @@ tqe tqe tqe mYZ -bre +uXC eJo aFY aFY @@ -54338,7 +53663,7 @@ tqe tqe tqe mYZ -bre +uXC eJo aFY aFY @@ -54532,7 +53857,7 @@ tqe aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -54921,7 +54246,7 @@ aFY aFY mYZ eJo -bre +uXC aFY aFY aFY @@ -55115,7 +54440,7 @@ aFY aFY mYZ eJo -bre +uXC aFY aFY aFY @@ -56278,7 +55603,7 @@ aFY aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -56472,7 +55797,7 @@ aFY aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -56666,7 +55991,7 @@ aFY aFY aFY mYZ -bre +uXC eJo aFY aFY @@ -57928,10 +57253,10 @@ tqe tqe pRw pRw -hxV +aga eLL gwo -hxV +aga pRw pRw aFY @@ -57951,11 +57276,11 @@ jcY jcY szR szR -tJK -tJK -tJK -tJK -tJK +wwn +wwn +wwn +wwn +wwn osh osh osh @@ -58149,7 +57474,7 @@ xiV hVM xJp xJp -tJK +wwn osh osh osh @@ -58214,12 +57539,12 @@ aFY aFY eJo eJo -bre +uXC eJo eJo xyK -bre -bre +uXC +uXC aFY aFY aFY @@ -58343,7 +57668,7 @@ rNe qgQ oXz hmC -tJK +wwn osh osh osh @@ -58537,7 +57862,7 @@ fXS uNA vee eOE -tJK +wwn osh osh osh @@ -58574,7 +57899,7 @@ eJo eJo qkU aFY -bre +uXC aFY aFY eJo @@ -58600,8 +57925,8 @@ eJo aFY eJo eJo -bre -bre +uXC +uXC aFY aFY aFY @@ -58731,7 +58056,7 @@ hmy myz uvd vZt -tJK +wwn osh osh osh @@ -58763,7 +58088,7 @@ eJo aFY aFY aFY -bre +uXC aFY eJo eJo @@ -58772,7 +58097,7 @@ aFY eJo aFY aFY -bre +uXC aFY eJo eJo @@ -58792,7 +58117,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -58832,7 +58157,7 @@ eJo aFY eJo aFY -bre +uXC aFY eJo aFY @@ -58895,7 +58220,7 @@ tqe tqe tqe tqe -atv +aga aPp nIl aqZ @@ -58925,7 +58250,7 @@ bxS dPj dWI wda -tJK +wwn osh osh osh @@ -58985,8 +58310,8 @@ eJo eJo aFY eJo -bre -bre +uXC +uXC aFY aFY aFY @@ -59089,7 +58414,7 @@ tqe tqe tqe tqe -atv +aga wGP rTy lkI @@ -59119,7 +58444,7 @@ eak fqi wKB aRD -tJK +wwn osh osh osh @@ -59179,7 +58504,7 @@ aFY aFY aFY aFY -bre +uXC eJo aFY aFY @@ -59308,12 +58633,12 @@ wDf qWF wgp mQI -tJK +wwn gAl ghi wKB wdw -tJK +wwn osh osh osh @@ -59373,7 +58698,7 @@ aFY aFY eJo eJo -bre +uXC aFY aFY aFY @@ -59507,7 +58832,7 @@ sNE vGm gPu xtL -tJK +wwn osh osh osh @@ -59701,7 +59026,7 @@ daD nvh twy jMi -tJK +wwn osh osh osh @@ -59732,7 +59057,7 @@ eJo aFY aFY aFY -hVK +nYQ elP elP elP @@ -59746,7 +59071,7 @@ elP aEl isQ srn -isQ +fEX bJu fyK gMi @@ -59895,7 +59220,7 @@ vHH sLC wKB eDJ -tJK +wwn osh osh osh @@ -59926,7 +59251,7 @@ eJo aFY aFY aFY -hVK +nYQ elP elP elP @@ -59953,9 +59278,9 @@ fyK nLH huX bSp -bre -bre -bre +uXC +uXC +uXC his his his @@ -60089,7 +59414,7 @@ qsm pAu nUn sNF -tJK +wwn osh osh osh @@ -60120,7 +59445,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60132,14 +59457,14 @@ elP elP elP aEl -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre +bre +bre +bre his his isQ @@ -60147,9 +59472,9 @@ lDu ikl gjl wXn -bre -bre -bre +uXC +uXC +uXC his his his @@ -60283,7 +59608,7 @@ eQi pAu juA hnb -tJK +wwn osh osh osh @@ -60314,7 +59639,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60333,7 +59658,7 @@ aFc aFc sUU aFc -cxQ +bre his his isQ @@ -60385,7 +59710,7 @@ his his aFY aFY -bre +uXC aFY eJo aFY @@ -60477,7 +59802,7 @@ fcY pAu wKB tLf -tJK +wwn osh osh osh @@ -60508,7 +59833,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60527,7 +59852,7 @@ eGo eGo aFc gkS -cxQ +bre his his isQ @@ -60538,7 +59863,7 @@ qpi uxe bEA qpi -mTg +qpi his his his @@ -60671,7 +59996,7 @@ wKB wSk lht myk -tJK +wwn osh osh osh @@ -60702,7 +60027,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60721,7 +60046,7 @@ eGo eGo eGo eGo -cxQ +bre his his isQ @@ -60732,7 +60057,7 @@ dmT cYq dTb rAD -mTg +qpi his his his @@ -60856,16 +60181,16 @@ qKL mzv gKQ hnH -rSR +aTa iJd -rSR +aTa hGy gKQ wpP wIP wKB pXz -tJK +wwn osh osh osh @@ -60889,14 +60214,14 @@ aFY eJo aFY aFY -bre +uXC aFY aFY aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -60915,7 +60240,7 @@ eGo eGo eGo eGo -cxQ +bre his his isQ @@ -60926,7 +60251,7 @@ aMg kFT eOM gYg -mTg +qpi his his his @@ -61059,7 +60384,7 @@ cVx wIP nUn ylf -tJK +wwn osh osh osh @@ -61090,7 +60415,7 @@ aFY aFY aFY aFY -hVK +nYQ elP elP elP @@ -61109,7 +60434,7 @@ iCc eGo eGo aFc -cxQ +bre his his isQ @@ -61120,7 +60445,7 @@ qpi nIL oPH qpi -mTg +qpi his his his @@ -61253,7 +60578,7 @@ jpR wIP wKB frK -tJK +wwn osh osh osh @@ -61303,13 +60628,13 @@ eGo eGo aFc aFc -cxQ +bre ivS -oqT -oqT +baG +baG uWM -oqT -oqT +baG +baG pMr oNS ryL @@ -61447,7 +60772,7 @@ jum ssJ gyg scT -tJK +wwn osh osh osh @@ -61497,9 +60822,9 @@ fqB wuH gkS sUU -cxQ +bre ivS -oqT +baG jLy iLZ nxm @@ -61574,11 +60899,11 @@ aFY aFY aFY aFY -isQ -isQ -isQ -isQ -isQ +bAS +avD +avD +avD +bAS aFY aFY aFY @@ -61633,15 +60958,15 @@ wik vHW tKj eSB -tJK +wwn xtL qev qYz -wpy +wKB mxc wKB xtL -tJK +wwn osh osh osh @@ -61683,22 +61008,22 @@ wAx qaj aEl aEl -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre tXv -cxQ -cxQ -cxQ +bre +bre +bre ivS -oqT +baG jeZ agN dYv -oqT -oqT +baG +baG aqp mdC oqT @@ -61827,7 +61152,7 @@ wik gjs eAI hty -tJK +wwn eyh oaj raL @@ -61835,7 +61160,7 @@ wtf uyx nDI pox -tJK +wwn osh osh osh @@ -61854,7 +61179,7 @@ aFY aFY aFY aFY -bre +uXC aFY eJo eJo @@ -61883,15 +61208,15 @@ vAJ viB sPo wVz -cxQ +bre mXO mXO ivS -oqT +baG wZr roi aLm -oqT +baG uZu vjT uLH @@ -61900,7 +61225,7 @@ baG pgf pgf pgf -pgf +uZS ewh ewh ewh @@ -62075,22 +61400,22 @@ pLW qRz dcM diE -cxQ -cxQ -cxQ +bre +bre +bre mXO mXO ivS -oqT -oqT +baG +baG mVl lBy -oqT +baG eBr ihp mWP slq -uZS +pgf fnJ hAA kBt @@ -62108,7 +61433,7 @@ fci fci cCw iOI -tIU +cCw tLI tLI tLI @@ -62218,7 +61543,7 @@ gZO hMM qYE wKB -faJ +nqE gSh cOh nSh @@ -62262,29 +61587,29 @@ owC owC owC owC -cxQ -cxQ +bre +bre aHI oTc unb unb rcX ggF -cxQ -cxQ +bre +bre mXO mXO ivS ivS -oqT -oqT -oqT -oqT +baG +baG +baG +baG ahA ihp mXr xxv -uZS +pgf sSS qxp wgL @@ -62378,11 +61703,11 @@ aFY aFY eJo eJo -bre +uXC eJo -bre +uXC eJo -bre +uXC eJo uNW dtJ @@ -62409,7 +61734,7 @@ wik ksw gNW lQN -tJK +wwn uWb wKB nqE @@ -62451,12 +61776,12 @@ his rly rly dNH -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre +bre syv ksf aoT @@ -62465,20 +61790,20 @@ gVJ fSx lHE usP -cxQ -cxQ +bre +bre mXO qfi qfi qfi qfi qfi -oqT +baG oYW ihp mWP izN -uZS +pgf qQU qxp bbh @@ -62487,7 +61812,7 @@ jzP fXl fXl hrS -fEX +ewh nOk rgT pkn @@ -62603,7 +61928,7 @@ wik bJI hNU kCn -tJK +wwn sSh vAs nqE @@ -62660,19 +61985,19 @@ vVD lHE iFL rqK -cxQ +bre mXO qfi qfi qfi qfi qfi -oqT +baG bmW vVZ nmF maP -uZS +pgf lgw jEY iDi @@ -62681,11 +62006,11 @@ ugA cuS fkq xvm -fEX +ewh aaI vSB rvU -tIU +cCw abx rJU rJU @@ -62763,10 +62088,10 @@ aFY aFY aFY aFY -bre +uXC qkU eJo -bre +uXC qkU eJo qkU @@ -62854,32 +62179,32 @@ vVD lHE opO hws -cxQ +bre mXO qfi qfi fLr fLr fLr -oqT +baG txw qWl qJr txw -uZS +pgf vna fPv hpc uZS -fLr -fLr -fLr -fLr -fLr +faJ +faJ +faJ +faJ +faJ rRi hoc omk -tIU +cCw spN rJU ePO @@ -62961,10 +62286,10 @@ eJo ctJ qkU eJo -bre -bre +uXC +uXC eJo -bre +uXC qkU qgX dtJ @@ -63033,12 +62358,12 @@ his rly aNj rYP -cxQ -cxQ -cxQ -cxQ -cxQ -cxQ +bre +bre +bre +bre +bre +bre fmt ksf wjG @@ -63047,8 +62372,8 @@ unb vVD lHE xrw -cxQ -cxQ +bre +bre mXO qfi qfi @@ -63097,8 +62422,8 @@ atU uOh fZN lpz -bre -bre +uXC +uXC eJo aFY aFY @@ -63232,16 +62557,16 @@ cni cni cni cni -cxQ -cxQ +bre +bre fkh bva oGP tAB nlL wvg -cxQ -cxQ +bre +bre mXO mXO qfi @@ -63291,9 +62616,9 @@ ksX jXH pgC xvt -bre -bre -bre +uXC +uXC +uXC eJo eJo aFY @@ -63405,7 +62730,7 @@ aFY aFY aFY aFY -bre +uXC aFY aFY aFY @@ -63427,14 +62752,14 @@ ifV ifV jih cni -cxQ -cxQ +bre +bre eMn mkI ntD qvz -cxQ -cxQ +bre +bre mXO mXO mXO @@ -63485,12 +62810,12 @@ ylo guR xiE xvt -bre +uXC eJo -bre -bre +uXC +uXC eJo -bre +uXC aFY aFY aFY @@ -63622,12 +62947,12 @@ lnq fUq cni cni -cxQ +bre cxQ qVq tMr -cxQ -cxQ +bre +bre mXO mXO nwh @@ -63662,7 +62987,7 @@ ePO ePO ePO rHN -oYn +jmi kTG ctQ rOR @@ -63679,14 +63004,14 @@ vXE eld fZN jGa -bre -bre -bre +uXC +uXC +uXC eJo -bre -bre -bre -bre +uXC +uXC +uXC +uXC eJo eJo eJo @@ -63705,16 +63030,16 @@ eJo qkU qkU eJo -bre -bre -bre +uXC +uXC +uXC eJo eJo eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo @@ -63725,14 +63050,14 @@ eJo eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo eJo eJo -bre +uXC eJo qkU qkU @@ -63809,18 +63134,18 @@ oiD oiD oiD oiD -cxs -cxs -cxs +oiD +oiD +oiD lmQ jnf eGa xFy rly -cxQ +bre gFV jge -cxQ +bre mXO mXO mXO @@ -63828,7 +63153,7 @@ nwh wqe oNR dRA -pCE +dEV xAe bDa iKx @@ -63874,41 +63199,41 @@ xqC fZN his his -bre -bre -bre -bre -bre +uXC +uXC +uXC +uXC +uXC eJo eJo -bre +uXC eJo -bre -bre -bre -bre +uXC +uXC +uXC +uXC qkU eJo -bre +uXC eJo -bre -bre -bre +uXC +uXC +uXC eJo -bre +uXC eJo eJo -bre +uXC eJo qkU qkU qkU qkU -bre +uXC eJo eJo -bre -bre +uXC +uXC eJo eJo eJo @@ -64005,7 +63330,7 @@ jOR vmG mcI kFO -cxs +oiD sdk jCW ifV @@ -64066,16 +63391,16 @@ fZN ubB ubB fZN -isQ -isQ +bAS +bAS dzq -bre -bre -bre +uXC +uXC +uXC eJo -bre -bre -bre +uXC +uXC +uXC qkU eJo eJo @@ -64087,18 +63412,18 @@ eJo qkU eJo eJo -bre +uXC eJo -bre +uXC eJo eJo -bre -bre +uXC +uXC eJo eJo eJo eJo -bre +uXC qkU qkU eJo @@ -64122,7 +63447,7 @@ qkU qkU eJo eJo -bre +uXC eJo eJo aFY @@ -64199,7 +63524,7 @@ jvw efb cqi tbi -cxs +oiD sdk lmQ urI @@ -64263,16 +63588,16 @@ fZN nLH huX bSp -bre +uXC aFY aFY eJo -bre +uXC eJo eJo qkU -bre -bre +uXC +uXC eJo eJo eJo @@ -64292,24 +63617,24 @@ qkU qkU eJo eJo -bre +uXC qkU qkU eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo eJo -bre +uXC eJo eJo eJo eJo -bre +uXC eJo eJo eJo @@ -64393,7 +63718,7 @@ oRA sUX iTc eSi -cxs +oiD rly jih kaz @@ -64587,7 +63912,7 @@ siU efb alK lfF -cxs +oiD cni cni quN @@ -64678,11 +64003,11 @@ aFY aFY aFY aFY -isQ -isQ -isQ -isQ -isQ +bAS +avD +avD +avD +bAS aFY aFY aFY @@ -64781,7 +64106,7 @@ bcW uOz sbh fnG -cxs +oiD cni fwe cmk @@ -64819,7 +64144,7 @@ tIU sJV qet qjR -rJU +skO opT rJU ePO @@ -64897,7 +64222,7 @@ aFY aFY aFY aFY -bre +uXC qkU eJo eJo @@ -64975,11 +64300,11 @@ oiD oiD oiD ohg -cxs -ssM -ssM -ssM -ssM +oiD +hxV +hxV +hxV +hxV kVl kVl kVl @@ -65013,8 +64338,8 @@ tIU spN juN juN -rJU -rJU +oln +oln rJU rJU rJU @@ -65091,10 +64416,10 @@ aFY aFY aFY aFY -bre +uXC eJo eJo -bre +uXC aFY aFY aFY @@ -65167,13 +64492,13 @@ kwj gBD vGW wyL -elf +mIE rYF sDW -ssM +hxV nbr nbr -ssM +hxV amZ amZ qKa @@ -65288,7 +64613,7 @@ aFY qkU eJo eJo -bre +uXC aFY aFY aFY @@ -65361,13 +64686,13 @@ xIN wan nSz tTW -elf +mIE hGE lwc -ssM +hxV nbr nbr -ssM +hxV lAH aYW jCE @@ -65480,7 +64805,7 @@ aFY aFY aFY eJo -bre +uXC eJo eJo eJo @@ -65555,13 +64880,13 @@ nkI sle gTR ked -elf +mIE piB vJq -ssM +hxV nbr eID -ssM +hxV wUj sbI mJX @@ -65674,7 +64999,7 @@ aFY aFY aFY aFY -bre +uXC eJo eJo eJo @@ -65734,7 +65059,7 @@ aFY aFY aFY aFY -bre +uXC aFY aFY aFY @@ -65745,21 +65070,21 @@ his his his elf -elf +mIE gwy rRo -elf -elf +mIE +mIE ida qAX -ssM -pnj +hxV +hxV dYY -pnj +hxV kVl ckK -kVl -kVl +ucs +ucs kVl pnj pnj @@ -65869,7 +65194,7 @@ aFY aFY aFY aFY -bre +uXC eJo eJo eJo @@ -65938,7 +65263,7 @@ aFY aFY his his -ssM +hxV dqd xpV hKC @@ -65956,7 +65281,7 @@ reR vjQ trq ibl -pnj +hxV qfi qfi qfi @@ -66067,7 +65392,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -66132,7 +65457,7 @@ aFY aFY aFY his -ssM +hxV pcT scg oeV @@ -66150,7 +65475,7 @@ cUn jmr sBu pzt -pnj +hxV qfi qfi qfi @@ -66192,9 +65517,9 @@ bSX axa qpe omk -mIE -mIE -mIE +bLp +bLp +bLp uCh uCh uCh @@ -66326,25 +65651,25 @@ aFY aFY aFY aFY -ssM +hxV ssM iUL -mYW +oMf moZ byk -mYW +oMf moZ oLr -mYW -mYW -qea oMf +oMf +qea +rSR uSu aCg -jFz -jFz -jFz -jFz +pkY +vIy +vIy +vIy jFz jFz jFz @@ -66387,8 +65712,8 @@ imB dDu dvR xaq -rRu -mIE +sBb +bLp uCh uCh uCh @@ -66455,9 +65780,9 @@ aFY aFY aFY eJo -bre +uXC eJo -bre +uXC eJo aFY aFY @@ -66520,22 +65845,22 @@ aFY aFY aFY aFY -ssM +hxV kpK rPt -mYW +oMf dtX sVy -mYW +oMf aBm sVy -mYW +oMf wYh spU oMf nMM fLR -jFz +pkY wEY hSi snl @@ -66582,15 +65907,15 @@ dvX omk fuf mPG -mIE -mIE -mIE -mIE -mIE -mIE -mIE -mIE -mIE +bLp +bLp +bLp +bLp +bLp +bLp +bLp +bLp +bLp bBd vlg kTL @@ -66650,7 +65975,7 @@ aFY aFY aFY eJo -bre +uXC eJo eJo eJo @@ -66714,22 +66039,22 @@ aFY aFY aFY aFY -ssM +hxV lDi fVi -mYW +oMf wTd eSs -mYW +oMf wTd eSs -mYW +oMf mCN mop oMf mkS rfR -jFz +pkY hzA mvN mvN @@ -66750,12 +66075,12 @@ sua sua sua sua -uzf -uzf -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw +tZw +tZw jfI juN juN @@ -66847,7 +66172,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -66908,22 +66233,22 @@ aFY aFY aFY aFY -ssM +hxV whL wUH -mYW +oMf iCC sVy -mYW +oMf iCC sVy -mYW +oMf tEf asX oMf inh edC -jFz +pkY pNH aIm aIm @@ -66937,14 +66262,14 @@ lAv gmo jta fLr -uzf -uzf -uzf -uzf -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw +tZw +tZw +tZw +tZw gmC tfj fkV @@ -66957,7 +66282,7 @@ fkV rMK otA iem -uzf +tZw hTC jjs uYR @@ -66967,7 +66292,7 @@ uMO uYR uCh uCh -mIE +bLp fuf hDU rwn @@ -67041,7 +66366,7 @@ aFY aFY eJo eJo -bre +uXC eJo eJo aFY @@ -67102,17 +66427,17 @@ aFY aFY aFY aFY -ssM -ssM -ssM -mYW -mYW +hxV +hxV +hxV +oMf +oMf fiv -mYW -mYW +oMf +oMf qYu -mYW -mYW +oMf +oMf mMG oMf ggV @@ -67138,7 +66463,7 @@ mXi iDS iDS bVo -uzf +tZw mga kku kku @@ -67161,14 +66486,14 @@ gQH uYR uCh uCh -mIE +bLp mZa hDU -mIE +bLp acP rRu fDO -mIE +bLp rhs rKg lbC @@ -67298,7 +66623,7 @@ isQ aFY aFY aFY -mYW +rSR cRf cRf pKd @@ -67337,7 +66662,7 @@ xkJ umC jmE jmE -uzf +tZw qeU tZw tZw @@ -67355,7 +66680,7 @@ cYI uYR uCh uCh -mIE +bLp rRu hDU rmA @@ -67367,7 +66692,7 @@ rmA rmA rmA rmA -oSm +rmA hDA vlg egX @@ -67432,7 +66757,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -67523,15 +66848,15 @@ jHU jHU jHU jHU -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw ryX emm ilc pKf -uzf +tZw mNR tZw ggb @@ -67549,7 +66874,7 @@ uYR uYR uCh uCh -mIE +bLp rRu hDU rmA @@ -67561,7 +66886,7 @@ bSA vgj avx avx -oSm +rmA hDg oSZ bBd @@ -67572,7 +66897,7 @@ hmK dFO bBd bBd -cBT +bBd bBd ugV pXc @@ -67627,7 +66952,7 @@ aFY eJo eJo eJo -bre +uXC eJo aFY aFY @@ -67686,7 +67011,7 @@ aFY aFY aFY aFY -mYW +rSR kuQ kuQ cZM @@ -67720,12 +67045,12 @@ jHU jHU uWW uWW -uzf +tZw ryX emm -uzf -uzf -uzf +tZw +tZw +tZw kyJ tZw ree @@ -67736,14 +67061,14 @@ ree ree bLp fey -mIE +bLp uCh uCh uCh uCh uCh uCh -mIE +bLp rRu hDU rmA @@ -67755,7 +67080,7 @@ oKC gft gft rjV -oSm +rmA iEN mPV bBd @@ -67766,7 +67091,7 @@ aEI uwj kjd kjd -aob +kjd kjd gsy kyZ @@ -67880,7 +67205,7 @@ aFY aFY aFY his -mYW +rSR pKd pKd mCy @@ -67888,11 +67213,11 @@ lpc jnb mXb oCz -cNN -cNN +iQX +iQX ewR -cNN -cNN +iQX +iQX cNN pNH aIm @@ -67914,12 +67239,12 @@ nMi jHU jHU uWW -uzf +tZw jGz emm -uzf +tZw uWW -uzf +tZw gNh rgL ree @@ -67930,14 +67255,14 @@ eKy ree bLp fey -mIE +bLp uCh uCh uCh uCh uCh uCh -mIE +bLp swA hQG rmA @@ -67949,7 +67274,7 @@ qFr uat wZP wZP -oSm +rmA bnO tOd bBd @@ -68016,7 +67341,7 @@ aFY aFY eJo eJo -bre +uXC eJo eJo aFY @@ -68074,15 +67399,15 @@ aFY aFY aFY his -mYW +rSR pKd pKd cZM lpc jnb -mYW -mYW -cNN +oMf +oMf +iQX cDS vlR tQa @@ -68108,12 +67433,12 @@ fOr idA jHU uWW -uzf +tZw ryX emm -uzf +tZw uWW -uzf +tZw uud abq qeV @@ -68124,14 +67449,14 @@ vAp ree bLp fey -mIE +bLp uCh uCh uCh uCh uCh uCh -mIE +bLp bQJ hQG rmA @@ -68143,7 +67468,7 @@ dSV rmA rmA rmA -oSm +rmA hDg oSZ bBd @@ -68243,9 +67568,9 @@ aFY aFY aFY aFY -bre -bre -iQX +uXC +uXC +ijH "} (119,1,1) = {" qbg @@ -68268,7 +67593,7 @@ aFY aFY aFY aFY -mYW +rSR cRf cRf cZM @@ -68276,7 +67601,7 @@ eKH utc xBX pKd -cNN +iQX cDS eHO hqz @@ -68302,12 +67627,12 @@ pbb wfH jHU uWW -uzf +tZw ryX emm -uzf +tZw uWW -uzf +tZw gNh nWL ree @@ -68318,14 +67643,14 @@ vAp ree bLp fey -mIE +bLp uCh uCh uCh uCh -mIE -mIE -mIE +bLp +bLp +bLp ogQ tMU oSm @@ -68351,10 +67676,10 @@ pZm pZm pZm pZm -dkS +vGE ych sic -dkS +vGE his his his @@ -68437,9 +67762,9 @@ aFY aFY aFY eJo -bre -bre uXC +uXC +ijH "} (120,1,1) = {" qbg @@ -68470,11 +67795,11 @@ jYo aKQ aKQ aKQ -cNN +iQX cDS qyv -cNN -cNN +iQX +iQX cNN pNH aIm @@ -68496,12 +67821,12 @@ bKD hYB jHU uWW -uzf +tZw ryX emm -uzf +tZw uWW -uzf +tZw rFo tZw ree @@ -68512,12 +67837,12 @@ vAp ree bLp fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp pbw lfS lfS @@ -68545,18 +67870,18 @@ pZm pZm pZm pZm -dkS +vGE ych vMv -dkS -dkS -dkS -dkS -dkS -dkS -dkS -dkS -dkS +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE his his his @@ -68630,10 +67955,10 @@ aFY aFY aFY aFY -bre -bre -bre uXC +uXC +uXC +ijH "} (121,1,1) = {" qbg @@ -68656,7 +67981,7 @@ aFY aFY aFY aFY -mYW +rSR kuQ kuQ pKd @@ -68664,7 +67989,7 @@ dsp lRt uFn uFn -cNN +iQX cDS gFJ nuU @@ -68679,23 +68004,23 @@ nSF jFz jFz jFz -aic +cBT spQ mbu fnd -uzf -uzf -uzf -uzf -uzf -uzf -uzf -uzf +tZw +tZw +tZw +tZw +tZw +tZw +tZw +tZw ryX emm -uzf +tZw uWW -uzf +tZw kyJ tZw ree @@ -68704,14 +68029,14 @@ vAp vAp pha ree -ucs +bLp fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp hQG xMj xMj @@ -68739,10 +68064,10 @@ pZm pZm pZm pZm -dkS +vGE ych wVw -dkS +vGE dvi lJo mry @@ -68750,7 +68075,7 @@ hqx ych ych ych -dkS +vGE his his his @@ -68794,16 +68119,16 @@ aFY aFY aFY aFY -bre +uXC eJo eJo -bre -bre -bre +uXC +uXC +uXC eJo eJo -bre -bre +uXC +uXC eJo qkU eJo @@ -68824,10 +68149,10 @@ qkU eJo eJo eJo -bre -bre -bre uXC +uXC +uXC +ijH "} (122,1,1) = {" ujj @@ -68884,28 +68209,28 @@ kku xJe rdn oSH -uzf +tZw ryX glh -uzf -uWW -uzf -kyJ -uzf +tZw +rOS +rOS +kRe +rOS rOS pUN -drC -drC +qqd +qqd qqd mCf -rOS +bLp mCS -mIE +bLp uCh uCh uCh uCh -mIE +bLp hQG xMj vFA @@ -68933,10 +68258,10 @@ oSm oSm pZm pZm -dkS +vGE ych eGl -dkS +vGE nTk ych khn @@ -68944,7 +68269,7 @@ ych ych hqx ych -dkS +vGE his his his @@ -68994,34 +68319,34 @@ eJo eJo eJo eJo -bre -bre +uXC +uXC eJo eJo eJo qkU eJo eJo -bre +uXC eJo eJo -bre +uXC eJo eJo eJo eJo eJo eJo -bre +uXC qkU qkU -bre +uXC eJo -bre -bre -bre -bre uXC +uXC +uXC +uXC +ijH "} (123,1,1) = {" ujj @@ -69067,39 +68392,39 @@ aDz mYG rAF pIu -aic +cBT fHf uAb -aic -aic -aic -uzf -uzf +cBT +cBT +cBT +tZw +tZw ryX ekp fkV -uzf +tZw ryX nDV -uzf -uWW -uzf -dYB -uWW +tZw rOS +aKe +qqd +pwO +tqc sld -exA lOQ -suw +djJ +lOQ lfi -rOS +bLp sRo -mIE +bLp uCh uCh uCh uCh -mIE +bLp edw jeN vRa @@ -69127,10 +68452,10 @@ dRg oSm pZm pZm -dkS +vGE ych cWT -dkS +vGE dvi ych iZr @@ -69138,7 +68463,7 @@ hqx ych ych ych -dkS +vGE his his his @@ -69194,28 +68519,28 @@ eJo eJo eJo eJo -bre +uXC eJo -bre +uXC eJo eJo -bre +uXC qkU qkU -bre +uXC eJo eJo eJo eJo -bre -bre +uXC +uXC eJo -bre +uXC eJo -bre -bre -bre uXC +uXC +uXC +ijH "} (124,1,1) = {" ujj @@ -69261,12 +68586,12 @@ jFz jFz lqc aTl -aic +cBT gKr moW qDr wKM -aic +mTg cjK xvT ryX @@ -69274,31 +68599,31 @@ ryX ryX dmr ryX -uzf -uzf -uzf -uzf -nxC -uzf -rOS +tZw +tZw rOS +jEh +nxC +fea +jsX +fea fea eDq -hhC -rOS -rOS +lOQ +ucF +vno sRo -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG xMj fkp kua -oSm +cxs dLf qSU hVZ @@ -69321,10 +68646,10 @@ uTF oSm pZm pZm -dkS +vGE ych nYA -dkS +vGE oQP ych rEa @@ -69332,7 +68657,7 @@ nSb hqx ych ych -dkS +vGE his his his @@ -69405,11 +68730,11 @@ qkU eJo eJo eJo -bre -bre -bre -bre uXC +uXC +uXC +uXC +ijH "} (125,1,1) = {" ujj @@ -69455,44 +68780,44 @@ qeH jFz ybG jBT -aic +cBT fmo moW qDr wKM -aic +mTg cjK -aic -uzf -uzf -uzf -uzf +cBT +tZw +tZw +tZw +tZw ryX xTb iDS -uzf -kHy -huJ -kHm -iDS -rOS -lqT -aKM -gCI rOS -mSA +jEh +hLB +kHm +lwW +cCs +lOQ +uIm +lOQ +ucF +bLp fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG xMj nVZ mcF -oSm +cxs dLf qSU hVZ @@ -69513,20 +68838,20 @@ oui nxh nxh oSm -hyG -dkS -dkS +vGE +vGE +vGE ych ozq -dkS -dkS vGE -dkS -dkS -dkS -dkS -dkS -dkS +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE his his his @@ -69601,9 +68926,9 @@ aFY aFY aFY eJo -bre -bre uXC +uXC +ijH "} (126,1,1) = {" ujj @@ -69649,7 +68974,7 @@ qeH jFz lqc jIE -aic +cBT kpU omc rUw @@ -69660,28 +68985,28 @@ aic uWW uWW uWW -uzf +tZw ryX -uzf -iDS -uzf -sqv +tZw iDS -uzf -uzf rOS -wsJ -lOQ +jEh +hLB +ucF +dNT +vwP oDt -rOS -tYy +oDt +oDt +pXK +bLp vOr -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG xMj oSm @@ -69692,12 +69017,12 @@ oSm hVZ iAg laB -tZm +oSm eMp eMp eMp eMp -tZm +oSm xQw vJA qSU @@ -69720,7 +69045,7 @@ ych ych ych gju -dkS +vGE his his his @@ -69794,13 +69119,13 @@ aFY aFY aFY aFY -bre -bre -bre uXC +uXC +uXC +ijH "} (127,1,1) = {" -bAS +hYQ iDK iDK wMH @@ -69854,28 +69179,28 @@ aic uWW uWW uWW -uzf +tZw ryX -uzf -iDS -uzf -taw +tZw iDS -uzf -uWW -rOS -axp -lOQ -kSL rOS -wqu +jEh +hLB +ucF +aqB +aqB +vny +vny +aqB +aqB +vrR fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG tCv oSm @@ -69914,7 +69239,7 @@ sYr tPg ych gju -dkS +vGE his his his @@ -69994,7 +69319,7 @@ ujj ujj "} (128,1,1) = {" -vAn +hYQ iDK iDK wMH @@ -70037,7 +69362,7 @@ jFz jFz lqc oKb -aic +cBT uQY ssW aic @@ -70048,28 +69373,28 @@ aic uWW uWW uWW -uzf +tZw ryX cuc -uzf -uzf -uzf -kHQ -rOS -rOS +tZw rOS -hdA -ccr +sML +kHQ +bhf +aqB +vny +vny +vny sMA -rOS +aqB ajv fey -mIE +bLp uCh uCh uCh uCh -mIE +bLp dtG crC oSm @@ -70097,18 +69422,18 @@ uTF oSm pYC ych -dkS -dkS -dkS -dkS -dkS -dkS -dkS -dkS +vGE +vGE +vGE +vGE +vGE +vGE +vGE +vGE oTB -dkS -dkS -dkS +vGE +vGE +vGE vqX vqX aFY @@ -70188,7 +69513,7 @@ osh qbg "} (129,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70242,28 +69567,28 @@ aic uWW uWW uWW -uzf +tZw ryX qYX pKf -pKf -pKf -pKf -rOS -lUe -ufd -nYy -lOQ +exw +jEh +hLB +hKr +aqB vny -qvs -mIE +vny +vny +vny +aqB +vrR azH -mIE -mIE -mIE -mIE -mIE -mIE +bLp +bLp +bLp +bLp +bLp +bLp oyR wLU oSm @@ -70291,7 +69616,7 @@ pgI oSm ych ych -dkS +vGE fVb dqk ogu @@ -70382,7 +69707,7 @@ osh qbg "} (130,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70425,10 +69750,10 @@ vyN vyN pNH jFz -aic +cBT sUJ dkx -aic +cBT bIA rOS rOS @@ -70436,20 +69761,20 @@ rOS uWW uWW uWW -uzf +tZw ryX -uzf -rOS -rOS -pKf -pKf -rOS +tZw rOS rOS -bwo -lOQ -nlW -oUb +jEh +hLB +ucF +aqB +vny +vny +vny +vny +aqB oou sse lcn @@ -70485,7 +69810,7 @@ oSm oSm ych ych -dkS +vGE vdG kfM kfM @@ -70576,7 +69901,7 @@ osh qbg "} (131,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70619,10 +69944,10 @@ uyB mvN wLp ioI -aic +cBT siJ qmk -aic +cBT bIA rOS lUe @@ -70630,21 +69955,21 @@ rOS uWW uWW uWW -uzf +tZw ryX -uzf +tZw lUe rOS -erH -pKf -pKf -pKf -qYX -eFe -lOQ -iiJ -rIq -sZP +jEh +hLB +ucF +aqB +vny +vny +vny +vny +aqB +cCq rUW sZP sZP @@ -70667,7 +69992,7 @@ qSU qSU qSU iEU -tZm +oSm nMw agK vmT @@ -70679,7 +70004,7 @@ sXS oSm fTt ych -dkS +vGE rdj dEy cKH @@ -70770,7 +70095,7 @@ osh qbg "} (132,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -70829,24 +70154,24 @@ kim rOS dzJ rOS -rOS -rOS -rOS -rOS -rOS -rik -wXU -fdb -rOS -mIE -mIE -mIE -mIE +bFr +xuk +cdp +aqB +aqB +aqB +aqB +aqB +aqB +cCq +bLp +bLp +bLp dSQ pub -mIE -mIE -mIE +bLp +bLp +bLp vUu oSm dbK @@ -70873,7 +70198,7 @@ uTF oSm ych ych -dkS +vGE nrR mRH mRH @@ -70964,7 +70289,7 @@ osh qbg "} (133,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -71011,8 +70336,8 @@ wyv vxE kjQ nng -lSg -nUI +vAn +fJH qAV qOJ gAj @@ -71020,27 +70345,27 @@ pMt nUI cZw nUI -nUI +cZw qAV ljx lSg -gAj +lrw hRQ xqk fjo ofq uGu weY -rOS +rwM +kKu uCh uCh -uCh -mIE +bLp wCx pub -mIE +bLp uCh -mIE +bLp vUu oSm dqs @@ -71067,7 +70392,7 @@ wwN oSm ych bmM -dkS +vGE hfw hfw hfw @@ -71158,7 +70483,7 @@ osh qbg "} (134,1,1) = {" -vAn +hYQ iDK iDK iDK @@ -71205,8 +70530,8 @@ vDO ezH dcT vUq -vUq -vUq +ixh +gTt vUq vUq vUq @@ -71229,12 +70554,12 @@ rOS uCh uCh uCh -mIE +bLp aDg pub -mIE +bLp uCh -mIE +bLp vUu oSm fpo @@ -71261,7 +70586,7 @@ oSm oSm ych ttR -dkS +vGE cCl cCl hfw @@ -71352,7 +70677,7 @@ osh qbg "} (135,1,1) = {" -vAn +hYQ iDK iDK wMH @@ -71423,12 +70748,12 @@ rOS uCh uCh uCh -mIE +bLp nWl pub -mIE +bLp uCh -mIE +bLp vUu oSm max @@ -71455,7 +70780,7 @@ ych ych ych ych -dkS +vGE uqL cCl hfw @@ -71546,7 +70871,7 @@ osh qbg "} (136,1,1) = {" -vAn +hYQ iDK iDK wMH @@ -71588,7 +70913,7 @@ aPo pfv fQU rGw -fQU +dTk fpi sIZ pcG @@ -71617,12 +70942,12 @@ rOS rOS uCh uCh -mIE +bLp dSQ pub -mIE +bLp uCh -mIE +bLp wgQ oSm oSm @@ -71632,12 +70957,12 @@ oSm qSU gkc bPU -tZm +oSm eMp eMp eMp eMp -tZm +oSm uqo vJA qSU @@ -71649,7 +70974,7 @@ dqb xDr ych eBz -dkS +vGE cCl cCl doG @@ -71811,16 +71136,16 @@ hfh rOS uCh uCh -mIE +bLp dSQ fBj -mIE +bLp uCh -mIE +bLp cep hyj oIn -oSm +cxs dLf qSU qSU @@ -72008,13 +71333,13 @@ whS whS mas pub -mIE +bLp uCh -mIE +bLp sZP ppA pms -oSm +cxs dLf qSU qSU @@ -72202,10 +71527,10 @@ vhj whS cRu pub -mIE +bLp uCh -mIE -mIE +bLp +bLp dSQ wgQ oSm @@ -72396,10 +71721,10 @@ wFz fmB hyj pGH -mIE +bLp uCh uCh -mIE +bLp dSQ vUu oSm @@ -72590,10 +71915,10 @@ qzG whS ktx pub -mIE +bLp uCh uCh -mIE +bLp hPl vUu oSm @@ -72784,13 +72109,13 @@ wep whS fsF pub -mIE +bLp uCh uCh -mIE +bLp qNk vUu -mIE +bLp qso rRu oSm @@ -72931,7 +72256,7 @@ drK hSy jgC jgC -jJw +nMN muz ehJ eah @@ -72978,13 +72303,13 @@ whS whS oWb pub -mIE +bLp uCh uCh -mIE -mIE +bLp +bLp gND -mIE +bLp rRu fny gQC @@ -73125,7 +72450,7 @@ jrR hSy jgC jgC -jJw +nMN yiM cKB eBl @@ -73170,9 +72495,9 @@ dJe ayl cGH whS -mIE +bLp mGH -mIE +bLp iMr iMr rOS @@ -73181,7 +72506,7 @@ aOs rOS rOS sSd -kDE +sSd kDE kDE kDE @@ -73195,7 +72520,7 @@ jVz jVz dxH dxH -dxH +mEi mEi pxt eYt @@ -73374,7 +72699,7 @@ lOQ jxV lOQ hBS -sSd +eVq xIB ias xIB @@ -73568,7 +72893,7 @@ kRR jxV lOQ hBS -sSd +eVq xIB xIB xIB @@ -73937,9 +73262,9 @@ hpY ubV soU qrX -soU ezW -auv +yeP +ezW vWi nQv rOS @@ -74131,8 +73456,8 @@ uXS cjw tdU hWQ -mPi cLL +dkS wOX lOQ mRc @@ -74712,7 +74037,7 @@ lQS uFO kUE bkI -sTk +tJK eJj sTk fPO @@ -74906,7 +74231,7 @@ lQS uFO xXw evL -sTk +tJK eJj sTk sZz @@ -75100,9 +74425,9 @@ hoo uFO vGt bdR -sTk +tJK mAh -uFO +pSv iyI lOQ ydX @@ -75294,7 +74619,7 @@ umL uFO sty eFC -sTk +tJK eJj pjF xpQ @@ -75338,7 +74663,7 @@ kTB kDZ ejS uTV -dkS +vGE kug kug vtI @@ -75489,12 +74814,12 @@ uFO kYi jTx uFO -sTk +tJK uFO bdL wBz tXj -rOS +dQI gSb gSb gSb @@ -75509,8 +74834,8 @@ eXH eXH gSb vjO -vjO -vjO +svt +svt suI lNB lNB @@ -75532,9 +74857,9 @@ vpR oId vyR vyR -dkS -dkS -dkS +vGE +vGE +vGE vtI kjM hJO @@ -75727,7 +75052,7 @@ uvH thy rhx nBu -dkS +vGE ebf vtI nCf @@ -75737,7 +75062,7 @@ vtI tzO chk flQ -bzU +vms plG wqT aFY @@ -75921,7 +75246,7 @@ pRF wNN fSz bqM -dkS +vGE jRi vtI vtI @@ -76240,7 +75565,7 @@ bIr lEH lij xGi -pDO +wpy dJw irX seT @@ -76270,7 +75595,7 @@ uFO qtD lOQ acW -rOS +dQI vZm gSb wic @@ -76417,11 +75742,11 @@ aFY aFY his eZZ -vwJ -vwJ +sQq +sQq nfZ -vwJ -vwJ +sQq +sQq eZZ eZZ eZZ @@ -76464,8 +75789,8 @@ mQq sZz lOQ fmz -rIq -rOS +ezv +dQI gSb unR uMK @@ -76654,7 +75979,7 @@ xKC fAG thL rTb -rOS +nIE nyo whP fmz @@ -76673,9 +75998,9 @@ dqU dqU tyg vjO -vjO +svt qNQ -vjO +svt lNB lNB sYF @@ -76850,10 +76175,10 @@ fNh fNh fNh kfi -vIy +sWV tXS -fNh -fNh +auv +auv gSb gSb ihQ @@ -77040,7 +76365,7 @@ cXw eQt lYh szQ -fNh +auv kCk uaz aOm @@ -77048,7 +76373,7 @@ eCr sIN tFl kCk -fNh +auv jNV cFk fAw @@ -77191,7 +76516,7 @@ onw onw onw onw -avD +xNf eZZ taQ gxn @@ -77210,7 +76535,7 @@ vuL ctV pDO pDO -azD +bYF jgC jgC voY @@ -77234,7 +76559,7 @@ cFk cFk cFk gnY -fNh +auv kCk uaz aOm @@ -77242,7 +76567,7 @@ ykZ pgv tFl kCk -fNh +auv giJ cFk cFk @@ -77257,7 +76582,7 @@ aad vjO vjO vjO -vjO +svt lNB lNB lNB @@ -77428,15 +76753,15 @@ uCp uCp srB bad -fNh -fNh -fNh +auv +auv +auv gNB lZL tRM -fNh -fNh -fNh +auv +auv +auv ddH qOd fjH @@ -77616,7 +76941,7 @@ xVz xVz xVz xVz -fNh +auv iou cFk nbV @@ -77626,7 +76951,7 @@ iGH elh oyX hSt -vIy +sWV ksV oyX rpx @@ -77662,8 +76987,8 @@ his uaU lgC lOC -bre -bre +uXC +uXC qDA his his @@ -77810,7 +77135,7 @@ lSi lSi lSi lSi -fNh +auv qdD exV exV @@ -77835,9 +77160,9 @@ dsk dsk dsk gSb -dsk -dsk -dsk +aob +aob +aob gSb his his @@ -77856,7 +77181,7 @@ srn eJo eJo fyK -bre +uXC fyK srn lOC @@ -78004,7 +77329,7 @@ qTI wRB idy lDK -fNh +auv lqW cFk ykZ @@ -78028,14 +77353,14 @@ hiJ olB iIb lVz -fNh +auv cSU qBH srn qDA eJo -bre -bre +uXC +uXC srn lOC gFo @@ -78049,9 +77374,9 @@ eJo eJo fyK ndc -bre -bre -bre +uXC +uXC +uXC fyK eJo eJo @@ -78060,8 +77385,8 @@ eJo lOC eJo eJo -bre -bre +uXC +uXC eJo pDZ aFY @@ -78222,25 +77547,25 @@ cFk cFk cFk cFk -fNh +oYn oxq -bre -bre +uXC +uXC srn -bre +uXC fyK eJo -bre +uXC eJo -bre -bre -bre -bre +uXC +uXC +uXC +uXC fyK eJo eJo ndc -bre +uXC eJo eJo fyK @@ -78250,9 +77575,9 @@ lOC fyK eJo srn -bre +uXC fyK -bre +uXC fyK fyK fyK @@ -78355,7 +77680,7 @@ oAN oAN oAN oAN -avD +xNf eZZ eZZ eZZ @@ -78373,25 +77698,25 @@ xtJ gVG xtJ xtJ -bre -bre -bre -bre -bre +uXC +uXC +uXC +uXC +uXC orn -isQ -bre -bre -bre -bre +fEX +uXC +uXC +uXC +uXC isQ kCc kCc gqb -fNh -fNh -fNh -fNh +auv +auv +auv +auv gqb mOV tsM @@ -78416,23 +77741,23 @@ tsM tsM tsM jwg -gqb +uIy wkX srn -bre -bre -bre +uXC +uXC +uXC lOC eJo -bre +uXC fyK -bre +uXC eJo srn eJo ndc -bre -bre +uXC +uXC eJo srn eJo @@ -78441,16 +77766,16 @@ eJo eJo eJo eJo -bre -bre -bre +uXC +uXC +uXC eJo eJo srn lOC eJo fyK -bre +uXC xee aFY aFY @@ -79163,7 +78488,7 @@ fiP fiP fiP fiP -sxt +hyG sLD sLD sLD @@ -79192,7 +78517,7 @@ sLD sLD sLD sLD -sxt +hyG fiP fiP mbw @@ -79420,7 +78745,7 @@ fyK ijF tdn isQ -bre +uXC xee aFY aFY @@ -79808,7 +79133,7 @@ tdn tdn fyK mHr -bre +uXC pDZ aFY fyK @@ -80196,7 +79521,7 @@ tdn ijF fyK isQ -bre +uXC pDZ aFY tdn @@ -80327,7 +79652,7 @@ fiP fiP fiP fiP -sxt +hyG sLD sLD sLD @@ -80356,7 +79681,7 @@ sLD sLD sLD sLD -sxt +hyG fiP mbw fiP @@ -80565,9 +79890,9 @@ tQo tQo dzz tQo -nMN -nMN -nMN +xcL +xcL +xcL tQo tQo iKy @@ -81104,34 +80429,34 @@ oAN oAN oAN gqb -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh -fNh +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv +auv gqb mLo mLo diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm index 890ac78aca..f7d5d362f4 100644 --- a/maps/tether/levels/surface2.dmm +++ b/maps/tether/levels/surface2.dmm @@ -58,7 +58,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) "adY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/middlehall) "aek" = ( /obj/structure/railing{ @@ -234,11 +234,7 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "akL" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -285,15 +281,6 @@ /turf/simulated/mineral/floor/virgo3b, /area/tether/surfacebase/outside/outside2) "alC" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_c" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "patient_room_c" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -305,6 +292,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_c"; + name = "Patient C" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_c) "alM" = ( @@ -343,10 +335,7 @@ }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/mauve/bordercorner2, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -412,19 +401,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"aqv" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "aqZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -533,11 +509,17 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) +"auz" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "auT" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/camera/network/tether, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "avt" = ( @@ -574,16 +556,8 @@ name = "Pen 3 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "axi" = ( @@ -780,7 +754,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "aAE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_slimepens) "aBA" = ( /obj/effect/floor_decal/borderfloor{ @@ -930,7 +904,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar_upper) "aGQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/emergency_storage/atmos) "aGU" = ( /obj/structure/cable/green{ @@ -1183,11 +1157,7 @@ /turf/simulated/floor/tiled, /area/rnd/lockers) "aUg" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -1200,15 +1170,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "aUm" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "aUn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomfoyer) "aUw" = ( @@ -1414,10 +1381,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/rnd/lockers) "bbE" = ( @@ -1457,11 +1421,7 @@ /area/maintenance/asmaint2) "bdR" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -1479,17 +1439,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) -"bdU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "bdX" = ( /obj/machinery/door/window/brigdoor/eastleft{ name = "Slime Pen 3"; @@ -1625,12 +1574,11 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "bhv" = ( @@ -1745,11 +1693,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -1839,7 +1783,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "boG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/interrogation) "boR" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -2036,12 +1980,8 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "bvC" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/structure/cable/green{ - dir = 1; +/obj/machinery/fire_alarm/east_mount, +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/wood, @@ -2089,7 +2029,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Infirmary Lobby" }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "byZ" = ( @@ -2411,10 +2351,6 @@ req_access = list(19) }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/blast/regular{ @@ -2428,6 +2364,9 @@ opacity = 0; open_layer = 1 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor, /area/bridge/bridge_hallway) "bMp" = ( @@ -2478,12 +2417,11 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "bNJ" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomsat) "bNP" = ( @@ -2741,14 +2679,8 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "bXq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/surface_two_hall) "bXZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -2759,8 +2691,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "bYv" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/morgue) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/east_stairs_two) "bYE" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -2858,9 +2790,6 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "cdj" = ( @@ -2878,11 +2807,7 @@ /area/tether/surfacebase/medical/centralhall) "cdu" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2890,7 +2815,7 @@ /area/tether/surfacebase/security/detective/officeb) "cdQ" = ( /obj/structure/sign/department/telecoms, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/tcomms) "cdS" = ( /obj/effect/floor_decal/techfloor{ @@ -3030,13 +2955,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "cgz" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_slimepens) "cha" = ( @@ -3053,10 +2973,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "chh" = ( @@ -3118,33 +3035,22 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "chq" = ( -/turf/simulated/wall{ - can_open = 1 - }, -/area/maintenance/lower/bar) -"chC" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/obj/effect/floor_decal/corner/yellow/border, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/emergency_storage/atmos) "chK" = ( /obj/effect/debris/cleanable/blood, /turf/simulated/floor, /area/maintenance/lower/north) "chM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/light_switch{ dir = 1; on = 0; pixel_x = -10; pixel_y = -24 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/teleporter) "cii" = ( @@ -3157,11 +3063,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) "ciA" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -3403,7 +3305,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "cpH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/atmos_eva) "cqh" = ( /obj/structure/catwalk, @@ -3469,15 +3371,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) -"ctj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "ctt" = ( /obj/structure/bed/chair, /obj/item/radio/intercom{ @@ -3692,7 +3585,7 @@ /area/tether/surfacebase/old_tram) "czY" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "cAS" = ( /obj/structure/disposalpipe/segment{ @@ -3746,9 +3639,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "cFa" = ( -/turf/simulated/wall{ - can_open = 1 - }, +/turf/simulated/wall/prepainted, /area/vacant/vacant_bar_upper) "cFc" = ( /obj/machinery/porta_turret{ @@ -3822,20 +3713,14 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "cGM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/reading_room) "cGZ" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralhall) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "cHi" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4089,15 +3974,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "cNU" = ( @@ -4236,7 +4121,7 @@ /area/rnd/staircase/secondfloor) "cUi" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/examroom) "cUl" = ( /obj/machinery/computer/rdservercontrol{ @@ -4293,8 +4178,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "cWY" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/resleeving) +/turf/simulated/wall/prepainted/security, +/area/maintenance/lower/north) "cXO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -4340,9 +4225,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "cYW" = ( @@ -4356,8 +4239,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/security, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/holowarrant, @@ -4436,7 +4318,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "dbW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/evastorage) "dcg" = ( /obj/machinery/light/small{ @@ -4491,7 +4373,7 @@ /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" }, -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted, /area/engineering/lower/lobby) "deB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4509,11 +4391,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "deF" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/orange{ icon_state = "0-8" }, @@ -4724,29 +4602,15 @@ /area/engineering/drone_fabrication) "dmI" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"dnw" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Bridge"; - departmentType = 5; - name = "Bridge RC"; - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "doq" = ( /obj/machinery/space_heater, /obj/structure/window/reinforced{ @@ -4910,6 +4774,9 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) +"dwA" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "dwC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4937,6 +4804,24 @@ /obj/structure/stairs/spawner/west, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) +"dBJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 6 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "dCm" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -4960,17 +4845,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "dCW" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/tcommsat/computer) -"dDb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "dDl" = ( /obj/structure/table/glass, /obj/item/folder/white_rd, @@ -4984,10 +4860,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) "dEE" = ( @@ -5087,12 +4960,11 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 6 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "dHL" = ( @@ -5242,11 +5114,12 @@ /turf/simulated/floor, /area/maintenance/substation/research) "dOp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "rd_office" - }, /obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "rd_office"; + name = "RD Office" + }, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor, /area/rnd/rdoffice) "dOK" = ( @@ -5352,18 +5225,8 @@ name = "Pen 10 Blast Doors"; opacity = 0 }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "dRT" = ( @@ -5385,10 +5248,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) @@ -5435,7 +5295,7 @@ /area/teleporter) "dUz" = ( /obj/structure/symbol/gu, -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/south) @@ -5497,7 +5357,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/tcomms) "dWZ" = ( /obj/structure/cable{ @@ -5544,13 +5404,9 @@ /area/tcomfoyer) "dYM" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "dZc" = ( @@ -5572,10 +5428,7 @@ /turf/simulated/floor, /area/maintenance/lower/south) "dZF" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5634,9 +5487,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/lockers) -"edb" = ( -/turf/simulated/wall, -/area/rnd/rdoffice) "edp" = ( /obj/structure/railing, /obj/structure/railing{ @@ -5781,11 +5631,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor/shifted{ dir = 1 }, @@ -5805,9 +5651,6 @@ /obj/machinery/door/airlock/maintenance/command{ req_access = list(19) }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5824,19 +5667,13 @@ opacity = 0; open_layer = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/bridge/bridge_hallway) "ehM" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "cmo_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "cmo_office" - }, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall/prepainted/medical, /area/tether/surfacebase/medical/cmo) "ehV" = ( /obj/structure/bookcase, @@ -5879,11 +5716,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "ejq" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "meetingroom" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "meetingroom"; + name = "Command Meeting" }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor, /area/bridge/meeting_room) "ejF" = ( @@ -5900,7 +5737,7 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "eks" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/breakroom) "ekL" = ( /obj/structure/railing{ @@ -6037,7 +5874,6 @@ /area/maintenance/lower/north) "epk" = ( /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/white, @@ -6059,17 +5895,10 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "epZ" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/turf/simulated/wall/prepainted{ + can_open = 1 }, -/obj/structure/grille, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) +/area/maintenance/lower/rnd) "eqp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6111,11 +5940,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/staircase/secondfloor) @@ -6126,11 +5951,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -6161,7 +5982,6 @@ dir = 1 }, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/white, @@ -6218,23 +6038,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) -"ewg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/engineering/lower/breakroom) "ewU" = ( /turf/simulated/floor/tiled, /area/janitor) "ewZ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "ward_tint" - }, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/recoveryward) +/turf/simulated/wall/prepainted/science, +/area/rnd/staircase/secondfloor) "exa" = ( /obj/structure/railing{ dir = 4 @@ -6276,15 +6085,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"eyw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "eyK" = ( /obj/structure/railing{ dir = 1 @@ -6305,19 +6105,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"eAI" = ( -/obj/effect/floor_decal/borderfloor/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 5 - }, -/obj/structure/bed/chair, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "eAR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, @@ -6334,11 +6121,16 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "eAU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/maintenance/engineering/pumpstation) "eBn" = ( /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) +"eBq" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "eBr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6377,11 +6169,10 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) "eCd" = ( -/turf/simulated/wall, -/area/engineering/lower/lobby) +/turf/simulated/wall/prepainted, +/area/maintenance/lower/rnd) "eCp" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -6393,15 +6184,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "eCv" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_a" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "patient_room_a" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -6413,6 +6195,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_a"; + name = "Patient A" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_a) "eCL" = ( @@ -6535,10 +6322,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "eFC" = ( @@ -6592,7 +6376,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "eJb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/maintenance/substation/command) "eJh" = ( /obj/item/radio/beacon, @@ -6646,7 +6430,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "eMx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/storage) "eMH" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -6771,12 +6555,7 @@ /turf/simulated/mineral, /area/tether/surfacebase/reading_room) "eQV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/readingrooms) "eQW" = ( @@ -6823,7 +6602,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "eRZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/fish_farm) "eSc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6864,11 +6643,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer) @@ -6877,7 +6653,7 @@ desc = "A warning sign which reads 'WATCH YOUR STEP'."; name = "\improper WATCH YOUR STEP" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/commandmaint) "eUG" = ( /turf/simulated/mineral, @@ -6996,13 +6772,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/medsec) "eYI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/light/small, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "eZk" = ( @@ -7060,7 +6830,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "fah" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/bar) "fat" = ( /obj/machinery/portable_atmospherics/powered/scrubber, @@ -7072,29 +6842,16 @@ /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) "fav" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/detective) "fay" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "1-8" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) "faD" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -7102,7 +6859,8 @@ name = "Pen 10 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "fbh" = ( @@ -7285,7 +7043,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomsat) "fht" = ( /obj/machinery/light{ @@ -7323,12 +7081,11 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "fiE" = ( @@ -7349,12 +7106,11 @@ /area/maintenance/lower/south) "fiW" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "fjg" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/paper_bin, @@ -7427,6 +7183,7 @@ "fmp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "fmr" = ( @@ -7487,6 +7244,9 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/south) +"fsv" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "fsz" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -7659,10 +7419,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; + on = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0; - on = 1 + pump_direction = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=500;TEMP=80"; @@ -7672,11 +7432,7 @@ "fzR" = ( /obj/structure/table/steel, /obj/effect/floor_decal/rust, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/random/maintenance/research, /obj/random/tech_supply, /turf/simulated/floor/tiled/steel_dirty, @@ -7781,11 +7537,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "fCy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -7846,11 +7598,8 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/pink{ icon_state = "0-8" }, /turf/simulated/floor/plating, @@ -7879,17 +7628,12 @@ "fHA" = ( /obj/machinery/disposal, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "fHF" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -7901,13 +7645,8 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/centralhall) "fHS" = ( @@ -7995,12 +7734,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "fKx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -8011,6 +7744,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/outfitting) "fKC" = ( @@ -8020,17 +7755,14 @@ /turf/simulated/floor/tiled, /area/janitor) "fKG" = ( -/turf/simulated/wall/r_wall, -/area/engineering/drone_fabrication) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/outside/outside2) "fKS" = ( /obj/structure/sink{ dir = 4; pixel_x = 11 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/mirror{ pixel_x = 29 }, @@ -8223,12 +7955,6 @@ /obj/item/seeds/random, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"fPs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "fQs" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; @@ -8241,6 +7967,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) +"fQu" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "fQB" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -8303,6 +8036,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_a) +"fSE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "fSS" = ( /obj/structure/closet/wardrobe/pjs, /obj/item/handcuffs/fuzzy, @@ -8435,11 +8177,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -8475,6 +8214,18 @@ /obj/item/slime_extract/grey, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) +"fXt" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "fXL" = ( /obj/machinery/door/airlock/medical{ name = "Morgue"; @@ -8596,6 +8347,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) +"gcD" = ( +/obj/structure/railing, +/obj/structure/lattice, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "gcP" = ( /obj/machinery/light/small{ dir = 4 @@ -8653,11 +8412,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "gep" = ( @@ -8683,6 +8438,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "ggP" = ( @@ -8723,6 +8481,17 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) +"gis" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "giu" = ( /obj/structure/bed/chair/comfy/black, /obj/structure/disposalpipe/segment, @@ -8766,6 +8535,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) +"gku" = ( +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "gkJ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -8832,8 +8604,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -8869,10 +8640,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "gmP" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8922,11 +8690,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "goj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -8964,11 +8728,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "gpO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -8989,7 +8749,7 @@ /area/tether/surfacebase/medical/recoveryward) "gqK" = ( /obj/structure/sign/deck/second, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_slimepens) "grc" = ( /obj/machinery/disposal, @@ -9113,7 +8873,7 @@ /turf/simulated/floor/wood, /area/engineering/lower/breakroom) "gtI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/teleporter) "gtR" = ( /obj/effect/floor_decal/borderfloor{ @@ -9145,10 +8905,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "gvx" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "cmo_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "cmo_office"; + name = "CMO office" }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/cmo) @@ -9371,8 +9130,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9473,12 +9231,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "gCr" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/south) "gDl" = ( @@ -9597,11 +9350,7 @@ /area/tether/surfacebase/surface_two_hall) "gId" = ( /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -9620,28 +9369,22 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "gIp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/reading_room) +"gIz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/structure/window/basic{ dir = 1 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/centralhall) +/obj/effect/floor_decal/corner/green/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "gII" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/breakroom/bathroom) "gIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9910,7 +9653,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "gTB" = ( @@ -9925,9 +9667,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/empty, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "gUe" = ( @@ -9947,17 +9686,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "gUJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -9965,7 +9693,8 @@ name = "Pen 9 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "gVC" = ( @@ -10077,7 +9806,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "gZG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/bathroom) "gZM" = ( /obj/machinery/washing_machine, @@ -10103,21 +9832,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "hal" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "han" = ( @@ -10209,8 +9926,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "hdE" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10280,11 +9996,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) "hgc" = ( @@ -10381,6 +10093,15 @@ /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"hmg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "hmG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -10393,15 +10114,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) -"hmV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "hnc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -10416,9 +10128,6 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "hnf" = ( @@ -10440,19 +10149,6 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/old_tram) "hog" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -10460,6 +10156,8 @@ name = "Pen 1 Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "hou" = ( @@ -10504,10 +10202,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "hqA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -10518,19 +10213,10 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) "hqD" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/atmos_eva) -"hra" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "hrp" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -10592,11 +10278,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -10638,7 +10321,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "hwi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/mining) "hwk" = ( /obj/structure/cable/cyan{ @@ -10725,15 +10408,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "hAs" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_b" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "patient_room_b" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -10745,6 +10419,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_b"; + name = "Patient B" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_b) "hBh" = ( @@ -10854,11 +10533,12 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "hFn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/lockers) "hGy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock, /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "hGI" = ( @@ -10876,9 +10556,6 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "hGT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/item/radio/intercom{ broadcasting = 1; frequency = 1473; @@ -11029,11 +10706,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/cyan, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -11299,9 +10972,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "hTQ" = ( @@ -11340,8 +11010,7 @@ "hUI" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -11486,11 +11155,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/storage) "iaa" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/green{ icon_state = "0-8" @@ -11526,11 +11191,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"iaN" = ( -/obj/item/storage/fancy/cigar/havana, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) "ibj" = ( /obj/structure/table/steel, /obj/item/flashlight/lamp, @@ -11702,7 +11362,7 @@ name = "Command Substation"; req_one_access = list(10,19) }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -11729,9 +11389,7 @@ dir = 1 }, /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 5; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, @@ -11743,10 +11401,6 @@ /area/tether/surfacebase/medical/breakroom) "imK" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, @@ -11755,6 +11409,12 @@ /obj/landmark{ name = "lightsout" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "imW" = ( @@ -11768,10 +11428,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "inb" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -11795,14 +11452,14 @@ "inS" = ( /obj/structure/bed/padded, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ +/obj/machinery/fire_alarm{ pixel_y = -26 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "inU" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/bar) "ioh" = ( /obj/effect/floor_decal/techfloor, @@ -11881,10 +11538,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ipR" = ( @@ -11903,6 +11557,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"iqy" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "iqG" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -12276,13 +11939,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ +/obj/structure/cable/pink, +/obj/structure/cable/pink{ icon_state = "0-2" }, +/obj/structure/cable/pink{ + icon_state = "0-4" + }, /turf/simulated/floor/plating, /area/maintenance/substation/command) "iBd" = ( @@ -12340,15 +12003,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"iBN" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "iCc" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -12421,13 +12075,12 @@ req_access = list(5); req_one_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "iER" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos) "iFh" = ( @@ -12451,8 +12104,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "iFL" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/disposalpipe/trunk{ @@ -12474,10 +12126,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/server) "iGI" = ( @@ -12533,8 +12182,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite/corner2{ @@ -12657,7 +12305,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/white, @@ -12751,7 +12398,6 @@ name = "Medical Breakroom"; sortType = "Medical Breakroom" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "iNS" = ( @@ -12763,6 +12409,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) +"iON" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "iOU" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -12781,7 +12435,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "iPB" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/bridge/meeting_room) "iPR" = ( /obj/structure/catwalk, @@ -12811,11 +12465,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "iRG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12845,7 +12495,7 @@ /area/engineering/atmos) "iSt" = ( /obj/structure/sign/department/telecoms, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/tcommsat/entrance) "iSx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -12874,17 +12524,17 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "iTw" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/polarized/full{ - id = "wardenwindows" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "wardenwindows"; + name = "Wardens Office" }, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "iTY" = ( @@ -13082,7 +12732,7 @@ /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/lower/rnd) "jdu" = ( /obj/structure/cable/green{ @@ -13099,6 +12749,15 @@ /obj/random/action_figure, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) +"jfJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "jfO" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -13169,8 +12828,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/light_switch{ @@ -13387,9 +13045,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "joP" = ( @@ -13434,10 +13090,7 @@ /area/maintenance/lower/bar) "jra" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/standard, /obj/random/medical, @@ -13532,7 +13185,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "jtG" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/maintenance/commandmaint) "jux" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13633,22 +13286,11 @@ name = "Pen 5 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "jxG" = ( @@ -13695,7 +13337,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, /turf/simulated/floor/wood, @@ -13791,9 +13433,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_b) "jCm" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/atmos/monitoring) "jCp" = ( @@ -13894,11 +13535,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "jGG" = ( @@ -13980,8 +13617,7 @@ /area/tether/surfacebase/outside/outside2) "jKw" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/paper_bin, @@ -14025,12 +13661,8 @@ /area/maintenance/lower/south) "jNa" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/station_map{ - pixel_y = 32 + dir = 9 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "jNW" = ( @@ -14089,13 +13721,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "jPo" = ( -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/atmos) "jQx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -14107,18 +13737,16 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/polarized/full{ - id = "surfresleeving" - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfresleeving"; + name = "Resleeving" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/resleeving) "jQW" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppersouthstairwell) "jRi" = ( @@ -14142,7 +13770,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "jRP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/asmaint2) "jSr" = ( /turf/simulated/open, @@ -14173,8 +13801,8 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "jUj" = ( -/turf/simulated/wall/r_wall, -/area/engineering/lower/breakroom) +/turf/simulated/wall/prepainted/science, +/area/maintenance/asmaint2) "jUu" = ( /obj/structure/table/standard, /obj/item/paper_bin, @@ -14192,7 +13820,7 @@ /area/maintenance/lower/bar) "jUU" = ( /obj/structure/closet/hydrant, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/fish_farm) "jUY" = ( /obj/structure/table/bench/wooden, @@ -14322,7 +13950,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "jXk" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/patient_c) "jYd" = ( /obj/structure/cable/green{ @@ -14456,8 +14084,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/super/critical{ - dir = 1; +/obj/machinery/power/apc/super/critical/north_mount{ name = "north bump"; pixel_y = 24 }, @@ -14611,9 +14238,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, +/obj/structure/cable/pink{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "kkT" = ( @@ -14629,9 +14259,7 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "klB" = ( @@ -14684,18 +14312,8 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "knU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/armory) -"koC" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "kph" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -14703,11 +14321,8 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "kpA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, -/obj/structure/cable/green{ +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/pink{ icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -14741,7 +14356,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "krG" = ( -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/tether/surfacebase/public_garden_two) @@ -14797,25 +14412,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) -"ktp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "kts" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14931,15 +14527,8 @@ /turf/simulated/floor/tiled, /area/janitor) "kxn" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "kxY" = ( @@ -14975,6 +14564,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"kyJ" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "kyL" = ( /obj/random/junk, /turf/simulated/floor, @@ -14993,7 +14588,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "kAG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/tcommsat/entrance) "kAV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -15046,10 +14641,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "kEk" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/rnd/breakroom) "kEq" = ( @@ -15212,8 +14804,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/structure/disposalpipe/segment{ @@ -15255,8 +14846,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "kLE" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/cmo) +/turf/simulated/wall/prepainted/security, +/area/maintenance/lower/public_garden_maintenance/upper) "kMx" = ( /obj/structure/catwalk, /obj/effect/floor_decal/techfloor/orange{ @@ -15306,10 +14897,7 @@ /area/tether/surfacebase/surface_two_hall) "kNW" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -15366,22 +14954,11 @@ name = "Pen 8 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kQk" = ( @@ -15431,12 +15008,17 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/tcommsat/chamber) -"kTy" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 +"kTv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"kTy" = ( +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -15479,20 +15061,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) -"kUM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "kVf" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, @@ -15506,11 +15074,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) "kVQ" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "kVS" = ( @@ -15624,9 +15188,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "lab" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor/plating, /area/tether/surfacebase/security/middlehall) "laj" = ( @@ -15765,26 +15328,25 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"lej" = ( +"ldD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/tether/surfacebase/security/interrogation) -"lez" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/door/firedoor/glass{ dir = 8 }, -/obj/machinery/camera/network/tether{ - dir = 5 - }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"lej" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/security/interrogation) "lfa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15893,10 +15455,7 @@ /obj/item/stock_parts/subspace/analyzer, /obj/item/stock_parts/subspace/analyzer, /obj/item/stock_parts/subspace/analyzer, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer) "lkK" = ( @@ -15919,11 +15478,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) "lmg" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "wardenwindows" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "wardenwindows"; + name = "Wardens Office" }, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "lnG" = ( @@ -15940,15 +15499,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) -"loz" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +"lot" = ( +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) +/obj/structure/window/basic{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +"loz" = ( +/turf/simulated/wall/r_wall/prepainted/medical, +/area/tether/surfacebase/medical/uppersouthstairwell) "lpV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16044,9 +15609,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ltL" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "luJ" = ( /obj/structure/closet/hydrant{ @@ -16227,10 +15790,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) "lyT" = ( @@ -16246,11 +15806,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "lzn" = ( @@ -16326,8 +15882,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "lBK" = ( -/turf/simulated/wall/r_wall, -/area/rnd/lockers) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/evastorage) "lCt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -16364,7 +15920,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "lFn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/patient_b) "lFq" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -16383,15 +15939,14 @@ /area/tether/surfacebase/medical/resleeving) "lFO" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "lFQ" = ( @@ -16410,14 +15965,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"lGn" = ( -/obj/machinery/button/windowtint{ - dir = 1; - id = "meetingroom"; - pixel_x = -25 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "lGJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1; @@ -16427,10 +15974,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; + on = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0; - on = 1 + pump_direction = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=100;TEMP=80"; @@ -16478,7 +16025,7 @@ dir = 4; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_two) "lJr" = ( /obj/structure/railing{ @@ -16571,7 +16118,7 @@ /area/engineering/atmos/monitoring) "lLN" = ( /obj/structure/sign/securearea, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/tcommsat/entrance) "lMm" = ( /obj/structure/table/woodentable, @@ -16918,11 +16465,7 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "lZP" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -16979,18 +16522,14 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "mbV" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) "mcX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/east_stairs_two) "mdr" = ( /obj/structure/table/steel, @@ -17022,6 +16561,9 @@ /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos) +"mek" = ( +/turf/simulated/open, +/area/tether/elevator/two) "meI" = ( /obj/machinery/air_alarm{ dir = 4; @@ -17094,8 +16636,7 @@ /area/chapel/main) "mgB" = ( /obj/machinery/photocopier, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -17166,7 +16707,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "janitor_blast"; - layer = 3.3; name = "Janitorial Shutters" }, /obj/machinery/door/firedoor/border_only, @@ -17185,18 +16725,8 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "mhZ" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/outside/outside2) "miX" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/camera/network/medbay{ @@ -17223,6 +16753,9 @@ /obj/effect/floor_decal/corner/red/border/shifted{ dir = 6 }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "mkT" = ( @@ -17246,7 +16779,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "mlv" = ( @@ -17262,10 +16795,7 @@ /area/tether/surfacebase/medical/centralhall) "mmt" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17292,12 +16822,11 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) "mqc" = ( @@ -17310,6 +16839,11 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, +/obj/machinery/button/windowtint{ + dir = 1; + id = "meetingroom"; + pixel_x = -25 + }, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "mqq" = ( @@ -17499,17 +17033,8 @@ name = "Pen 5 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "mwG" = ( @@ -17583,7 +17108,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "mzj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/outfitting) "mzD" = ( /obj/structure/cable/green{ @@ -17629,11 +17154,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -17655,22 +17176,19 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "mCn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/obj/machinery/light/small, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 10 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "mCJ" = ( @@ -17682,10 +17200,7 @@ dir = 1 }, /obj/structure/closet/secure_closet/atmos_personal, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -17720,6 +17235,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) +"mEa" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 5 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "mEu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -17754,8 +17287,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "mGd" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/reinforced, @@ -17824,7 +17356,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mJS" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/rdoffice) "mJW" = ( /obj/effect/floor_decal/borderfloor{ @@ -17843,19 +17375,6 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mKH" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -17866,6 +17385,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "mKS" = ( @@ -17908,7 +17429,7 @@ /obj/structure/sign/warning/caution{ name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "mMr" = ( /obj/structure/disposalpipe/junction{ @@ -18012,15 +17533,6 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) -"mQF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "mQK" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -18040,11 +17552,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"mQU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) "mRb" = ( /obj/structure/catwalk, /obj/effect/floor_decal/techfloor, @@ -18203,8 +17710,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -18322,10 +17828,7 @@ /obj/effect/floor_decal/corner/pink/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "nbL" = ( @@ -18381,7 +17884,7 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "ndx" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/reading_room) "ndZ" = ( /obj/structure/cable/cyan{ @@ -18427,14 +17930,13 @@ /obj/machinery/computer/drone_control{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) "neA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/research) "neB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18445,11 +17947,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"neH" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/maintenance/lower/south) "neM" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled, @@ -18510,11 +18007,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "ngy" = ( @@ -18720,22 +18213,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "nns" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_c" - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_c"; + name = "Patient C" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_c) "nnL" = ( @@ -18782,10 +18264,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) @@ -18890,6 +18369,25 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"nrN" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "nrR" = ( /obj/structure/railing{ dir = 1 @@ -18992,7 +18490,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/south) "nuH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/detective/officeb) "nuR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -19149,10 +18647,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) @@ -19190,10 +18684,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -19256,9 +18747,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "nGx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/breakroom) "nHa" = ( @@ -19491,11 +18981,7 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "nOL" = ( /obj/machinery/processor, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "nOX" = ( @@ -19520,11 +19006,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "nPL" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -19567,19 +19049,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "nRK" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -19590,6 +19059,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "nSI" = ( @@ -19638,12 +19109,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "nUB" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/pink, /turf/simulated/floor/wood, /area/bridge/meeting_room) "nVv" = ( @@ -19754,7 +19221,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "nYk" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research) "nYw" = ( /turf/simulated/floor/tiled/dark, @@ -19857,7 +19324,7 @@ /turf/simulated/floor/tiled, /area/janitor) "ocy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/detective/officea) "ocX" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20005,33 +19472,11 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/manifold/hidden/black, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcommsat/chamber) -"ogt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/lobby) "ogv" = ( /obj/machinery/light{ dir = 8 @@ -20084,11 +19529,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "oig" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20164,7 +19605,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "okP" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/outfitting) "okZ" = ( /turf/simulated/floor/tiled, @@ -20176,10 +19617,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/machinery/camera/network/command, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "omd" = ( @@ -20247,12 +19688,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"opc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/engineering/lower/breakroom) "ope" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20276,6 +19711,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) +"opu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "opH" = ( /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment{ @@ -20322,9 +19767,9 @@ external_pressure_bound = 140; external_pressure_bound_default = 140; icon_state = "map_vent_out"; + on = 1; pressure_checks = 0; - pressure_checks_default = 0; - on = 1 + pressure_checks_default = 0 }, /turf/simulated/floor/bluegrid{ initial_gas_mix = "n2=100;TEMP=80"; @@ -20400,21 +19845,12 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ovx" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/yellow/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "owe" = ( @@ -20547,11 +19983,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "oAx" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20569,10 +20001,7 @@ /obj/machinery/light_switch{ pixel_y = 25 }, -/obj/machinery/firealarm{ - pixel_x = 5; - pixel_y = 37 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/button/remote/blast_door{ id = "armoryaccess"; name = "Armory Access"; @@ -20649,7 +20078,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "oEY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/examroom) "oFb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20669,7 +20098,7 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_two) "oFR" = ( /obj/effect/floor_decal/borderfloor{ @@ -20853,7 +20282,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "oPf" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/public_garden_maintenance/upper) "oPN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20974,9 +20403,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "oTC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/structure/cable/green, @@ -20987,18 +20414,11 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) -"oUl" = ( -/obj/structure/symbol/da{ - pixel_x = 32 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "oUu" = ( /obj/item/material/twohanded/baseballbat{ desc = "This bat looks very off."; - integrity_max = 500; - integrity = 500 + integrity = 500; + integrity_max = 500 }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -21054,6 +20474,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) +"oVn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "oVD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -21078,19 +20507,8 @@ /turf/simulated/open, /area/engineering/atmos) "oXE" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "oXK" = ( @@ -21166,14 +20584,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) -"pas" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "paL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 5 @@ -21366,7 +20776,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "pjh" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/drone_fabrication) "pjC" = ( /obj/structure/reagent_dispensers/watertank/high, @@ -21407,6 +20817,10 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "pkL" = ( @@ -21414,7 +20828,7 @@ /area/tether/surfacebase/fish_farm) "plI" = ( /obj/structure/symbol/sa, -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/bar) @@ -21523,16 +20937,8 @@ name = "Pen 6 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "ppL" = ( @@ -21546,12 +20952,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "pqr" = ( @@ -21580,15 +20986,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "pqX" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "exam_room" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "exam_room" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "exam_room"; + name = "Exam Room Medical" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/examroom) "prH" = ( @@ -21602,7 +21004,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "psw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/readingrooms) "ptd" = ( /obj/structure/bed/chair/office/light{ @@ -21696,7 +21098,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "pwF" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/server) "pwO" = ( /obj/structure/disposalpipe/segment{ @@ -21716,7 +21118,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "pxA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/recoveryward) "pyd" = ( /obj/machinery/light/small{ @@ -21786,10 +21188,7 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "pAd" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/power/thermoregulator, @@ -21822,19 +21221,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "pBx" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -21842,6 +21228,8 @@ name = "Pen 2 Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "pBO" = ( @@ -21874,21 +21262,20 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "pBY" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/structure/cable, /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Command"; output_attempt = 0 }, +/obj/structure/cable/pink{ + icon_state = "0-2" + }, /turf/simulated/floor/plating, /area/maintenance/substation/command) "pCi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/cable/green, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/sun, /turf/simulated/floor/plating, /area/tcomsat) "pCm" = ( @@ -21920,30 +21307,16 @@ name = "Pen 6 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "pEd" = ( /obj/structure/table/rack, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "pEs" = ( @@ -22101,6 +21474,7 @@ /area/engineering/lower/lobby) "pLd" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "pLq" = ( @@ -22178,10 +21552,7 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/janitor) "pOC" = ( @@ -22210,7 +21581,7 @@ /turf/simulated/floor/wood, /area/engineering/lower/breakroom) "pPv" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/brig/bathroom) "pPL" = ( /obj/machinery/camera/network/medbay{ @@ -22229,10 +21600,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "pQm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/palebottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) "pQr" = ( @@ -22343,8 +21712,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -22387,10 +21755,7 @@ /turf/simulated/floor/plating, /area/engineering/atmos/storage) "pWN" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/disposalpipe/segment{ dir = 4 @@ -22464,7 +21829,7 @@ /area/tcommsat/chamber) "pYv" = ( /obj/structure/sign/warning/lethal_turrets, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/tcommsat/chamber) "pYL" = ( /obj/effect/floor_decal/borderfloor{ @@ -22473,11 +21838,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -22511,6 +21872,12 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) +"qaz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "qaI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22518,6 +21885,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "qaV" = ( @@ -22543,15 +21911,12 @@ /obj/machinery/camera/network/tether{ dir = 9 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "qbU" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/outfitting) "qbX" = ( @@ -22583,9 +21948,6 @@ name = "CMO Office"; sortType = "CMO Office" }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "qcd" = ( @@ -22646,11 +22008,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "qeX" = ( @@ -22709,10 +22067,7 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -22730,16 +22085,8 @@ name = "Pen 8 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "qiO" = ( @@ -22817,8 +22164,7 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -22848,8 +22194,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "qpo" = ( -/turf/simulated/wall, -/area/maintenance/engineering/pumpstation) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/outside/outside2) "qpB" = ( /obj/structure/bed/padded, /obj/item/bedsheet/medical, @@ -22913,20 +22259,16 @@ dir = 8; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, @@ -23157,6 +22499,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"qwy" = ( +/obj/item/storage/fancy/cigar/havana, +/obj/random/drinkbottle, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "qwX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23355,22 +22702,15 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "qHB" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/pink, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "qIe" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/southhall) "qIF" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -23511,19 +22851,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "qNK" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced/full, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/structure/cable/green, @@ -23531,6 +22858,8 @@ icon_state = "16-0" }, /obj/structure/disposalpipe/up, +/obj/spawner/window/low_wall/borosillicate/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "qNV" = ( @@ -23575,7 +22904,7 @@ /area/tether/surfacebase/security/outfitting) "qOL" = ( /obj/structure/sign/warning/caution, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "qPC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23590,17 +22919,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) -"qPM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "qPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23686,7 +23004,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) "qUc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/resleeving) "qUy" = ( /obj/structure/catwalk, @@ -23761,7 +23079,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell) "qYP" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomsat) "qYR" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23847,9 +23165,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "rcx" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "rdr" = ( @@ -23899,8 +23216,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "reD" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/substation/medsec) +/obj/machinery/door/airlock, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) "reP" = ( /obj/item/clothing/shoes/boots/jackboots{ desc = "Very old and worn baseball cleats."; @@ -23923,11 +23241,8 @@ /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/cyan{ icon_state = "0-4" @@ -24064,9 +23379,8 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "rja" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/breakroom) "rke" = ( @@ -24075,7 +23389,6 @@ dir = 8 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/structure/bed/chair{ @@ -24101,9 +23414,7 @@ /obj/structure/window/basic{ dir = 4 }, -/obj/machinery/door/firedoor/glass{ - dir = 8 - }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "rkP" = ( @@ -24151,14 +23462,6 @@ "rlx" = ( /turf/simulated/mineral, /area/maintenance/readingrooms) -"rmq" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/obj/random/maintenance/research, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "rmF" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/white, @@ -24310,7 +23613,6 @@ }, /area/tcommsat/chamber) "rqQ" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/airlock/multi_tile/glass{ name = "Medbay Breakroom"; req_access = list(5); @@ -24322,6 +23624,7 @@ name = "Exit Button"; pixel_x = -24 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rrk" = ( @@ -24447,7 +23750,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "rwY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/lobby) "rxe" = ( /obj/structure/grille, @@ -24478,13 +23781,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - id = "atmoslockdown"; - name = "Atmospherics Lockdown"; - req_one_access = list(10,24) - }, /turf/simulated/floor/carpet, /area/engineering/lower/breakroom) +"rxJ" = ( +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled, +/area/engineering/lower/lobby) "rxK" = ( /obj/structure/table/woodentable, /obj/item/paper_bin, @@ -24572,6 +23874,12 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) +"rDm" = ( +/obj/structure/sign/warning/caution{ + name = "\improper CAUTION - DANGEROUS EQUIPMENT AND DROPS" + }, +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/emergency_storage/atmos) "rDp" = ( /obj/landmark/spawnpoint/job/command_secretary, /obj/structure/bed/chair/comfy/black{ @@ -24674,7 +23982,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) "rFL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomfoyer) "rGc" = ( /turf/simulated/mineral/floor/cave, @@ -24746,15 +24054,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "rIT" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "rJu" = ( @@ -24768,11 +24076,7 @@ /turf/simulated/floor, /area/maintenance/substation/medsec) "rJy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -24802,6 +24106,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "rLi" = ( @@ -24960,7 +24267,7 @@ }, /area/server) "rUU" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-4" }, /turf/simulated/floor/plating, @@ -24986,10 +24293,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/centralhall) "rWs" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/tcomsat) @@ -25015,18 +24319,14 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/high{ - dir = 8; +/obj/machinery/power/apc/high/west_mount{ pixel_x = -28 }, /turf/simulated/floor/tiled/techfloor, /area/server) "rWT" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/cable/green{ +/obj/machinery/fire_alarm/north_mount, +/obj/structure/cable/pink{ icon_state = "2-8" }, /turf/simulated/floor/plating, @@ -25055,7 +24355,7 @@ /turf/simulated/floor/plating, /area/maintenance/commandmaint) "rYi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/centralhall) "rZb" = ( /turf/simulated/floor/tiled/white, @@ -25243,15 +24543,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "sfF" = ( -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -25259,7 +24550,8 @@ name = "Pen 9 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "sfQ" = ( @@ -25304,10 +24596,10 @@ /area/tether/surfacebase/surface_two_hall) "shF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "shL" = ( @@ -25368,7 +24660,9 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/main) "sjZ" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "sku" = ( @@ -25469,24 +24763,16 @@ name = "Pen 7 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) +"smB" = ( +/turf/simulated/open, +/area/tether/elevator) "snb" = ( /obj/machinery/light/small{ dir = 8 @@ -25515,7 +24801,7 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "snw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/south) "snF" = ( /obj/structure/table/steel, @@ -25532,10 +24818,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 }, @@ -25566,7 +24849,7 @@ /area/maintenance/lower/bar) "soV" = ( /obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering, /area/tcomsat) "spN" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -25585,8 +24868,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet, @@ -25695,7 +24977,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "srW" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos/monitoring) "sso" = ( /obj/structure/window/reinforced{ @@ -25738,11 +25020,11 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "std" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering, /area/maintenance/substation/tcomms) "stt" = ( -/turf/simulated/wall/r_wall, -/area/engineering/lower/atmos_eva) +/turf/simulated/wall/prepainted/medical, +/area/maintenance/lower/north) "sul" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -25750,6 +25032,7 @@ /obj/structure/closet/hydrant{ pixel_x = -32 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "sum" = ( @@ -25820,11 +25103,7 @@ /area/engineering/atmos) "svv" = ( /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -25959,11 +25238,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "sAb" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -26019,12 +25294,12 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "sBb" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "sBo" = ( @@ -26067,13 +25342,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"sCV" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "sDd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26099,9 +25367,6 @@ "sDf" = ( /obj/machinery/disposal, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -26233,17 +25498,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/pink{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"sIk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sIp" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -26271,7 +25530,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "sJN" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/bridge/bridge_hallway) "sJU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26447,19 +25706,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"sQW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sRh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -26481,14 +25727,16 @@ /area/tether/surfacebase/reading_room) "sRz" = ( /obj/structure/symbol/gu, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "sRE" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/maintenance/lower/south) +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "cmo_office"; + name = "CMO office" + }, +/obj/effect/paint_stripe/babyblue, +/turf/simulated/floor/plating, +/area/tether/surfacebase/medical/cmo) "sRN" = ( /obj/structure/table/steel, /obj/effect/floor_decal/rust, @@ -26551,8 +25799,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc/super{ - dir = 1; +/obj/machinery/power/apc/super/north_mount{ pixel_y = 24 }, /obj/machinery/button/remote/airlock{ @@ -26575,10 +25822,7 @@ /area/tether/surfacebase/public_garden_two) "sVB" = ( /obj/structure/catwalk, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/maintenance/lower/south) "sVL" = ( @@ -26588,18 +25832,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_two) -"sVU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "sWl" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -26774,7 +26006,7 @@ /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tfp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/janitor) "tfu" = ( /obj/effect/floor_decal/rust, @@ -26788,19 +26020,8 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/wood, /area/rnd/breakroom) -"tgb" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "tgr" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26913,7 +26134,7 @@ "tjk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, /turf/simulated/floor/tiled/dark, @@ -26952,7 +26173,7 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "tkd" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/warden) "tkq" = ( /obj/effect/floor_decal/borderfloor{ @@ -26974,11 +26195,11 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/breakroom) "tlq" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "ward_tint" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "ward_tint"; + name = "medical Ward" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/recoveryward) "tlP" = ( @@ -27116,6 +26337,7 @@ /obj/machinery/newscaster{ pixel_y = -30 }, +/obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tse" = ( @@ -27210,18 +26432,29 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"twl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "twA" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/command{ name = "Command Meeting Room" }, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "tyK" = ( @@ -27231,15 +26464,6 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) "tzy" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "cmo_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "cmo_office" - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -27251,6 +26475,11 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "cmo_office"; + name = "CMO office" + }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/cmo) "tzY" = ( @@ -27289,22 +26518,11 @@ name = "Pen 4 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tBD" = ( @@ -27332,8 +26550,7 @@ /area/maintenance/lower/south) "tCY" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/paper_bin, @@ -27400,7 +26617,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tIz" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/lower/rnd) "tIN" = ( /obj/structure/closet/emcloset, @@ -27425,9 +26642,6 @@ /turf/simulated/mineral, /area/tether/surfacebase/east_stairs_two) "tLN" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -27436,6 +26650,8 @@ name = "Atmospherics Lockdown"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/lobby) "tLQ" = ( @@ -27480,7 +26696,7 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "tMY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/morgue) "tNd" = ( /obj/structure/closet/secure_closet/scientist, @@ -27510,8 +26726,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -27554,10 +26769,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "4-8" }, @@ -27589,22 +26801,11 @@ name = "Pen 3 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "tTr" = ( @@ -27680,8 +26881,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -27713,10 +26913,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -27762,7 +26959,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "ubC" = ( -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "1-8" }, /turf/simulated/floor/plating, @@ -27785,11 +26982,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "udd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "udj" = ( @@ -27798,7 +26992,6 @@ department = "CMO's Office" }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/status_display{ @@ -27861,6 +27054,15 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"ufj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "ufA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -28024,7 +27226,7 @@ /area/tcomfoyer) "umc" = ( /obj/structure/sign/poster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "umZ" = ( /obj/structure/table/steel, @@ -28080,12 +27282,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "upb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/bar) "upu" = ( @@ -28099,8 +27296,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/structure/cable/pink{ + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -28142,11 +27339,7 @@ /area/maintenance/lower/south) "utS" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -28319,8 +27512,7 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -28355,12 +27547,7 @@ /turf/simulated/shuttle/floor/voidcraft, /area/tether/surfacebase/old_shelter) "uBL" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "uBU" = ( @@ -28377,16 +27564,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-4" }, +/obj/structure/cable/pink{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "uCx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/security, /area/tether/surfacebase/security/outfitting/storage) "uCy" = ( /obj/structure/cable/green{ @@ -28443,8 +27630,7 @@ /area/maintenance/asmaint2) "uDh" = ( /obj/structure/table/rack/shelf/steel, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24; pixel_y = -8 }, @@ -28552,7 +27738,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "uEI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/uppersouthstairwell) "uER" = ( /obj/structure/table/steel, @@ -28696,7 +27882,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "uHS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/breakroom) "uHT" = ( /obj/structure/grille, @@ -28720,15 +27906,8 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) -"uIP" = ( -/obj/machinery/door/airlock/glass{ - name = "Atmospherics" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/lower/lobby) "uJg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/tether/surfacebase/east_stairs_two) "uJH" = ( /obj/structure/bed/chair/comfy/black{ @@ -28766,11 +27945,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -28860,6 +28036,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) +"uQj" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "uQs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -28901,10 +28084,7 @@ /obj/item/storage/briefcase/inflatable{ pixel_x = -3 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "uQP" = ( @@ -29011,16 +28191,16 @@ /area/tether/surfacebase/medical/patient_b) "uUl" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "16-0" - }, /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ + icon_state = "16-0" + }, +/obj/structure/cable/pink{ icon_state = "0-4" }, /turf/simulated/floor/plating, @@ -29036,11 +28216,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "uWx" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -29059,8 +28235,8 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "uZc" = ( -/turf/simulated/wall, -/area/vacant/vacant_bar_upper) +/turf/simulated/wall/r_wall/prepainted, +/area/tether/surfacebase/north_stairs_two) "uZm" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -29121,7 +28297,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "vaI" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/staircase/secondfloor) "vaU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29232,17 +28408,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) -"vek" = ( -/obj/machinery/disposal, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_slimepens) "veJ" = ( /obj/structure/table/standard, /obj/item/tape_recorder{ @@ -29328,8 +28493,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -29376,6 +28540,13 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/tether/surfacebase/fish_farm) +"viH" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/open, +/area/tether/surfacebase/surface_two_hall) "vjG" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/borderfloorwhite{ @@ -29421,6 +28592,12 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) +"vkz" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "vkN" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/armor/vest/alt{ @@ -29441,13 +28618,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) -"vlA" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/tether/surfacebase/surface_two_hall) "vml" = ( /obj/machinery/vending/medical{ dir = 8 @@ -29545,9 +28715,6 @@ /area/tether/surfacebase/surface_two_hall) "vpr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -29666,13 +28833,8 @@ }, /area/tether/surfacebase/surface_two_hall) "vsy" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "exam_room" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/examroom) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/outside/outside2) "vsI" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -29811,7 +28973,7 @@ /turf/simulated/floor/plating, /area/maintenance/readingrooms) "vyI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/patient_a) "vyO" = ( /obj/landmark{ @@ -29864,11 +29026,7 @@ pixel_y = -2 }, /obj/item/storage/box/evidence, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -29934,6 +29092,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"vCH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "vCS" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -29960,7 +29131,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vDa" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/atmos_lockers) "vDf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -30004,10 +29175,7 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/fish_farm) "vFc" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30023,8 +29191,8 @@ /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "vGf" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/substation/tcomms) +/turf/simulated/wall/r_wall/prepainted/science, +/area/tether/surfacebase/outside/outside2) "vGF" = ( /obj/machinery/telecomms/server/presets/service/tether, /turf/simulated/floor/tiled/dark{ @@ -30044,7 +29212,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "vHS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/lower/breakroom) "vHY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -30160,7 +29328,7 @@ /turf/simulated/floor/tiled/dark, /area/teleporter) "vMH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/atmos) "vML" = ( /obj/effect/floor_decal/borderfloorblack/full, @@ -30176,7 +29344,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "2-8" }, /turf/simulated/floor/wood, @@ -30243,7 +29411,7 @@ name = "light switch "; pixel_y = 26 }, -/obj/structure/cable/green{ +/obj/structure/cable/pink{ icon_state = "4-8" }, /turf/simulated/floor/wood, @@ -30263,7 +29431,7 @@ /turf/simulated/floor, /area/maintenance/substation/research) "vQI" = ( -/turf/simulated/wall{ +/turf/simulated/wall/prepainted{ can_open = 1 }, /area/maintenance/lower/south) @@ -30309,17 +29477,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-8" }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) "vUO" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_two) "vVG" = ( /obj/effect/floor_decal/techfloor{ @@ -30490,14 +29655,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "waY" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/tether/surfacebase/emergency_storage/atmos) "wbn" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_a" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_a"; + name = "Patient A" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_a) "wbx" = ( @@ -30594,6 +29759,10 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"wdy" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "wdF" = ( /obj/structure/cable{ icon_state = "2-4" @@ -30686,11 +29855,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wgc" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "wgA" = ( @@ -30739,6 +29904,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"wje" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/yellow/bordercorner2, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "wjg" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -30989,10 +30165,10 @@ /area/maintenance/lower/south) "wtT" = ( /obj/structure/table/woodentable, -/obj/item/storage/box/cups, /obj/machinery/camera/network/command{ dir = 9 }, +/obj/item/storage/box/glasses, /turf/simulated/floor/wood, /area/bridge/meeting_room) "wuk" = ( @@ -31003,6 +30179,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"wut" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/machinery/door/airlock/glass/atmos, +/turf/simulated/floor/tiled, +/area/engineering/lower/breakroom) "wuu" = ( /obj/structure/ladder{ pixel_y = 16 @@ -31010,16 +30196,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) -"wuI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass{ - name = "Atmospherics" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/lower/lobby) "wvd" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -31126,28 +30302,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "wym" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/centralhall) +/turf/simulated/wall/r_wall/prepainted/command, +/area/bridge/bridge_hallway) "wyW" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -31258,16 +30414,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/pink{ + icon_state = "0-4" }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/structure/cable/pink{ + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -31298,7 +30450,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/maintenance/substation/research) "wEh" = ( /obj/effect/floor_decal/techfloor{ @@ -31365,8 +30517,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "wFw" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31374,13 +30526,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "wFz" = ( @@ -31430,7 +30575,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "wHi" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/rnd/breakroom) "wHw" = ( /obj/machinery/turretid/stun{ @@ -31443,10 +30588,7 @@ req_access = list(61); req_one_access = list(12) }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "wHK" = ( @@ -31550,16 +30692,8 @@ name = "Pen 4 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "wLH" = ( @@ -31592,15 +30726,15 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "wMU" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/pink{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "wOd" = ( @@ -31647,12 +30781,6 @@ /obj/structure/window/reinforced/polarized/full{ id = "interrogation" }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/interrogation) "wRy" = ( @@ -31681,8 +30809,10 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "wSs" = ( -/obj/effect/floor_decal/borderfloor, -/obj/structure/closet/firecloset, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "wSE" = ( @@ -31790,6 +30920,9 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) +"wVr" = ( +/turf/simulated/wall/prepainted/engineering/atmos, +/area/tether/surfacebase/surface_two_hall) "wWc" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -31843,6 +30976,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"wXK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "wXZ" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -31926,7 +31065,7 @@ /turf/simulated/floor/grass, /area/maintenance/lower/south) "xbU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_two_hall) "xcj" = ( /obj/machinery/camera/network/engineering{ @@ -31965,19 +31104,6 @@ }, /turf/simulated/floor/lino, /area/tether/surfacebase/security/detective/officea) -"xdM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/yellow/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) "xdX" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -32001,7 +31127,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) "xez" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/commandmaint) "xeM" = ( /obj/effect/floor_decal/techfloor{ @@ -32088,6 +31214,15 @@ }, /turf/simulated/open, /area/tether/surfacebase/security/middlehall) +"xiw" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "xjC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/trash, @@ -32171,16 +31306,8 @@ name = "Pen 7 Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) "xlT" = ( @@ -32228,10 +31355,7 @@ }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/blue/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/rack/shelf/steel, /obj/item/hardsuit/hazard/equipped, @@ -32280,11 +31404,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "xoE" = ( @@ -32330,24 +31450,26 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_two) "xpQ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/structure/window/reinforced/polarized/full{ - id = "wardenwindows" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "wardenwindows"; + name = "Wardens Office" }, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "xqf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -32441,18 +31563,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "xtk" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/rdoffice) "xtn" = ( @@ -32508,13 +31620,12 @@ req_access = list(); req_one_access = list(17) }, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, +/obj/structure/cable/pink{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/teleporter) "xuV" = ( @@ -32570,14 +31681,8 @@ /turf/simulated/floor, /area/maintenance/lower/north) "xxZ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/turf/simulated/wall/r_wall/prepainted/security, +/area/tether/surfacebase/medical/resleeving) "xyn" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -32618,11 +31723,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenance/upper) "xyY" = ( @@ -32706,11 +31807,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "xDv" = ( @@ -32752,7 +31849,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "xGk" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/engineering/atmos, /area/engineering/atmos) "xGX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32783,11 +31880,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) "xIu" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "surfresleeving" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfresleeving"; + name = "Resleeving" }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/resleeving) "xIB" = ( @@ -32808,8 +31905,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -33031,11 +32127,7 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -33133,10 +32225,7 @@ "xTG" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -33163,7 +32252,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "xUE" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/north) "xUL" = ( /obj/structure/table/rack/shelf/steel, @@ -33263,11 +32352,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -33278,12 +32363,6 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "xYa" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -33294,6 +32373,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/darkred, /turf/simulated/floor, /area/tether/surfacebase/security/detective) "xYr" = ( @@ -33327,7 +32408,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "xZX" = ( -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/firelocks/nogrille, /turf/simulated/floor, /area/maintenance/lower/south) "yam" = ( @@ -33339,9 +32420,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "yas" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "yat" = ( @@ -33398,9 +32477,8 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "ydd" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/atmos_lockers) "ydu" = ( @@ -33517,11 +32595,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "yge" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "patient_room_b" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "patient_room_b"; + name = "Patient B" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/patient_b) "ygw" = ( @@ -33541,7 +32619,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "yhd" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/maintenance/substation/medsec) "yhw" = ( /obj/effect/floor_decal/borderfloor{ @@ -33560,24 +32638,20 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "yif" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/evidence) "yiw" = ( /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/wood, /area/engineering/lower/breakroom) "yiY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_two) "yjH" = ( /obj/structure/table/glass, @@ -33605,16 +32679,15 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "yjT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/tcommsat/chamber) "ykk" = ( /obj/structure/morgue, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "ykZ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/pipecyan, /turf/simulated/floor/plating, /area/engineering/lower/lobby) "yli" = ( @@ -47834,13 +46907,13 @@ wFz wFz wFz wFz -uNr +fKG avw avw gyr gyr avw -uNr +fKG wFz wFz wFz @@ -48028,13 +47101,13 @@ wFz wFz wFz wFz -uNr +fKG xWR hxY bwy bwy pdw -uNr +fKG wFz wFz wFz @@ -48222,13 +47295,13 @@ wFz wFz wFz wFz -uNr +fKG xWR xWR oXK oXK avw -uNr +fKG wFz wFz wFz @@ -48416,13 +47489,13 @@ wFz wFz wFz wFz -uNr +fKG xWR hxY xWR gca -uNr -uNr +qpo +fKG wFz wFz wFz @@ -48610,13 +47683,13 @@ wFz wFz wFz wFz -uNr -uNr -uNr -uNr -uNr -uNr -uNr +fKG +fKG +fKG +fKG +fKG +fKG +fKG wFz wFz wFz @@ -50801,7 +49874,7 @@ wFz wFz wFz wFz -uNr +fKG qvD nGh avw @@ -51019,7 +50092,7 @@ fHA ddf kxn iBM -vek +fHA bFc kxn oXE @@ -51194,9 +50267,9 @@ bwy bwy uiA avw -iQf -iQf -iQf +vGf +vGf +vGf avw xNR bwy @@ -51381,16 +50454,16 @@ jRP wFz wFz wFz -uNr +fKG cfE cfE cfE cfE qvD avw -iQf -iQf -iQf +vGf +vGf +vGf avw avw avw @@ -51582,9 +50655,9 @@ bwy bwy uiA avw -iQf -iQf -iQf +vGf +vGf +vGf avw mhI bwy @@ -51789,15 +50862,15 @@ vtw sdH sDf sEy -epZ +kxn ksU sDf bar -epZ +kxn nMO sDf vOw -epZ +kxn oXE euM rkD @@ -51963,7 +51036,7 @@ jRP wFz wFz wFz -uNr +fKG cfE cfE qvD @@ -52493,9 +51566,9 @@ rxh tMA fat afn -oPf -oPf -oPf +kLE +kLE +kLE kcZ oPf xcr @@ -52518,7 +51591,7 @@ xcr eUG caQ caQ -jsJ +eCd eUG eUG pwF @@ -52711,10 +51784,10 @@ cZd xcr eUG itj -edb -edb -edb -edb +mJS +mJS +mJS +mJS pwF dQO jxG @@ -52905,7 +51978,7 @@ pkL xcr eUG caQ -edb +mJS pNd tNW dkP @@ -53099,7 +52172,7 @@ viD kiI xSX caQ -edb +mJS fwL hHy tHa @@ -53293,7 +52366,7 @@ pkL xcr eUG caQ -edb +mJS mJS xtk bSx @@ -53306,9 +52379,9 @@ mJS fAy pwF pwF -jRP -jRP -jRP +jUj +jUj +jUj iQR kSm jRP @@ -53890,7 +52963,7 @@ hOW uCC qMR qMR -vaI +ewZ kFU cMm iJR @@ -54084,7 +53157,7 @@ wDC uGw mhj mhj -vaI +ewZ kFU okL gII @@ -54278,7 +53351,7 @@ hOW mhj mhj mhj -vaI +ewZ dHL oHR gII @@ -54455,8 +53528,8 @@ xdu pkL pkL xcr -jsJ -jsJ +eCd +eCd aqZ mJS mJS @@ -54472,7 +53545,7 @@ wfK cha mhj mhj -vaI +ewZ kFU dcF gII @@ -54649,8 +53722,8 @@ xdu pkL rGe xcr -jsJ -jsJ +eCd +eCd vdC xDK xSX @@ -54843,8 +53916,8 @@ xdu pkL pkL xcr -jsJ -jsJ +eCd +eCd xSX xSX xSX @@ -55037,7 +54110,7 @@ pkL pkL xcr xcr -jsJ +eCd dHP xSX xSX @@ -55206,13 +54279,13 @@ ptn tkd tkd tkd -xpQ +tkd iTw xpQ tkd sGV adY -xUE +cWY sYE sYE sYE @@ -55231,7 +54304,7 @@ pkL pkL xcr eUG -jsJ +eCd qJh kYf xSX @@ -55425,8 +54498,8 @@ uWH pkL xcr eUG -jsJ -jsJ +eCd +eCd ixU rMo rMo @@ -55582,13 +54655,13 @@ yif yif yif yif +mzj +mzj +mzj +mzj okP okP -okP -okP -okP -okP -okP +mzj mzD buj keN @@ -55619,8 +54692,8 @@ lwb xcr xcr eUG -jsJ -jsJ +eCd +eCd fEl xSX tIz @@ -55628,7 +54701,7 @@ jdi adx jdi vCa -lBK +hFn tjy oRe bbC @@ -55782,7 +54855,7 @@ nss etd cYW pqS -okP +mzj lpW pLC tkd @@ -55811,10 +54884,10 @@ cex eRZ eRZ eRZ -jsJ -jsJ -jsJ -jsJ +eCd +eCd +eCd +eCd fEl xSX tIz @@ -55822,9 +54895,9 @@ gcP qqB pHp vAK -lBK -lBK -lBK +hFn +hFn +hFn hFn hFn pHR @@ -56032,13 +55105,13 @@ uHS lvu hgc wLg -fKG -fKG -fKG +pjh +pjh +pjh hKI -fKG -fKG -fKG +pjh +pjh +pjh rRK ntX onI @@ -56207,10 +55280,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY myN @@ -56222,18 +55295,18 @@ nLB nLB lYp nwa -wHi +uHS xGk ruD -fKG -fKG +pjh +pjh nez qIK hSB lhF pVt -fKG -fKG +pjh +pjh oRy onI vMH @@ -56260,7 +55333,7 @@ vMH vMH vMH udd -udd +yas vMH bwy bwy @@ -56401,10 +55474,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY myN @@ -56427,7 +55500,7 @@ fUZ rFK jcK fWd -fKG +pjh pVC onI vMH @@ -56561,7 +55634,7 @@ nBf nVM bjU lVP -dbW +lBK uep pBu bdR @@ -56595,10 +55668,10 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL waY aGQ @@ -56621,7 +55694,7 @@ xnE bWc oFb fWd -fKG +pjh laP onI vMH @@ -56746,13 +55819,13 @@ cfE bwy bwy bwy -okP +mzj iop xSQ aLv xKQ kae -okP +mzj wro ivV iwZ @@ -56789,16 +55862,16 @@ eUG eUG tIz ltL -qCo -qCo -qCo -qCo +smB +smB +smB +smB ltL -aGQ +waY lzn lFQ lay -stt +cpH mrT rfw lyh @@ -56815,7 +55888,7 @@ uHz jxa bRO mgD -fKG +pjh rPW onI onI @@ -56949,7 +56022,7 @@ uCx uCx iBd brX -dbW +lBK hPN pBu kNW @@ -56988,11 +56061,11 @@ qCo qCo nng ltL -aGQ +waY feQ dEX mwu -stt +cpH xjZ qXE vvb @@ -57009,7 +56082,7 @@ jap jap aEr wXZ -fKG +pjh uhr ntX onI @@ -57172,21 +56245,21 @@ ceV eUG eUG eUG -eUG -eUG -eUG -jsJ +xbU +xbU +xbU +xbU xbU jNa -omd -omd -tav +kYp +kYp +kYp wSs aGQ hfj tyK gHk -stt +cpH uQw dRf xxC @@ -57203,7 +56276,7 @@ rcx rcx rcx pjh -fKG +pjh xGk xGk vKx @@ -57366,22 +56439,22 @@ mhp eUG eUG eUG -eUG -eUG -eUG -eUG xbU -eyw -rEB +ufj +kYp +kYp +kYp +axF +nlg sjZ -hgt -mQF -aGQ -aGQ +nlg +xyY +rDm +chq aUV -aGQ -stt -stt +chq +cpH +cpH hqD hqD xfW @@ -57518,9 +56591,9 @@ bwy bwy bwy bwy -uNr -uNr -uNr +vsy +vsy +vsy knU uCx ucp @@ -57558,19 +56631,19 @@ hKp xSX kIy qvW -eUG -eUG -eUG -eUG -jsJ -jsJ +eCd +eCd xbU -mMl +osn +oVn +auT +auT +auT auT +jfJ nlg -vRc -dev -eCd +xyY +ykZ hTt eZL hLM @@ -57712,8 +56785,8 @@ bwy bwy bwy bwy -uNr -uNr +vsy +vsy knU knU uCx @@ -57751,21 +56824,21 @@ xSX wcp kYf kIy -rmq -jsJ -jsJ -jsJ -jsJ -jsJ dik -xSX -mQU +eCd +eCd +xbU osn +nmC +hgt +gnx +rEB nlg -chC -eCd -lRz -paL +dtU +nlg +xyY +ykZ +vfT asR etH kmq @@ -57905,9 +56978,9 @@ bwy bwy bwy bwy -uNr -uNr -uNr +mhZ +mhZ +mhZ knU vML hnv @@ -57945,21 +57018,21 @@ mqq fHS mWI dHb -mWI -mWI -oUl -mWI -mWI -mWI vAK -xSX +eCd +eCd xbU -iBN -nlg -hmf +osn +nmC +eBq +bXq +xiw +gnx +gnx +gnx +wXK ykZ -lRz -qdR +vfT asR vqA phS @@ -58099,9 +57172,9 @@ bwy bwy bwy bwy -uNr -uNr -uNr +mhZ +mhZ +mhZ knU gTI vpr @@ -58129,7 +57202,7 @@ xUE ivp yiY btS -yiY +uZc neM fFu sVL @@ -58139,21 +57212,21 @@ xSX vqk xSX kIy -xSX -jsJ -jsJ -xbU -xbU -xbU -xbU -xbU +eCd +eCd +eCd xbU -koC -dDb -hra -ykZ -lRz -vFZ +hmg +ldD +uQj +dwA +dwA +fsv +fsv +dwA +dwA +dev +vfT asR fNh kmq @@ -58291,13 +57364,13 @@ bwy bwy bwy bwy -cWY -cWY -cWY -cWY -cWY -cWY qUc +qUc +qUc +qUc +qUc +qUc +xxZ knU clQ iMu @@ -58323,7 +57396,7 @@ chi hTx yiY btS -yiY +uZc neM nFz wWD @@ -58333,21 +57406,21 @@ xSX vuJ xSX kIy -xSX -jsJ +epZ jdR -iaN -xbU -ryd +qwy xbU -ryd -rvO -hmV -hRJ -hmf -ykZ -eAI -fPs +osn +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +paL asR rel mhk @@ -58383,18 +57456,18 @@ onI wMT vMH uhr -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa vMH wFz wFz @@ -58485,7 +57558,7 @@ bwy bwy bwy bwy -cWY +qUc lZs mRr mRr @@ -58531,17 +57604,17 @@ xbU xbU xbU xbU -xbU -tgb -xbU -xbU -xbU -pas -qPM -aqv -eCd -mjL -fPs +osn +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +qdR asR rel dJg @@ -58577,18 +57650,18 @@ vMH vMH vMH uhr -uZc +cFa dFL dFL eCb dFL -uZc +cFa cfY eBn cfY lYP cfY -uZc +cFa wFz wFz wFz @@ -58679,7 +57752,7 @@ bwy bwy bwy bwy -cWY +qUc gZM bWs agn @@ -58725,17 +57798,17 @@ kYp rEx uAp sul -kYp -sIk -rEx -kYp -lez axF -hRJ -nlg -uIP -ctj -fPs +nmC +xyY +dwA +mek +mek +mek +mek +dwA +lRz +qdR cTh yeM ndZ @@ -58771,7 +57844,7 @@ ffO uhr jPo uhr -uZc +cFa eBn eBn eBn @@ -58782,7 +57855,7 @@ lYP eBn eBn eBn -uZc +cFa wFz bwy bwy @@ -58873,7 +57946,7 @@ bwy bwy bwy bwy -cWY +qUc mTT vVG xQR @@ -58918,18 +57991,18 @@ ceR fpm fpm fpm -fpm -fpm -fpm -fpm -fpm scQ fpm wmR -xdM -ykZ -ogt -fPs +xyY +dwA +mek +mek +mek +mek +dwA +lRz +vFZ xRC vfT fLk @@ -58965,18 +58038,18 @@ aIP uEH vMH vMH -uZc +cFa oig qcm qcm dCy -uZc +cFa cfY eBn cfY eBn unR -uZc +cFa wFz bwy bwy @@ -59067,11 +58140,11 @@ bwy bwy bwy bwy -cWY -cWY -cWY -cWY -cWY +qUc +qUc +qUc +qUc +qUc qeX qUc tMY @@ -59082,10 +58155,10 @@ xgg oIx uDw tMY -reD -reD -reD -reD +yhd +yhd +yhd +yhd xUE xUE gId @@ -59112,17 +58185,17 @@ ifz ifz ifz ifz -ifz -ifz -ifz -ifz -ifz klm yib -sQW -sVU -wuI -kUM +hRJ +vRc +dwA +dwA +dwA +dwA +dwA +dwA +mjL xqf pKJ eob @@ -59159,18 +58232,18 @@ hBE shQ vMH nLj -uZc +cFa yaX lYP eBn tty -uZc +cFa eBn eBn lYP lYP eBn -uZc +cFa wFz bwy bwy @@ -59262,20 +58335,20 @@ bwy bwy bwy bwy -cWY +qUc jbP kyn kJr caS iHP -bYv +tMY aJt aJt aJt aJt hhb mUW -bYv +tMY sDV mXM qjc @@ -59306,21 +58379,21 @@ eYy eYy eYy eYy -eYy -eYy -eWN -eYy -eYy -vlA -vaB -vzK +viH +fXt +hRJ +kyJ +kYp +kYp +kYp +kYp mCn -eCd -ktp +rxJ +vfT ovx wFw hal -bdU +vfT rwY eMx wGC @@ -59353,7 +58426,7 @@ asf uhr vMH nLj -uZc +cFa lYP eBn eBn @@ -59364,7 +58437,7 @@ wFS qcm wFS auh -uZc +cFa wFz bwy bwy @@ -59462,14 +58535,14 @@ boi ubW lti syC -bYv +tMY ykk ykk ykk ykk scm ocX -bYv +tMY bNa rJu hWj @@ -59500,22 +58573,22 @@ jSr jSr jSr jSr -jSr -jSr -tNg -jSr -jSr wnY -vaB -vzK -hmf +fXt +kTv +fpm +fpm +fpm +fpm +vCH +auz +iON +vkz +gis +twl +qaz +gku vHS -rja -rja -hxl -rja -rja -jUj vpR pQc agl @@ -59547,18 +58620,18 @@ uhr uhr vMH nLj -uZc +cFa xKK vIC nwy wqy -uZc +cFa eBn eBn aGJ eBn lYP -uZc +cFa wFz wFz wFz @@ -59663,7 +58736,7 @@ xuV mHR cXO nqy -bYv +tMY deL xOY okq @@ -59689,27 +58762,27 @@ jSr jSr jSr jSr -iPB -iPB -ejq -iPB -iPB -ejq -iPB -iPB +jSr +jSr +jSr jSr jSr wnY -vaB +gIz +iqy +iqy +lot +lot +yib vzK nzi +wut +fSE +mEa +nrN +dBJ +wje vHS -fkB -nYw -qrM -kUL -lAb -jUj qJc dWG hZP @@ -59741,18 +58814,18 @@ vMH vMH vMH vMH -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc -uZc +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa +cFa wFz wFz wFz @@ -59850,14 +58923,14 @@ ubW qUG rKy kVS -bYv +tMY lVr lVr lVr bfv cAS hlj -bYv +tMY gwW xOY dZF @@ -59884,26 +58957,26 @@ jSr jSr jSr iPB -dnw -vmF -sCV -lGn -vmF -ibB +iPB +ejq iPB iPB -tNg -keO +ejq +iPB +iPB +iPB +fQu +gcD vaB vzK hmf vHS -yiw -eYk -dfG -hzI -ixR -jUj +rja +rja +hxl +rja +rja +vHS vpR pQc nyi @@ -60038,20 +59111,20 @@ bwy bwy bwy bwy -cWY +qUc hQV lFq kto xLE npv -bYv +tMY uWx oqc oqc eSs iCx bgP -bYv +tMY oMK qsC jsn @@ -60083,7 +59156,7 @@ www pkE mqd voF -vmF +ibB lMm ejq tNg @@ -60091,13 +59164,13 @@ wnY vaB vzK hmf -rja -ewg -hto -evx -tiX -opc -jUj +vHS +fkB +nYw +qrM +kUL +lAb +vHS vpR pQc gDl @@ -60232,20 +59305,20 @@ bwy bwy bwy bwy -cWY -cWY +qUc +qUc xIu iNC -cWY +qUc xIu -bYv -bYv -bYv -bYv +tMY +tMY +tMY +tMY fXL -bYv -bYv -bYv +tMY +tMY +tMY eks eks eks @@ -60265,7 +59338,7 @@ jtG uUl lxt msy -sJN +wym tvV etY imW @@ -60285,13 +59358,13 @@ wnY vaB vzK hmf -rja -qYR -hnf -rxB -uoh -pPd -jUj +vHS +yiw +eYk +dfG +hzI +ixR +vHS vcA ddx iiV @@ -60426,7 +59499,7 @@ bwy bwy bwy bwy -gIp +fHF nhE rPZ ujr @@ -60456,10 +59529,10 @@ pBp nlg dTM jtG -mhZ +wMU rXQ tIN -sJN +wym dwE ngD ppL @@ -60480,12 +59553,12 @@ vaB vzK hmf rja -gtw -hto -evx -tiX -gtw -jUj +qYR +hnf +rxB +uoh +pPd +vHS eMx eMx eMx @@ -60620,7 +59693,7 @@ bwy bwy bwy bwy -gIp +fHF nhZ krf hht @@ -60632,7 +59705,7 @@ etm iLJ azo fmp -xxZ +uBq uBq dtz lfa @@ -60645,13 +59718,13 @@ hJZ hJZ hTQ hJZ -hJZ +cGZ pBp nlg dTM jtG wDl -rUU +rXQ sJN sJN arm @@ -60673,18 +59746,18 @@ keO vaB vzK mqr -vHS -cLg -gtw -dwC +rja gtw +hto +evx +tiX gtw -jUj +vHS rWU qLA sPG rWU -qpo +eAU sDd sPJ xGk @@ -60814,14 +59887,14 @@ bwy bwy bwy bwy -gIp +fHF ihq bZe jnR vrc lVn krf -cGZ +vCf eBr krf xhM @@ -60858,7 +59931,7 @@ vMY bvC nUB itT -vmF +wdy eDR iPB iPB @@ -60868,12 +59941,12 @@ vaB vzK hmf vHS -uSl -vZz -xrj -kur -llZ -jUj +cLg +gtw +dwC +gtw +gtw +vHS lyX eRg quR @@ -61009,8 +60082,8 @@ bwy bwy bwy fHF -wym -wym +fHF +fHF rYi gBv qYu @@ -61062,12 +60135,12 @@ vaB vzK trY vHS +uSl +vZz +xrj +kur +llZ vHS -vHS -vHS -vHS -vHS -jUj xnd omD cuS @@ -61254,19 +60327,19 @@ jSr wnY vaB vzK -gwt -dPs -ryd -xbU -tLs -tLs -tLs +hmf +wVr +wVr +wVr +uJg +uJg +uJg eAU itk dSc itk itk -qpo +eAU oUO rwV xGk @@ -61395,15 +60468,15 @@ bwy bwy bwy bwy -kLE -kLE -kLE ehM ehM -kLE -kLE -kLE -kLE +ehM +sRE +ehM +ehM +ehM +ehM +ehM jgU xUY yfo @@ -61448,9 +60521,9 @@ jSr wnY vaB vzK -vCB -xbU -xbU +gwt +dPs +ryd xbU tLs tLs @@ -61589,7 +60662,7 @@ bwy bwy bwy bwy -kLE +ehM udj mgB boY @@ -61597,7 +60670,7 @@ fMT nHa cbB jsv -kLE +ehM mBX epk hdO @@ -61628,7 +60701,7 @@ gtI sJN sJN sJN -xez +jtG sBb nty xez @@ -61836,7 +60909,7 @@ tNg keO vaB vzK -xyY +vCB xbU uHT mcX @@ -62053,7 +61126,7 @@ rTQ mcX fkn tUS -vQI +snw tOr nLD tUJ @@ -62066,7 +61139,7 @@ feb snw std std -vGf +std qYP bNJ wKu @@ -62365,7 +61438,7 @@ bwy bwy bwy bwy -kLE +ehM kbV pSV iLT @@ -62373,7 +61446,7 @@ oAx gCe qLl rBx -kLE +ehM vjG vCf uGA @@ -62559,15 +61632,15 @@ bwy bwy bwy bwy -kLE -kLE -kLE -kLE -kLE -kLE -kLE -kLE -kLE +ehM +ehM +ehM +ehM +ehM +ehM +ehM +ehM +ehM xtn krf aeZ @@ -62824,8 +61897,8 @@ ewU qSs qSw tfp -mcX -mcX +bYv +bYv mcX fkn uth @@ -62998,7 +62071,7 @@ nlg nhR gHy cYz -gnx +opu gnx juK xbU @@ -63177,23 +62250,23 @@ xbU edR xbU xbU -xbU -xbU +bXq +bXq xbU czY xHD snw -sRE -sRE +xZX +xZX snw dja snw sXA snw snw -sRE +xZX snw -sRE +xZX snw snw snw @@ -63383,7 +62456,7 @@ snw dIa tOr tOr -sRE +xZX tOr qYg tBD @@ -63548,8 +62621,8 @@ uEI uEI wvk uEI -uEI -uEI +loz +loz uEI uEI liF @@ -63570,10 +62643,10 @@ dox dZO fah mSY -sRE +xZX rLi tOr -sRE +xZX cVP swP eRG @@ -63946,7 +63019,7 @@ fah fah fah fah -chq +fah fah fah fah @@ -63958,7 +63031,7 @@ fZR khH fah bqJ -sRE +xZX tOr cmK ioL @@ -64347,15 +63420,15 @@ fah fah lxu snw -sRE -sRE +xZX +xZX snw tOr pmb rrk snw -neH -sRE +xZX +xZX snw snw snw @@ -64896,12 +63969,12 @@ oEY oEY oEY oEY -vsy +pqX rDF oEY tlq gvE -ewZ +tlq pxA pxA pxA @@ -64985,7 +64058,7 @@ eQR eQR eQR eQR -ndx +gIp mDr cug lxj @@ -65296,8 +64369,8 @@ xay eUc pxA vpG -xUE -xUE +stt +stt arf rMt rMt @@ -65960,7 +65033,7 @@ wzp ndx ndx qIe -bXq +pQm qIe qIe jJe @@ -66235,7 +65308,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza bwy @@ -66279,14 +65352,14 @@ wFC ydu fah ooX -vEo +reD vEo nkd nxW nkd vEo nkd -rrk +aUm tOr rrk tOr @@ -66429,7 +65502,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza bwy @@ -66623,7 +65696,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza rEf @@ -66675,15 +65748,15 @@ pYe vEo vEo snw -aUm -aUm +gCr +gCr snw -aUm -aUm -aUm +gCr +gCr +gCr snw -aUm -aUm +gCr +gCr snw jJe jJe @@ -66753,7 +65826,7 @@ bwy qBZ xWR mAy -uNr +fKG vFJ vFJ vFJ @@ -66817,7 +65890,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza tzY @@ -66848,10 +65921,10 @@ jwq biO pxA fah -loz -loz -loz -loz +upb +upb +upb +upb fah fah avw @@ -66947,7 +66020,7 @@ bwy qBZ xza xWR -uNr +fKG vFJ vFJ vFJ @@ -67011,7 +66084,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -67141,7 +66214,7 @@ bwy azT wCU xza -uNr +fKG vFJ vFJ vFJ @@ -67205,7 +66278,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -67335,7 +66408,7 @@ bwy azT wCU wCU -uNr +fKG vFJ vFJ jOP @@ -67399,7 +66472,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza kdB @@ -67529,7 +66602,7 @@ bwy qBZ xza xWR -uNr +fKG vFJ cFv jOP @@ -67593,7 +66666,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -67723,7 +66796,7 @@ bwy qBZ xza mAy -uNr +fKG vFJ jOP jOP @@ -67787,7 +66860,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza kdB @@ -67917,7 +66990,7 @@ bwy azT xza wCU -uNr +fKG jOP jOP jOP @@ -67981,7 +67054,7 @@ tXE tXE wFz wFz -uNr +fKG mAy xza kdB @@ -68111,7 +67184,7 @@ bwy azT wCU wCU -uNr +fKG cFv jOP vFJ @@ -68175,7 +67248,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -68305,7 +67378,7 @@ bwy qBZ xza mAy -uNr +fKG jOP jOP cFv @@ -68369,7 +67442,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -68499,10 +67572,10 @@ bwy qBZ wCU wCU -uNr +fKG xWR jOP -uNr +fKG vFJ vFJ vFJ @@ -68563,7 +67636,7 @@ tXE tXE wFz wFz -uNr +fKG xza mAy kdB @@ -68693,10 +67766,10 @@ bwy azT wCU xza -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -68757,7 +67830,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -68887,10 +67960,10 @@ bwy azT wCU mAy -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -68951,7 +68024,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza tzY @@ -69081,10 +68154,10 @@ bwy azT xza wCU -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -69145,7 +68218,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza kdB @@ -69275,10 +68348,10 @@ bwy azT wCU wCU -uNr +fKG xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -69339,7 +68412,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza xBw @@ -69472,7 +68545,7 @@ xWR nIT xWR xWR -uNr +fKG vFJ vFJ vFJ @@ -69533,7 +68606,7 @@ tXE tXE wFz wFz -uNr +fKG xza xza bwy @@ -69663,10 +68736,10 @@ bwy bwy wCU mAy -uNr -uNr -uNr -uNr +fKG +fKG +fKG +fKG vFJ vFJ vFJ @@ -69727,7 +68800,7 @@ tXE tXE wFz wFz -uNr +fKG xza mAy bwy @@ -69857,7 +68930,7 @@ bwy bwy xza xWR -uNr +fKG vFJ vFJ vFJ @@ -70051,7 +69124,7 @@ oro fTn xza mAy -uNr +fKG vFJ vFJ vFJ diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm index 95179af08d..e886355e32 100644 --- a/maps/tether/levels/surface3.dmm +++ b/maps/tether/levels/surface3.dmm @@ -9,10 +9,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, /obj/effect/floor_decal/borderfloor/corner2{ @@ -46,6 +43,20 @@ dir = 4 }, /area/tether/surfacebase/security/lobby) +"aaC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "aaP" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, @@ -129,7 +140,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "acY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/public_garden_three) "ade" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -188,22 +199,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) "adK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/general) +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "adP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -223,20 +230,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "adV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "surfsurgery2" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfsurgery2"; + name = "surfsurgery2" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery2) "ael" = ( @@ -255,14 +259,20 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "aeK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aeX" = ( @@ -282,6 +292,15 @@ }, /turf/simulated/open, /area/tether/surfacebase/public_garden_three) +"afv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "afz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -304,11 +323,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" @@ -320,11 +335,7 @@ /area/tether/surfacebase/medical/chemistry) "afT" = ( /obj/structure/flora/pottedplant/unusual, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/camera/network/research{ dir = 1 }, @@ -336,7 +347,7 @@ icon_state = "shock"; name = "HIGH VOLTAGE" }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/bar) "agp" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -419,7 +430,7 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "aji" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics) "ajq" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -522,11 +533,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "amn" = ( @@ -797,7 +804,7 @@ dir = 8 }, /turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "asJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -847,7 +854,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "atk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -862,10 +869,7 @@ "atH" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -929,37 +933,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "avK" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-2" }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) -"avT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "awe" = ( /obj/machinery/door/airlock{ id_tag = "barbackdoor"; @@ -977,16 +956,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/bar_backroom) "awl" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "robo_resleeving" - }, -/obj/structure/window/reinforced/polarized{ - id = "robo_resleeving" +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/plating, -/area/rnd/robotics/resleeving) +/turf/simulated/floor/plating/eris/under, +/area/shuttle/tourbus/general) "awn" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1024,7 +1003,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ id = "kitchen2"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -1032,6 +1010,19 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"ayH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "azs" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1210,21 +1201,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aDh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/breakroom) +/turf/simulated/wall/prepainted/command, +/area/bridge) "aDw" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1238,7 +1216,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "aDG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1361,9 +1339,7 @@ /area/library) "aGP" = ( /obj/structure/sign/deck/third, -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "aGV" = ( /obj/structure/disposalpipe/segment{ @@ -1449,7 +1425,7 @@ /area/rnd/xenobiology/xenoflora_storage) "aIi" = ( /obj/structure/sign/nanotrasen, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aIw" = ( /obj/item/stool/padded, @@ -1534,8 +1510,11 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment/backstage) +/area/tether/surfacebase/entertainment/stage) "aKU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1546,7 +1525,7 @@ /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "aKY" = ( /obj/structure/toilet{ dir = 8 @@ -1584,21 +1563,24 @@ /obj/item/radio/phone, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"aLR" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aMa" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"aMc" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) "aMw" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/segment, @@ -1672,18 +1654,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"aOg" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/storage) "aOp" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -1718,13 +1688,7 @@ /turf/simulated/floor/plating, /area/rnd/research_storage) "aPp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/research_storage) "aQm" = ( @@ -1748,7 +1712,7 @@ dir = 5 }, /obj/machinery/door/firedoor{ - dir = 8 + dir = 1 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -1960,6 +1924,10 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) +"aVN" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/hallway/primary/port) "aVY" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -1982,10 +1950,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aYv" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, @@ -2035,7 +2000,7 @@ /obj/item/clothing/under/swimsuit/stripper/cowbikini, /obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "aZR" = ( /obj/structure/table/woodentable, /turf/simulated/floor/tiled, @@ -2132,15 +2097,6 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"bce" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hallway/lower/third_south) "bcm" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -2190,7 +2146,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "bdb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/freezer) "bdc" = ( /obj/effect/floor_decal/borderfloorblack/corner, @@ -2280,6 +2236,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "bfR" = ( @@ -2303,7 +2262,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bgt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 @@ -2585,7 +2544,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bor" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -2617,11 +2576,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "bpc" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -2722,7 +2678,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "brA" = ( /turf/simulated/open, /area/rnd/staircase/thirdfloor) @@ -2742,14 +2698,12 @@ }, /obj/machinery/button/windowtint{ id = "hop_office"; - layer = 3.3; pixel_x = 22; pixel_y = -25 }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_office_desk"; - layer = 3.3; name = "Desk Privacy Shutter"; pixel_x = 6; pixel_y = -29 @@ -2760,7 +2714,6 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_line"; - layer = 3.3; name = "Line Shutters"; pixel_x = -6; pixel_y = -29 @@ -2768,9 +2721,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "bsL" = ( -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -2814,19 +2765,13 @@ /turf/simulated/floor/grass, /area/hydroponics) "bto" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "bua" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/sign/department/bar, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "but" = ( @@ -2899,7 +2844,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bvC" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2936,7 +2881,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "bwH" = ( /obj/machinery/biogenerator, /obj/effect/floor_decal/borderfloor{ @@ -2944,27 +2889,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"bwS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppernorthstairwell) "bxs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2991,11 +2915,7 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "bxG" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -3007,7 +2927,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bxM" = ( /obj/structure/toilet{ dir = 8 @@ -3082,23 +3002,8 @@ /turf/simulated/floor/wood, /area/library) "bAz" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) +/turf/simulated/open, +/area/tether/elevator/two) "bAK" = ( /obj/structure/bed/chair/sofa/brown/left{ dir = 1 @@ -3134,7 +3039,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bBs" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/civilian, @@ -3200,7 +3105,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bCr" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3257,7 +3162,7 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/tether) "bDc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment) "bDq" = ( /obj/machinery/light{ @@ -3266,26 +3171,16 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "bEK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; +/obj/machinery/door/blast/regular{ density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 + icon_state = "pdoor0"; + id = "surfbriglockdown"; + name = "Security Blast Doors"; + opacity = 0 }, -/obj/structure/window/reinforced, -/turf/simulated/wall, -/area/tether/surfacebase/medical/storage) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/security/lobby) "bEO" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -3346,7 +3241,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "bFS" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/servicebackroom) "bGd" = ( /obj/structure/shuttle/engine/propulsion, @@ -3376,11 +3271,7 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "bGK" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3411,10 +3302,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bIu" = ( @@ -3456,7 +3344,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "bKj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ @@ -3513,7 +3401,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -3638,7 +3526,7 @@ dir = 8; pixel_x = 10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "bPe" = ( /obj/item/radio/intercom{ @@ -3647,10 +3535,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"bPN" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/tiled/dark, -/area/bridge) "bPV" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3671,34 +3555,25 @@ /area/rnd/staircase/thirdfloor) "bQJ" = ( /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "bRe" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bRh" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "draama"; - name = "Mystery Window" +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "DRAMATIC"; + name = "Dramatic Blast Door" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 2; id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "bRo" = ( @@ -3777,7 +3652,7 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research) "bUr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -3796,9 +3671,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "bVs" = ( @@ -3822,6 +3695,25 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) +"bWf" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "bWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, @@ -3843,11 +3735,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "bWI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3882,15 +3770,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"bXt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) "bXu" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3930,15 +3809,8 @@ /turf/simulated/floor/tiled, /area/rnd/research) "bXW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/wall/prepainted/command, +/area/tether/surfacebase/security/iaa/officecommon) "bYc" = ( /turf/simulated/mineral, /area/tether/surfacebase/outside/outside3) @@ -4031,6 +3903,15 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) +"caX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/pool) "caY" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -4054,22 +3935,9 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"cbM" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "ccd" = ( /obj/machinery/media/jukebox, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -4158,17 +4026,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) -"cfz" = ( -/obj/structure/window/reinforced/polarized/full{ - id = "robo_resleeving" - }, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized{ - id = "robo_resleeving" - }, -/turf/simulated/floor/plating, -/area/rnd/robotics/resleeving) "cfG" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -4186,7 +4043,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "cfT" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -4252,12 +4109,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "cgW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "chg" = ( @@ -4275,7 +4131,7 @@ icon_state = "32-2" }, /turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "chQ" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -4302,7 +4158,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cil" = ( /obj/structure/table/reinforced, /obj/item/stamp/internalaffairs, @@ -4340,7 +4196,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "ciT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -4362,12 +4218,21 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "cjB" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/robotics) +"ckf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "ckA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4420,7 +4285,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "cmJ" = ( /obj/structure/railing{ dir = 4 @@ -4466,25 +4331,6 @@ /obj/structure/bed/chair/sofa/black/left, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"cow" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/blue/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "cox" = ( /obj/machinery/vending/security{ dir = 4 @@ -4506,6 +4352,26 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"coV" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/camera/network/tether, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 5 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "cqo" = ( /obj/structure/table/woodentable, /obj/item/paper_bin{ @@ -4515,6 +4381,25 @@ /obj/item/pen, /turf/simulated/floor/carpet, /area/library) +"crl" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "crm" = ( /obj/machinery/light/small{ dir = 4 @@ -4529,6 +4414,22 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"crP" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "csz" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -4547,9 +4448,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "csR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4558,26 +4461,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "csX" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/regular/open{ - dir = 2; + dir = 4; id = "DRAMATIC"; name = "Dramatic Blast Door" }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "draama"; - name = "Mystery Window" - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/machinery/door/blast/shutters{ dir = 4; id = "Druma"; - layer = 3.3; name = "Entertainment Shutters" }, /turf/simulated/floor/plating, @@ -4598,6 +4490,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ctR" = ( @@ -4727,7 +4623,7 @@ /area/tether/surfacebase/security/iaa) "cvO" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "cwf" = ( /obj/item/radio/intercom{ @@ -4851,17 +4747,9 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"czh" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) +"cyt" = ( +/turf/simulated/wall/prepainted, +/area/hallway/primary/port) "czk" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -4958,11 +4846,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "cBK" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/l3closet/scientist, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -5040,8 +4924,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "cCS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -5054,7 +4941,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "cDs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5101,7 +4988,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cER" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5147,10 +5034,10 @@ pixel_y = -25 }, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cFE" = ( /obj/structure/railing, /obj/structure/railing{ @@ -5202,11 +5089,7 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/dropper, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5242,15 +5125,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "cKJ" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_office) "cLd" = ( @@ -5298,15 +5174,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "cOo" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/shuttle_pad) "cOu" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -5409,22 +5278,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"cUn" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "cUJ" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -5436,10 +5289,24 @@ dir = 9 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "cUT" = ( /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"cUW" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "cVd" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable{ @@ -5513,7 +5380,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "cWU" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -5602,19 +5469,11 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "cZx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "daa" = ( @@ -5658,13 +5517,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "dbs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/chemistry) "dbu" = ( @@ -5731,15 +5585,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"dcc" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "dcB" = ( /obj/structure/table/marble, /obj/item/flame/candle, @@ -5788,11 +5633,10 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "ddu" = ( /obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -5870,14 +5714,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"diq" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/command{ - name = "Bridge"; - req_access = list(19) +"dia" = ( +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ + scrub_id = "atrium" }, -/turf/simulated/floor/tiled/dark, -/area/bridge) +/turf/simulated/floor/tiled/techmaint, +/area/hallway/primary/fore) "diK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5971,22 +5813,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"dlI" = ( -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/effect/floor_decal/corner/blue/diagonal{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) "dmb" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -6010,7 +5836,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dnb" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -6025,8 +5851,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "dnq" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6071,6 +5896,7 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 5 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dof" = ( @@ -6083,7 +5909,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "dox" = ( /obj/structure/closet/athletic_mixed, /obj/machinery/status_display{ @@ -6281,6 +6107,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) +"duG" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/storage) "duJ" = ( /obj/machinery/conveyor{ dir = 1; @@ -6341,10 +6174,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "dwU" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "dxa" = ( @@ -6354,9 +6184,6 @@ /obj/effect/floor_decal/corner_oldtile/green/full, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) -"dxd" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/chemistry) "dyf" = ( /obj/machinery/vending/fitness{ dir = 4 @@ -6393,28 +6220,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "dyJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/wall, -/area/tether/surfacebase/medical/storage) +/turf/simulated/wall/r_wall/prepainted/command, +/area/crew_quarters/captain) "dyN" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -6450,7 +6257,6 @@ dir = 4 }, /obj/structure/cable/green{ - dir = 1; icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -6472,7 +6278,7 @@ /obj/structure/closet/hydrant{ pixel_y = -32 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/shuttle_pad) "dAj" = ( /obj/structure/table/woodentable, @@ -6540,6 +6346,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"dBm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "dBH" = ( /obj/machinery/botany/editor, /obj/effect/floor_decal/borderfloor{ @@ -6653,9 +6467,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "dDO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ density = 0; dir = 2; @@ -6664,6 +6475,8 @@ name = "Freezer Shutters"; opacity = 0 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/freezer) "dEh" = ( @@ -6684,13 +6497,13 @@ /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) "dEL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "dEU" = ( /obj/structure/sign/directions/evac{ dir = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "dFg" = ( /obj/machinery/door/firedoor, @@ -6701,25 +6514,6 @@ dir = 4 }, /area/hallway/lower/third_south) -"dFK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "dHm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6763,7 +6557,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dHM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -6799,7 +6593,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dIC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6830,8 +6624,11 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dJf" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6891,8 +6688,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) "dLp" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/security/lobby) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/shuttle_pad) "dLw" = ( /obj/structure/bed/chair/sofa/brown/left, /turf/simulated/floor/carpet/sblucarpet, @@ -6930,7 +6729,7 @@ req_one_access = list(47,55) }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1382; master_tag = "xenobiology_airlock_control"; name = "Xenobiology Access Control"; @@ -6940,14 +6739,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "dMn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/workshop) -"dMz" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) "dMR" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -6959,12 +6752,9 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "dNs" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) @@ -6990,6 +6780,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) +"dPz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "dPO" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -7032,7 +6832,7 @@ /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "dRa" = ( /obj/machinery/air_alarm{ pixel_y = 22 @@ -7056,16 +6856,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"dRA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "dRD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7133,7 +6923,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "dSP" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -7180,11 +6970,7 @@ /area/tether/surfacebase/public_garden_three) "dUV" = ( /obj/structure/table/standard, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/item/defib_kit/loaded, /obj/item/stack/nanopaste, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -7207,11 +6993,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7275,7 +7057,6 @@ "dXS" = ( /obj/machinery/button/windowtint{ id = "draama"; - layer = 3.3; name = "Mystery Window Tint Control"; pixel_x = 3; pixel_y = -29; @@ -7295,8 +7076,10 @@ }, /obj/item/stool/padded, /obj/landmark/spawnpoint/job/entertainer, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, /turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment/backstage) +/area/tether/surfacebase/entertainment/stage) "dXU" = ( /obj/machinery/atmospherics/component/binary/pump{ dir = 4; @@ -7336,6 +7119,21 @@ /obj/item/beach_ball, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"dYS" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "dZl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7403,6 +7201,23 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"eaC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "eaP" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -7418,8 +7233,7 @@ /area/rnd/robotics/resleeving) "ebD" = ( /obj/structure/flora/pottedplant/unusual, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorblack{ @@ -7452,14 +7266,16 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) +"eez" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/barbackmaintenance) "eeA" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -7500,7 +7316,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "egD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7542,27 +7358,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ehm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "eho" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -7572,6 +7367,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"ehy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ehG" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -7582,29 +7383,19 @@ /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) "eiz" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/sign/signnew/secure, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "32-4" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) +"eiE" = ( +/turf/simulated/wall/prepainted, +/area/hallway/primary/fore) "eiK" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -7646,10 +7437,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/random/maintenance/clean, @@ -7704,6 +7492,15 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"ena" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "enf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7783,9 +7580,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -7894,6 +7688,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "erZ" = ( @@ -7937,17 +7732,14 @@ /area/tether/surfacebase/security/iaa/officecommon) "etf" = ( /obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 10 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, -/obj/structure/sign/directions/evac{ - dir = 1; - pixel_y = -32 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -8009,7 +7801,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "euX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8054,7 +7846,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/item/reagent_containers/food/condiment/small/saltshaker{ @@ -8450,7 +8241,7 @@ /obj/structure/sign/directions/evac{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/upperhall) "eGZ" = ( /obj/structure/disposalpipe/segment{ @@ -8532,15 +8323,6 @@ "eKA" = ( /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) -"eLe" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research) "eLl" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -8554,31 +8336,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"eLm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) +/area/hallway/primary/fore) "eLL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -8621,7 +8379,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "eMK" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8689,7 +8447,6 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, /obj/effect/floor_decal/borderfloorwhite/corner2, @@ -8700,6 +8457,9 @@ req_access = list(5); req_one_access = list(5) }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "eOL" = ( @@ -8710,7 +8470,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "eOO" = ( -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -8718,14 +8477,14 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hos_office"; + name = "hos_office" + }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "ePT" = ( @@ -8735,7 +8494,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "eQc" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/xenobiology/xenoflora) "eQn" = ( /obj/machinery/door/firedoor/glass, @@ -8807,7 +8566,7 @@ }, /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "eRX" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -8849,12 +8608,27 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"eST" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "eTd" = ( /obj/machinery/vending/cigarette{ dir = 4 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "eTA" = ( /obj/structure/bed/chair{ dir = 8 @@ -8935,8 +8709,6 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "eUY" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -8948,24 +8720,20 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "eVl" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_stairs) "eVA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_first_aid) "eVS" = ( /obj/structure/cable/green{ @@ -9017,8 +8785,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -9042,7 +8809,7 @@ pixel_x = 30 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "eXn" = ( /obj/machinery/vending/hydronutrients{ dir = 8 @@ -9090,7 +8857,7 @@ /area/rnd/xenobiology/xenoflora_storage) "eZH" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research_storage) "faf" = ( /obj/machinery/camera/network/civilian, @@ -9111,6 +8878,9 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) +"faK" = ( +/turf/simulated/wall/prepainted, +/area/hallway/primary/starboard) "fbf" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -9133,8 +8903,7 @@ /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) "fbU" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/grass, @@ -9173,6 +8942,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"feZ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ffs" = ( /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) @@ -9189,11 +8973,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "ffW" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -9257,11 +9037,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -9391,6 +9167,22 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"flb" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "flc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -9413,6 +9205,15 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) +"fmD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "fmQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -9543,7 +9344,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "ftd" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "ftn" = ( /obj/structure/disposalpipe/segment, @@ -9643,7 +9444,7 @@ dir = 8 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -9685,8 +9486,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "fxy" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/stool/padded, @@ -9710,12 +9510,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "fxY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/admin) "fyE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/library) "fyM" = ( @@ -9735,11 +9534,7 @@ "fyW" = ( /obj/structure/table/standard, /obj/item/toy/plushie/purple_fox, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 28 @@ -9780,17 +9575,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fAs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/wall/prepainted, +/area/crew_quarters/panic_shelter) "fAU" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 10 @@ -9833,25 +9619,10 @@ /obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"fBy" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "fBE" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor, @@ -9899,18 +9670,9 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fDu" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, +/turf/simulated/floor/plating, /area/tether/surfacebase/servicebackroom) "fDw" = ( /obj/effect/floor_decal/borderfloor, @@ -9952,6 +9714,17 @@ "fEa" = ( /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) +"fEb" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "fEg" = ( /obj/landmark/spawnpoint/job/entertainer, /obj/structure/bed/chair/wood, @@ -9961,10 +9734,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fEn" = ( @@ -9996,19 +9766,10 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_three_hall) "fFk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/topairlock) "fFS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/uppersouthstairwell) "fFT" = ( /obj/structure/cable/green{ @@ -10029,23 +9790,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "fGn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "fGZ" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "fHk" = ( @@ -10058,11 +9811,7 @@ /turf/simulated/floor/wood, /area/library) "fHx" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10090,10 +9839,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/crate, /obj/random/maintenance/clean, /obj/random/maintenance/clean, @@ -10147,7 +9893,6 @@ pixel_y = -5 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/spline/plain{ @@ -10225,7 +9970,7 @@ /area/tether/surfacebase/medical/lobby) "fKZ" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/lobby) "fLp" = ( /obj/structure/cable/green{ @@ -10275,11 +10020,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "fMM" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light, /obj/structure/cable/green, /turf/simulated/floor/tiled, @@ -10294,11 +10035,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "fNn" = ( @@ -10320,7 +10057,7 @@ /area/tether/surfacebase/security/iaa/officea) "fNp" = ( /obj/machinery/newscaster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "fNr" = ( /obj/structure/closet{ @@ -10504,15 +10241,14 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "fPY" = ( /obj/structure/sink{ pixel_y = 24 @@ -10536,15 +10272,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "fQR" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) "fQS" = ( @@ -10745,10 +10479,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "fXg" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "robo_resleeving" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "robo_resleeving"; + name = "robo_resleeving" }, /turf/simulated/floor/plating, /area/rnd/robotics/resleeving) @@ -10793,7 +10526,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "fXX" = ( /obj/item/bee_pack, /obj/item/honey_frame, @@ -10827,7 +10560,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "fYm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/triumph/surfacebase/sauna) "fYt" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -10875,6 +10608,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) +"fZp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "fZu" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -10955,6 +10700,28 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) +"gbq" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "geu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -10983,13 +10750,19 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/hydroponics) +"ggC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "ghk" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Medbay Storage"; req_access = list(5); req_one_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "ghn" = ( @@ -11069,7 +10842,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "gjp" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/maintenance/commandmaint) "gjx" = ( /obj/effect/floor_decal/borderfloor, @@ -11080,12 +10853,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "gjP" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11107,8 +10879,7 @@ /area/tether/surfacebase/security/briefingroom) "gjZ" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -11157,7 +10928,6 @@ "gmU" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/item/paper_bin, @@ -11177,10 +10947,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "gns" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) @@ -11234,7 +11001,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "goh" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/spline/plain{ @@ -11250,8 +11017,11 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) +"gpp" = ( +/turf/simulated/floor/plating, +/area/hallway/lower/third_south) "gpz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/security/iaa/officea) "gpC" = ( /obj/structure/cable/green{ @@ -11292,11 +11062,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"gqL" = ( -/turf/simulated/wall{ - can_open = 1 - }, -/area/tether/surfacebase/surface_three_hall) "gqR" = ( /obj/machinery/light{ dir = 8 @@ -11314,6 +11079,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "grq" = ( @@ -11337,6 +11105,22 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) +"grE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "gsJ" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11361,10 +11145,10 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_shop) "gtb" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/iaa/officecommon) "gtl" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -11409,24 +11193,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "guv" = ( -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/effect/floor_decal/corner/blue/diagonal{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora_storage) "guH" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -11441,7 +11209,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "gvk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -11475,10 +11243,7 @@ pixel_x = -2; pixel_y = -1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light_switch{ pixel_x = 12; pixel_y = -24 @@ -11550,22 +11315,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"gwU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/general) "gxg" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -11677,53 +11426,27 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) -"gzU" = ( -/obj/structure/cable{ +"gzG" = ( +/obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lobby) +"gzU" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gAM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) +/obj/structure/sign/department/biblio, +/turf/simulated/wall/prepainted/civilian, +/area/library) "gCz" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -11734,10 +11457,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/lathe/autolathe, /turf/simulated/floor/tiled, /area/rnd/research) @@ -11764,35 +11484,26 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "gDK" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) -"gEo" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/structure/window/reinforced/polarized{ - id = "draama"; - name = "Mystery Window" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "gEL" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/warning{ @@ -11820,26 +11531,8 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "gGi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/uppernorthstairwell) "gGG" = ( @@ -11902,6 +11595,11 @@ /obj/machinery/light, /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) +"gJC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "gJU" = ( /turf/simulated/wall, /area/hallway/lower/third_south) @@ -11929,11 +11627,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -11943,26 +11637,10 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "gKL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/storage) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "gLd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11979,12 +11657,14 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "gLt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/pool) "gLT" = ( @@ -12013,12 +11693,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "gMY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; dir = 4; @@ -12050,10 +11725,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "gNC" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/table/standard, /obj/item/wheelchair, @@ -12153,7 +11825,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "gRV" = ( /obj/structure/grille, /obj/structure/railing{ @@ -12250,16 +11922,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"gUb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/area/hallway/primary/starboard) "gUs" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/foodcart, @@ -12301,7 +11964,7 @@ /obj/item/towel/random, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "gWY" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/structure/catwalk, @@ -12321,11 +11984,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12349,9 +12008,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "gXO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "gXX" = ( @@ -12367,7 +12024,7 @@ /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/lightgrey/bordercorner2, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "gXZ" = ( /obj/machinery/light_switch{ pixel_y = 25 @@ -12375,24 +12032,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "gYg" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "gYk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -12464,6 +12108,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "haq" = ( @@ -12482,11 +12129,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "haH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12670,15 +12313,17 @@ dir = 8 }, /obj/random/soap, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"hfu" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hfy" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research/researchdivision) "hha" = ( /obj/effect/floor_decal/corner/mauve{ @@ -12690,7 +12335,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "hhK" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/crew_quarters/heads/hop) "hhO" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -12699,7 +12344,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/structure/flora/pottedplant/unusual, +/obj/structure/closet/secure_closet/medical_wall/anesthetics, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hip" = ( @@ -12715,11 +12360,7 @@ /area/rnd/xenobiology/xenoflora_storage) "hjV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -12772,11 +12413,8 @@ /obj/structure/table/glass, /obj/item/packageWrap, /obj/item/hand_labeler, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -12816,9 +12454,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"hlG" = ( -/turf/simulated/wall, -/area/rnd/research) "hmR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -12852,19 +12487,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "hoE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/briefingroom) "hpn" = ( @@ -12881,10 +12504,7 @@ /area/crew_quarters/panic_shelter) "hpp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -12924,6 +12544,10 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 30 }, +/obj/machinery/airlock_sensor/phoron/airlock_interior{ + pixel_x = -25 + }, +/obj/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "hqJ" = ( @@ -13015,6 +12639,20 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"hty" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "htH" = ( /obj/machinery/air_alarm{ dir = 1; @@ -13064,7 +12702,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "hvp" = ( /obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13074,12 +12712,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) -"hvH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/rnd/robotics) "hvT" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/tether/surfacebase/outside/outside3) @@ -13115,7 +12747,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "hxW" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/maintenance/lower/medsec_maintenance) "hxY" = ( /obj/structure/table/glass, @@ -13163,34 +12795,23 @@ /turf/simulated/floor/grass, /area/hydroponics) "hyt" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "hzl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/upperhall) +/turf/simulated/floor/tiled/dark, +/area/bridge) "hzG" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_office) "hzM" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "hAe" = ( @@ -13200,16 +12821,6 @@ /obj/landmark/spawnpoint/job/scientist, /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) -"hAi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/servicebackroom) "hAs" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -13263,6 +12874,25 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"hCm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/air_alarm{ + pixel_y = 28 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hCH" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/floor_decal/industrial/warning{ @@ -13277,8 +12907,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "hDI" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -13309,20 +12938,12 @@ /obj/structure/sign/directions/evac{ dir = 8 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "hGm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/sign/botany, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "hGp" = ( @@ -13376,8 +12997,7 @@ /area/tether/surfacebase/security/iaa/officea) "hIU" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/rust, @@ -13478,8 +13098,7 @@ dir = 4 }, /obj/random/cutout, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/lino, @@ -13695,14 +13314,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "hRE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "hRM" = ( @@ -13772,7 +13391,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "hUV" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -13789,6 +13408,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"hVA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "hVU" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -13834,7 +13468,7 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "hXb" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/warning{ @@ -13927,17 +13561,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "hYN" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/librarypubliccomp, /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/library) "hZJ" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_office) "iaA" = ( /obj/structure/bookcase, @@ -13947,9 +13578,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "ibh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "ibj" = ( @@ -14002,27 +13632,15 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Internal Affairs" }, -/obj/machinery/door/firedoor/multi_tile, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) -"icv" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_main) "icz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -14059,8 +13677,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "idP" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -14068,7 +13684,7 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/lobby) "idX" = ( @@ -14125,7 +13741,7 @@ dir = 1; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/library) "ifN" = ( /obj/structure/bed/chair/comfy/brown{ @@ -14232,8 +13848,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ijD" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/admin) +/turf/simulated/wall/r_wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "ijK" = ( /obj/structure/table/glass, /obj/machinery/door/window/westright{ @@ -14271,7 +13887,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -14292,11 +13907,8 @@ /turf/simulated/floor/grass, /area/hydroponics) "iku" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -14342,41 +13954,9 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"ime" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppernorthstairwell) "imm" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment/stage) -"imA" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "imL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14471,8 +14051,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -14491,11 +14070,7 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "ipc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/light{ dir = 4 }, @@ -14566,11 +14141,8 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iqT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -14579,7 +14151,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "irb" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -14689,8 +14261,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -14803,21 +14374,6 @@ "iwC" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) -"iwI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "ixe" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -14830,6 +14386,26 @@ dir = 1 }, /turf/simulated/floor/tiled, +/area/hallway/primary/fore) +"ixf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ixs" = ( /obj/machinery/light{ @@ -14852,10 +14428,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ixH" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -15044,21 +14617,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) -"iEl" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/rnd/research) "iEZ" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "iFf" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/item/radio/intercom{ pixel_y = -24 }, @@ -15087,21 +14651,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "iFF" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) "iGh" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/wall/r_wall/prepainted/science, +/area/crew_quarters/panic_shelter) "iGD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -15116,9 +14672,9 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "iGE" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/pool) "iGJ" = ( /obj/machinery/light/small{ @@ -15182,15 +14738,31 @@ pixel_x = -5 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "iIV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) +"iIW" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iJx" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -15212,7 +14784,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "iKi" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/smartfridge/chemistry, @@ -15280,19 +14852,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "iLn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/breakroom) "iLJ" = ( @@ -15307,10 +14867,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "iLO" = ( @@ -15320,6 +14877,16 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) +"iMe" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iMv" = ( /obj/structure/bed/chair/comfy/brown, /obj/landmark/spawnpoint/job/head_of_personnel, @@ -15332,6 +14899,24 @@ /obj/structure/grille, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_three_hall) +"iNu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iNx" = ( /obj/structure/railing, /obj/structure/cable/orange{ @@ -15369,11 +14954,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/pool) "iOe" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, @@ -15430,6 +15011,21 @@ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "iPt" = ( @@ -15450,7 +15046,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -15462,26 +15057,8 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"iQo" = ( -/obj/structure/grille, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/hos) "iQH" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "iRo" = ( /obj/machinery/shower{ @@ -15515,26 +15092,48 @@ /obj/effect/floor_decal/corner/mauve/bordercorner, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"iRN" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "iRQ" = ( /obj/machinery/door/window{ + dir = 4; name = "Dealer's Seat" }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) +"iRU" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/padded, +/obj/item/towel/random, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "iSb" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) +"iSf" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "iSj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -15564,13 +15163,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "iTb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, /obj/structure/cable/green, /obj/machinery/door/blast/regular{ density = 0; @@ -15579,6 +15171,7 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "iTu" = ( @@ -15686,8 +15279,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) "iVt" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -15715,11 +15307,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -15763,8 +15351,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "iWl" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -15776,11 +15362,11 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "iWM" = ( @@ -15799,6 +15385,9 @@ /obj/structure/bed/chair{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/bridge) "iXl" = ( @@ -15820,12 +15409,8 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "iXC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/workshop) "iXH" = ( @@ -15836,8 +15421,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "iYv" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/eris/cafe, @@ -15853,7 +15437,7 @@ /area/tether/surfacebase/shuttle_pad) "jbl" = ( /obj/item/radio/intercom, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "jbw" = ( /obj/structure/frame/computer, @@ -15887,6 +15471,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"jbX" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "jco" = ( /obj/structure/table/gamblingtable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -15903,6 +15499,14 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"jcG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jdy" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15914,15 +15518,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "jdA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "jdP" = ( @@ -15975,10 +15572,7 @@ /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "jeM" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/vending/loadout/accessory, /obj/machinery/air_alarm{ dir = 8; @@ -16016,7 +15610,6 @@ }, /obj/machinery/door/blast/shutters{ id = "kitchen2"; - layer = 3.3; name = "Kitchen Shutters" }, /turf/simulated/floor/tiled/white, @@ -16034,7 +15627,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jga" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/recreation_area) "jgu" = ( /obj/structure/table/woodentable, @@ -16077,6 +15670,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) +"jie" = ( +/turf/simulated/wall/prepainted/medical, +/area/hallway/primary/starboard) "jis" = ( /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ @@ -16102,14 +15698,10 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "jiE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ density = 0; + dir = 4; icon_state = "pdoor0"; id = "tourbus_windows"; name = "Shuttle Blast Doors"; @@ -16118,8 +15710,27 @@ /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) "jjc" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/upperhall) +"jjy" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "jjJ" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled, @@ -16219,29 +15830,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"jlF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppernorthstairwell) "jlJ" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -16254,7 +15842,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "jlL" = ( /obj/structure/table/steel, /obj/item/electronic_assembly/large/default, @@ -16285,6 +15873,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/machinery/oxygen_pump/mobile/anesthetic, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "jmk" = ( @@ -16304,7 +15893,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "jmm" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/portables_connector{ @@ -16360,18 +15949,19 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"jps" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"jqi" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, -/obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "jqH" = ( @@ -16394,7 +15984,7 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jrd" = ( /obj/structure/sign/directions/medical{ dir = 1; @@ -16411,7 +16001,7 @@ dir = 1; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_three_hall) "jrv" = ( /obj/structure/bed/chair/sofa/brown/right{ @@ -16420,10 +16010,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) "jrG" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -16446,7 +16033,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -16486,25 +16072,11 @@ /obj/landmark/spawnpoint/job/entertainer, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"jsx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "jsD" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) "jsE" = ( -/obj/structure/grille, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -16512,10 +16084,10 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hos_office"; + name = "hos_office" }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "jsM" = ( @@ -16616,11 +16188,11 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jvD" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "medbayfoyer" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "medbayfoyer"; + name = "medbayfoyer" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) "jvH" = ( @@ -16748,6 +16320,7 @@ dir = 10 }, /obj/machinery/computer/timeclock/premade/west, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "jAf" = ( @@ -16762,7 +16335,7 @@ /area/tether/surfacebase/security/iaa) "jAF" = ( /obj/item/radio/intercom, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "jAH" = ( /turf/simulated/floor/carpet, @@ -16771,15 +16344,12 @@ /turf/simulated/wall, /area/crew_quarters/bar) "jBg" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/orange, /turf/simulated/floor/tiled, /area/teleporter/departing) "jBw" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_shop) "jBy" = ( /obj/structure/disposalpipe/segment, @@ -16797,13 +16367,9 @@ pixel_x = -25 }, /turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment) +/area/tether/surfacebase/entertainment/stage) "jBR" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -16858,23 +16424,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"jDg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jDv" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -17015,11 +16565,8 @@ dir = 6 }, /obj/landmark/spawnpoint/job/librarian, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -17041,16 +16588,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) -"jJl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/xenobiology/xenoflora) "jJJ" = ( /obj/structure/table/woodentable, /obj/item/storage/box/sinpockets, @@ -17068,7 +16605,7 @@ "jJP" = ( /obj/structure/lattice, /turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jJW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -17131,10 +16668,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "jMd" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "jMs" = ( @@ -17150,12 +16684,7 @@ pixel_y = -7; report_danger_level = 0 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 23; - pixel_y = 13 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell) @@ -17176,8 +16705,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -17213,20 +16741,6 @@ }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) -"jOp" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "jPj" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -17291,7 +16805,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "jQd" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -17355,15 +16869,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "jSJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/pool) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/medical/surgery2) "jTh" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -17387,9 +16894,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "jUo" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "jUv" = ( @@ -17461,8 +16966,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/wood, @@ -17668,9 +17172,6 @@ /obj/machinery/computer/arcade, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"kbY" = ( -/turf/simulated/wall, -/area/tether/surfacebase/medical/surgery2) "kcx" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17691,8 +17192,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "kdK" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloor, @@ -17735,7 +17235,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -17760,7 +17259,7 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "khE" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/tether/surfacebase/surface_three_hall) "khZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, @@ -17781,6 +17280,33 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"kio" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) +"kiy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "kiG" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 8; @@ -17847,7 +17373,7 @@ }, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "kmv" = ( /obj/structure/cable{ icon_state = "2-8" @@ -17861,12 +17387,7 @@ /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "kmR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa) "knh" = ( @@ -17888,10 +17409,7 @@ "knX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -17918,7 +17436,7 @@ pixel_y = -32 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "koO" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -17932,17 +17450,10 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "koV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "surfsurgery2" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, -/area/tether/surfacebase/medical/surgery2) +/area/tether/surfacebase/surface_three_hall) "kpb" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/techfloor, @@ -17986,6 +17497,18 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) +"kpP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "kpV" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -18048,8 +17571,6 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "krJ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -18061,14 +17582,14 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "ksc" = ( @@ -18106,7 +17627,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_three_hall) "ktH" = ( /obj/machinery/door/airlock/security{ @@ -18182,6 +17703,15 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"kwu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "kwQ" = ( /obj/structure/closet/hydrant{ pixel_y = -32 @@ -18243,13 +17773,22 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "kAn" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge) +"kAD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "kBl" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18298,7 +17837,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "kCo" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/bar_backroom) "kCv" = ( /obj/machinery/holopad, @@ -18447,30 +17986,6 @@ /obj/structure/table/marble, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"kHp" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "DRAMATIC"; - name = "Dramatic Blast Door" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "draama"; - name = "Mystery Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "draama"; - name = "Mystery Window" - }, -/obj/machinery/door/blast/shutters{ - id = "Druma"; - layer = 3.3; - name = "Entertainment Shutters" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/entertainment) "kIa" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -18496,6 +18011,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"kJa" = ( +/turf/simulated/wall/prepainted/civilian, +/area/hallway/lower/third_south) "kJi" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -18573,7 +18091,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "kLX" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/crew_quarters/recreation_area_restroom) "kMf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -18608,6 +18126,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "kOG" = ( @@ -18627,7 +18148,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "kPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18707,8 +18228,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "kTj" = ( /obj/machinery/conveyor_switch/oneway{ id = "serviceblock2" @@ -18800,6 +18324,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "kWx" = ( @@ -18835,6 +18360,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/bar) +"kXp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "kXv" = ( /obj/machinery/door/airlock/maintenance/common, /obj/effect/floor_decal/industrial/warning{ @@ -18888,7 +18421,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "kYr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19009,8 +18542,8 @@ /turf/simulated/floor/tiled, /area/rnd/research) "laF" = ( -/turf/simulated/wall/r_wall, -/area/rnd/research_storage) +/turf/simulated/wall/prepainted/medical, +/area/tether/surfacebase/surface_three_hall) "laX" = ( /obj/machinery/vending/coffee{ dir = 8 @@ -19226,11 +18759,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -19238,7 +18767,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "lig" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/breakroom) "lih" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19292,6 +18821,18 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) +"lkI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "lkX" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19384,6 +18925,7 @@ dir = 4 }, /obj/machinery/door/airlock/multi_tile/glass/polarized{ + dir = 8; id_tint = "saunatint"; name = "Sauna" }, @@ -19415,9 +18957,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "loy" = ( -/obj/structure/curtain/open, -/turf/simulated/floor/carpet/purcarpet, -/area/crew_quarters/bar) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/cafeteria) "loG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19461,7 +19002,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "lpk" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -19494,7 +19035,7 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/research) "lqw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) "lqB" = ( /obj/structure/cable/green{ @@ -19509,15 +19050,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "lqG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "lqQ" = ( @@ -19567,9 +19101,6 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "lsn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -19581,6 +19112,8 @@ opacity = 0; open_layer = 1 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/lobby) "lsK" = ( @@ -19612,8 +19145,7 @@ /turf/simulated/floor/wood, /area/library) "lsY" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -19643,9 +19175,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(67) }, /obj/effect/floor_decal/borderfloorwhite, @@ -19730,6 +19260,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "lwr" = ( @@ -19766,11 +19302,7 @@ /obj/item/pizzavoucher, /obj/item/moneybag, /obj/item/inflatable_duck, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/item/gun/ballistic/revolver/capgun, /obj/item/gun/ballistic/revolver/capgun, /obj/item/toy/cultsword, @@ -19837,7 +19369,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "lyc" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -19846,11 +19378,11 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "lAa" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/vacant/vacant_shop) "lAH" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/chemistry) "lCf" = ( /obj/structure/cable/green{ @@ -19890,7 +19422,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "lCS" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/security/iaa) "lDx" = ( /turf/simulated/floor/tiled/monotile, @@ -19952,11 +19484,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/table/glass, /obj/item/storage/box/cups{ pixel_x = 7; @@ -20060,7 +19588,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "lHA" = ( /obj/machinery/recharge_station, /obj/effect/floor_decal/industrial/warning/corner{ @@ -20080,7 +19608,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "lIm" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 5 @@ -20165,11 +19693,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "lJy" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20182,8 +19706,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "lJJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -20237,6 +19760,15 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) +"lLC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "lMd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/tiled/monotile, @@ -20250,8 +19782,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "lME" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-2" @@ -20263,12 +19793,13 @@ layer = 3.1; name = "Colony Directo's Shutters" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "lMF" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -20365,7 +19896,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "lRV" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -20376,13 +19907,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "lSR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, /obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "lTa" = ( /obj/machinery/light/small{ dir = 1 @@ -20441,11 +19969,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_stairs) "lUN" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /turf/simulated/floor/wood, @@ -20504,6 +20029,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) +"lWD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "lWG" = ( /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ @@ -20571,6 +20105,9 @@ /obj/machinery/atm{ pixel_x = -32 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) "lYH" = ( @@ -20591,7 +20128,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "lZn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -20771,7 +20308,7 @@ dir = 4 }, /turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mdZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20829,10 +20366,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "mgr" = ( @@ -20850,7 +20384,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mgB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20899,9 +20433,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "mit" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research/researchdivision) "miz" = ( @@ -20959,9 +20492,9 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mjp" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/security/iaa/officeb) "mjC" = ( /obj/structure/disposalpipe/segment, @@ -20982,6 +20515,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) +"mkv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "mkH" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -21039,16 +20588,11 @@ /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "mmL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ id = "secreet"; - name = "Tintable Window" + name = "Game Room" }, -/obj/machinery/door/firedoor/glass, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/barbackmaintenance) "mnm" = ( @@ -21059,7 +20603,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mnI" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/item/radio/intercom{ @@ -21078,7 +20622,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "mow" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, @@ -21089,10 +20633,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"mpF" = ( -/obj/structure/sign/department/biblio, -/turf/simulated/wall, -/area/library) "mpY" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -21133,28 +20673,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"mra" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/item/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 24 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "mrW" = ( /obj/structure/bed/chair{ dir = 1 @@ -21189,30 +20707,27 @@ /turf/simulated/floor/reinforced, /area/tether/surfacebase/shuttle_pad) "mst" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "msB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "msR" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain, @@ -21224,6 +20739,9 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"mtC" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/hallway/lower/third_south) "mtS" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -21364,11 +20882,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "mwD" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -21389,15 +20903,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"mxc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "mxe" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -21420,11 +20925,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/rnd/research_storage) "mxM" = ( @@ -21446,6 +20947,21 @@ }, /turf/simulated/floor/wood, /area/shuttle/tourbus/general) +"myC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "mAk" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -21471,7 +20987,7 @@ pixel_x = -22; pixel_y = 22 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom2) "mBn" = ( /obj/machinery/computer/power_monitor{ @@ -21549,13 +21065,12 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "mDF" = ( /obj/structure/bed/chair/wood{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/cable/green{ @@ -21572,29 +21087,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) -"mDR" = ( -/obj/structure/grille, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/security/hos) "mEK" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, @@ -21613,8 +21107,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "mFf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "0-2" @@ -21625,6 +21117,8 @@ layer = 3.1; name = "Colony Directo's Shutters" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "mFM" = ( @@ -21726,7 +21220,7 @@ /area/crew_quarters/panic_shelter) "mIe" = ( /obj/structure/sign/greencross, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "mIg" = ( /obj/structure/disposalpipe/segment, @@ -21740,11 +21234,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "mIt" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21777,6 +21267,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "mKp" = ( @@ -21832,7 +21323,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "mKW" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/resleeving) "mLa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21842,7 +21333,7 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "mLg" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -21866,7 +21357,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "mLF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "mLT" = ( /obj/structure/cable/green{ @@ -21914,13 +21405,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"mMi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) "mMQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21936,12 +21420,20 @@ /turf/simulated/floor/water/pool, /area/crew_quarters/pool) "mNm" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) +/obj/machinery/station_map{ + pixel_y = 32 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "mNt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/bed/chair/office/dark, @@ -22254,7 +21746,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -22262,25 +21753,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"mVM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "mWf" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -22295,55 +21767,22 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"mWU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "mXn" = ( /obj/structure/closet/firecloset, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) "mXz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) +/turf/simulated/wall/r_wall/prepainted, +/area/vacant/vacant_shop) "mXI" = ( /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "mYh" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_breakroom) +/area/hallway/lower/third_south) "mYz" = ( /obj/machinery/atmospherics/component/unary/engine{ dir = 1 @@ -22426,18 +21865,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research) -"naX" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/lino, -/area/tether/surfacebase/entertainment/stage) "nbe" = ( /obj/structure/table/glass, /obj/item/material/ashtray/plastic, @@ -22446,7 +21877,7 @@ pixel_x = 24 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "nbf" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -22496,10 +21927,10 @@ /turf/simulated/floor/carpet, /area/library) "ncI" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/surgery1) "ncQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/triage) "ndk" = ( /obj/item/flame/candle, @@ -22595,6 +22026,22 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"nfL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ngq" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor, @@ -22655,10 +22102,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -22766,11 +22210,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -22822,12 +22262,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nno" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/crew_quarters/pool) "nnu" = ( @@ -22983,6 +22418,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) +"nrV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "nrZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23050,33 +22498,18 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "nsR" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized{ - id = "booth_two" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "ntb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "2-4" }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) "ntl" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -23092,8 +22525,12 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "ntv" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -23137,7 +22574,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) "nvE" = ( /obj/machinery/light{ @@ -23175,9 +22612,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "nvV" = ( -/turf/simulated/shuttle/wall/voidcraft/green{ - hard_corner = 1 - }, +/turf/simulated/wall/r_wall/prepainted, /area/tether/elevator) "nwl" = ( /obj/structure/sign/poster{ @@ -23201,11 +22636,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "nwN" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -23411,7 +22842,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "nBq" = ( /obj/structure/table/rack, /obj/random/maintenance/research, @@ -23444,19 +22875,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "nCh" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/sign/signnew/secure, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_north_airlock) "nCP" = ( @@ -23488,15 +22911,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "nDe" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics) "nEA" = ( @@ -23599,18 +23015,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "nGW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "nHh" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23630,11 +23040,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "nHQ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/air_alarm{ dir = 1; pixel_y = -25 @@ -23696,7 +23102,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "nIz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "nIF" = ( /obj/structure/cable/green{ @@ -23760,6 +23166,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"nJJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "nKi" = ( /obj/structure/table, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -23834,13 +23252,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"nLZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) "nMb" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -24000,10 +23411,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "nPA" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -24019,15 +23427,16 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nQz" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /obj/structure/closet/firecloset, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nQQ" = ( @@ -24037,11 +23446,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "nQW" = ( @@ -24054,7 +23459,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "nRX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -24136,7 +23541,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "nUx" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -24151,12 +23556,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "nUF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "nUU" = ( @@ -24348,15 +23748,8 @@ /turf/simulated/floor/wood, /area/library) "obH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) +/turf/simulated/wall/prepainted/security, +/area/tether/surfacebase/security/briefingroom) "obJ" = ( /obj/machinery/vending/sovietsoda{ dir = 8 @@ -24397,8 +23790,11 @@ /obj/machinery/atm{ pixel_y = 30 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "ocI" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24439,15 +23835,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"ocU" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/southhall) "odo" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -24522,6 +23909,26 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"oeS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ofn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24570,7 +23977,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "ogT" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/mechbay) "ogU" = ( /obj/machinery/washing_machine, @@ -24636,12 +24043,7 @@ /turf/simulated/floor/tiled, /area/rnd/research) "ois" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) "oiU" = ( @@ -24657,10 +24059,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ojn" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "iaar" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "iaar"; + name = "iaar" }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officeb) @@ -24710,11 +24111,7 @@ /obj/machinery/camera/network/research{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "okn" = ( @@ -24734,6 +24131,10 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, +/obj/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/phoron/airlock_exterior{ + pixel_x = 25 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/topairlock) "okA" = ( @@ -24745,9 +24146,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "okC" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cafeteria) "okS" = ( @@ -24828,7 +24227,7 @@ dir = 4 }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1392; master_tag = "xenobiology_north_airlock_control"; name = "Xenobiology Access Control"; @@ -24857,19 +24256,38 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "onk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officecommon) +"ono" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "ons" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"onA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "onT" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/xenobiology/xenoflora_storage) "oos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -24878,7 +24296,7 @@ /turf/simulated/wall/shull, /area/shuttle/tourbus/general) "ooR" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/library) "opb" = ( /obj/structure/table/marble, @@ -24894,8 +24312,7 @@ /obj/structure/closet/medical_wall{ pixel_y = 35 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/item/storage/firstaid/regular, @@ -24913,8 +24330,11 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "opJ" = ( /obj/structure/bed/chair, /turf/simulated/floor/tiled/techfloor, @@ -24962,15 +24382,8 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "orl" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_breakroom) "orE" = ( @@ -24983,6 +24396,25 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) +"osl" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "osB" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -25003,11 +24435,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "osD" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -25067,7 +24495,7 @@ dir = 10; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "oua" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25096,7 +24524,7 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "ovU" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/research) "owc" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -25106,9 +24534,6 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "owg" = ( @@ -25242,7 +24667,6 @@ /obj/structure/sign/department/medbay{ pixel_x = -32 }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/multi_tile/glass/polarized{ @@ -25251,6 +24675,7 @@ name = "Medbay Airlock"; req_one_access = list(5) }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "oAH" = ( @@ -25397,6 +24822,25 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"oDX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "oEg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -25448,10 +24892,12 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "oFU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oFZ" = ( @@ -25522,15 +24968,22 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "oIl" = ( -/obj/machinery/door/firedoor{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oIn" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 5; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/extinguisher_cabinet{ @@ -25585,12 +25038,9 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "oKk" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -25647,7 +25097,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "oLJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25726,7 +25176,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "oNi" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) "oNq" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -25789,7 +25239,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "oPH" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -25810,10 +25260,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "oPP" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/southhall) "oPU" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/storage) "oQa" = ( /obj/machinery/photocopier, @@ -26011,7 +25461,7 @@ /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) "oVB" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/shuttle_pad) "oVJ" = ( /obj/machinery/air_alarm{ @@ -26062,7 +25512,7 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "oXM" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment/backstage) "oYg" = ( /obj/structure/table/reinforced, @@ -26125,15 +25575,13 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 5 - }, /obj/machinery/light{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "oZC" = ( @@ -26205,11 +25653,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "pbg" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/orange{ icon_state = "0-4" @@ -26224,20 +25669,11 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) "pbQ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/wall/prepainted, +/area/tether/surfacebase/outside/outside3) "pcg" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/bar) "pcu" = ( @@ -26247,24 +25683,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) -"pcI" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "pcK" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -26408,7 +25829,7 @@ }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "pfL" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -26469,11 +25890,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -26570,11 +25987,9 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "pjB" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/panic_shelter) "pjL" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; @@ -26586,8 +26001,6 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -26600,6 +26013,8 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/bridge) "pjN" = ( @@ -26627,7 +26042,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "pkj" = ( /obj/structure/table/glass, /obj/machinery/recharger, @@ -26703,7 +26118,7 @@ /obj/structure/sign/directions/evac{ dir = 1 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment) "pmZ" = ( /obj/machinery/bodyscanner{ @@ -26785,7 +26200,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "ppg" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -26839,7 +26254,7 @@ }, /obj/machinery/light, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "ppW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -26856,11 +26271,8 @@ /obj/structure/bed/chair/wheelchair{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -26879,37 +26291,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "pqK" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hydroponics/cafegarden) "prj" = ( /turf/simulated/floor/grass, /area/hydroponics) "prs" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_south_airlock) -"pru" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) -"prv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "prB" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -26961,9 +26350,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -27003,7 +26390,7 @@ /turf/simulated/floor/grass, /area/hydroponics) "ptF" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/surface_three_hall) "ptJ" = ( /obj/effect/floor_decal/borderfloor, @@ -27100,10 +26487,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "pwx" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -27131,7 +26515,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "pyA" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -27190,8 +26574,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "pAF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ dir = 4; @@ -27205,6 +26587,8 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/captain) "pAH" = ( @@ -27362,20 +26746,9 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "pDC" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/effect/paint_stripe/purplegray, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "pDG" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -27506,6 +26879,10 @@ name = "HoP Line Shutters"; opacity = 0 }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "pGm" = ( @@ -27668,11 +27045,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "pNf" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_hallway) "pNh" = ( @@ -27712,6 +27085,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) +"pOp" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/elevator/two) "pOF" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -27742,12 +27118,37 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"pPC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "pPF" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) +"pPL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "pPW" = ( /obj/structure/railing{ dir = 1 @@ -27836,6 +27237,19 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"pRf" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "pRx" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 5 @@ -27867,15 +27281,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"pTs" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "pTP" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -27893,12 +27298,9 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "pVi" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "pVm" = ( @@ -27941,21 +27343,11 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 9 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"pWq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ +/obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "pWy" = ( /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/dark, @@ -28020,8 +27412,7 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "pXe" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/woodentable, @@ -28340,13 +27731,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_storage) "qgL" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "qhk" = ( @@ -28371,18 +27756,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"qhL" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "qhV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28417,11 +27790,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) "qix" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -28433,11 +27803,7 @@ dir = 1; pixel_y = 24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -28499,11 +27865,7 @@ "qkn" = ( /obj/structure/bed/chair/comfy, /obj/machinery/camera/network/civilian, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "qkA" = ( @@ -28583,7 +27945,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -28597,6 +27958,17 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"qlX" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "qlY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -28606,7 +27978,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) "qmz" = ( -/obj/structure/grille, /obj/structure/cable/green, /obj/machinery/door/blast/regular{ density = 0; @@ -28615,10 +27986,10 @@ name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced/polarized/full{ - id = "sec_processing" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "sec_processing"; + name = "sec_processing" }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/security/processing) "qnf" = ( @@ -28637,11 +28008,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "qnw" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/teleporter/departing) "qny" = ( /obj/structure/sign/redcross, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_first_aid) "qnH" = ( /obj/machinery/door/firedoor, @@ -28707,8 +28078,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "qqq" = ( -/turf/simulated/wall, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/wall/r_wall/prepainted/command, +/area/crew_quarters/heads/hop) "qqu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -28731,7 +28102,7 @@ name = "Xenobiology North Airlock" }, /obj/machinery/access_button/airlock_interior{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1392; master_tag = "xenobiology_north_airlock_control"; name = "Xenobiology Access Control"; @@ -28789,25 +28160,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "qsE" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) -"qtf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_hallway) "qty" = ( /obj/machinery/air_alarm{ dir = 1; @@ -28825,11 +28181,7 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "qub" = ( @@ -28840,6 +28192,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"qul" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "qux" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -29020,7 +28381,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "qyl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_stairs) "qyH" = ( /obj/structure/disposalpipe/segment{ @@ -29120,7 +28481,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "qCH" = ( /obj/structure/bed/chair/bay/shuttle{ dir = 1 @@ -29131,7 +28492,7 @@ /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "qCJ" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "qDj" = ( @@ -29296,7 +28657,7 @@ /area/crew_quarters/pool) "qKA" = ( /obj/machinery/photocopier, -/obj/machinery/firealarm{ +/obj/machinery/fire_alarm{ pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -29315,17 +28676,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"qLn" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "qLy" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -29408,7 +28758,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "qOl" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/rnd/research_storage) "qOH" = ( /obj/effect/floor_decal/borderfloorwhite, @@ -29481,17 +28831,11 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "qRK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/rnd/workshop) +/turf/simulated/wall/prepainted/civilian, +/area/triumph/surfacebase/sauna) "qSA" = ( /obj/structure/sign/department/chapel, -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/vacant/vacant_shop) "qTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -29594,6 +28938,18 @@ /area/crew_quarters/bar) "qUG" = ( /obj/machinery/door/firedoor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qUY" = ( @@ -29619,7 +28975,7 @@ /turf/simulated/floor/plating, /area/shuttle/tourbus/general) "qVC" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge) "qVG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -29628,6 +28984,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) +"qWc" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "qWg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -29732,6 +29106,21 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) +"qZH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "qZR" = ( /obj/structure/flora/pottedplant/subterranean, /obj/effect/floor_decal/borderfloorblack{ @@ -29766,6 +29155,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) "raD" = ( @@ -29815,7 +29205,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rcn" = ( /obj/machinery/air_alarm{ dir = 8; @@ -29826,6 +29216,17 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"rcv" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "rcJ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29856,7 +29257,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rdd" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -29876,14 +29277,9 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "rdR" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "red" = ( /obj/structure/table/gamblingtable, /obj/item/storage/pill_bottle/dice_nerd, @@ -29931,11 +29327,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -30057,12 +29449,10 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "rhs" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "rhH" = ( @@ -30077,25 +29467,6 @@ "ria" = ( /turf/simulated/floor/lino, /area/crew_quarters/bar) -"rjb" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass/command{ - dir = 1; - name = "Bridge"; - req_access = list(19) - }, -/obj/machinery/door/blast/regular{ - closed_layer = 10; - density = 0; - icon_state = "pdoor0"; - id = "bridge blast"; - layer = 1; - name = "Bridge Blast Doors"; - opacity = 0; - open_layer = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/bridge) "rjS" = ( /obj/structure/table/glass, /obj/machinery/light_switch{ @@ -30119,11 +29490,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -30138,13 +29505,17 @@ /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "rkU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, /turf/simulated/floor/tiled, @@ -30162,11 +29533,7 @@ pixel_y = 3 }, /obj/item/radio, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light_switch{ pixel_x = 12; pixel_y = 25 @@ -30235,13 +29602,13 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "rpW" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 }, /obj/structure/sign/double/barsign, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) "rqi" = ( /obj/structure/window/reinforced{ @@ -30299,7 +29666,7 @@ /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/freezer) "rrx" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/civilian, /area/hydroponics) "rrA" = ( /obj/structure/bed/chair/office/light, @@ -30329,14 +29696,13 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "rtw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/hydroponics/cafegarden) "rtZ" = ( @@ -30357,7 +29723,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rub" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -30365,12 +29731,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/library) -"rut" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/crew_quarters/kitchen) "ruv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -30475,13 +29835,9 @@ pixel_x = -22 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rwS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -30515,15 +29871,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/rnd/research_storage) -"rxn" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "rxv" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -30768,10 +30115,9 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "rIK" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "iaal" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "iaal"; + name = "iaal" }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officea) @@ -30827,7 +30173,7 @@ pixel_x = 27 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "rJU" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -30952,7 +30298,7 @@ }, /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "rNx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -30993,6 +30339,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/medical_stand/anesthetic, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "rPr" = ( @@ -31017,28 +30364,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"rPD" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "rPL" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -31146,11 +30471,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "rRU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/research) +"rRX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "rSM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31184,7 +30514,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "rTL" = ( /obj/structure/dispenser/oxygen, /obj/effect/floor_decal/industrial/warning{ @@ -31384,7 +30714,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "rYB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -31395,23 +30725,15 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, -/obj/structure/cable/orange{ - icon_state = "1-8" - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "rYO" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "booth_two" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two" +/obj/structure/curtain/open, +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) "rZa" = ( /obj/structure/cable/green{ @@ -31441,6 +30763,25 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"rZE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "rZS" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) @@ -31633,7 +30974,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "sge" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_storage) "sgg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31730,7 +31071,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "shY" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -31862,11 +31203,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "skn" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/hos) "sku" = ( /obj/structure/sign/xenobio, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "skw" = ( /obj/structure/table/standard, @@ -31887,11 +31228,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32038,7 +31375,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "srA" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/processing) "srL" = ( /obj/machinery/door/firedoor/glass, @@ -32071,11 +31408,7 @@ /area/rnd/outpost/xenobiology/outpost_hallway) "srY" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32105,8 +31438,11 @@ /obj/effect/floor_decal/corner/red/border{ dir = 1 }, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "stz" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -32124,9 +31460,6 @@ /turf/simulated/floor/grass, /area/hydroponics) "suh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "suk" = ( @@ -32171,7 +31504,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) +"svu" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "svR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -32182,11 +31529,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -32229,7 +31572,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "sxq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -32314,7 +31657,7 @@ /area/tether/surfacebase/surface_three_hall) "szw" = ( /obj/structure/sign/directions/evac, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_three) "sAa" = ( /obj/machinery/door/firedoor/glass, @@ -32362,8 +31705,7 @@ "sBe" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -32448,6 +31790,22 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) +"sDD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "sDF" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -32647,11 +32005,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "sKc" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -32673,7 +32027,7 @@ /obj/structure/closet/hydrant{ pixel_y = 32 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/shuttle_pad) "sKQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32783,11 +32137,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"sMZ" = ( -/obj/structure/grille, -/obj/structure/railing, -/turf/simulated/floor/tiled/techmaint, -/area/hallway/lower/third_south) "sNk" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, @@ -32822,18 +32171,11 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "sPr" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "hop_office" - }, -/obj/structure/cable/green{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hop_office" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "hop_office"; + name = "hop_office" }, +/obj/effect/paint_stripe/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "sPw" = ( @@ -32945,7 +32287,7 @@ /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "sQL" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "sRl" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -32974,8 +32316,7 @@ /area/hallway/lower/third_south) "sRy" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/white, @@ -33026,9 +32367,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "sTA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/obj/effect/floor_decal/spline/plain, +/obj/structure/bed/padded, +/obj/item/towel/random, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "sTU" = ( /obj/machinery/button/remote/blast_door{ id = "freezer"; @@ -33041,11 +32387,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -33085,6 +32427,13 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) +"sWC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/fore) "sWJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -33146,7 +32495,7 @@ /obj/item/reagent_containers/food/drinks/cans/waterbottle, /obj/machinery/light, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "sZw" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 @@ -33167,7 +32516,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "taq" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor{ @@ -33294,7 +32643,7 @@ /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/shuttle_pad) "tcL" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/research/testingrange) "tcS" = ( /obj/machinery/light{ @@ -33344,7 +32693,7 @@ /area/rnd/research/testingrange) "tec" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_decon) "teF" = ( /obj/structure/filingcabinet, @@ -33354,6 +32703,10 @@ /obj/machinery/holopad, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"teO" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "teQ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -33407,14 +32760,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/barbackmaintenance) -"thn" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "saunatint" - }, -/turf/simulated/floor/plating, -/area/triumph/surfacebase/sauna) "thQ" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -33531,6 +32876,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tnk" = ( @@ -33550,7 +32896,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tno" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -33614,7 +32960,7 @@ }, /obj/machinery/light, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tpu" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 5 @@ -33670,9 +33016,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tqE" = ( @@ -33700,23 +33043,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "trH" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_main) "tst" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -33751,12 +33083,14 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tud" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -33789,7 +33123,7 @@ /area/tether/surfacebase/cafeteria) "tvr" = ( /obj/machinery/newscaster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "tvs" = ( /obj/structure/railing, @@ -33866,8 +33200,7 @@ dir = 4; pixel_x = -22 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -33884,6 +33217,9 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/structure/cable/orange{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "txP" = ( @@ -33892,14 +33228,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/resleeving) -"txY" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_hallway) "tyA" = ( /obj/structure/table/steel, /obj/fiftyspawner/steel, @@ -33921,11 +33249,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "tzD" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "tAn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33985,6 +33311,10 @@ dir = 5 }, /obj/structure/disposalpipe/segment, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tBR" = ( @@ -34004,8 +33334,6 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "tCk" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -34016,7 +33344,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "tCm" = ( @@ -34036,6 +33364,9 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/hydroponics) +"tCR" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/tether/elevator/two) "tDK" = ( /obj/machinery/computer/atmos_alert{ dir = 8 @@ -34158,16 +33489,6 @@ /obj/machinery/ion_engine, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) -"tHu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_three) "tHF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -34269,7 +33590,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "tKt" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom2) "tKw" = ( /obj/structure/disposalpipe/segment, @@ -34323,10 +33644,25 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/tether) +"tLw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "tLK" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; +/obj/machinery/power/apc/south_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -34376,13 +33712,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"tMF" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/turf/simulated/open, -/area/tether/surfacebase/surface_three_hall) "tMI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -34439,7 +33768,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tOf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -34468,9 +33797,8 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "tOO" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "tOP" = ( @@ -34518,7 +33846,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "tPI" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) "tPS" = ( /obj/effect/floor_decal/borderfloor{ @@ -34598,15 +33926,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) -"tRx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "tRN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -34618,7 +33937,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "tRQ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/maintenance/substation/bar) "tRV" = ( /obj/effect/floor_decal/borderfloor{ @@ -34667,7 +33986,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "tTd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -34705,6 +34024,9 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) +"tTD" = ( +/turf/simulated/floor/plating, +/area/hallway/primary/fore) "tUp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -34717,6 +34039,20 @@ }, /turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) +"tUP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "tUX" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -34741,11 +34077,8 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "tVj" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "robo_surg" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/surgeryroom1) "tVF" = ( @@ -34793,7 +34126,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "tWo" = ( /obj/structure/closet/crate/bin, /turf/simulated/floor/wood, @@ -34919,30 +34252,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"tYN" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "tYY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -34957,7 +34266,6 @@ /area/tether/surfacebase/topairlock) "tZe" = ( /obj/structure/shuttle/window, -/obj/structure/grille, /turf/simulated/shuttle/plating/airless, /area/shuttle/tether) "tZk" = ( @@ -35114,7 +34422,7 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "ucY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/library/study) "ucZ" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -35123,8 +34431,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -35176,10 +34483,7 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "ufw" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, @@ -35198,11 +34502,7 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "ufJ" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -35226,7 +34526,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "ugQ" = ( /obj/machinery/air_alarm{ alarm_id = "pen_nine"; @@ -35271,13 +34571,10 @@ /turf/simulated/floor/grass, /area/hydroponics) "uih" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/command, /area/crew_quarters/captain) "uim" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -35289,7 +34586,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "uin" = ( /obj/item/stool/padded, /obj/machinery/holoposter{ @@ -35383,11 +34680,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -35492,21 +34785,15 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "unp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, +/turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "unR" = ( /obj/structure/bed/chair{ @@ -35583,7 +34870,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "upx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -35684,7 +34971,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "uqV" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/hydroponics) "urk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35757,13 +35044,9 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "usd" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -35840,7 +35123,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) "uuk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35951,18 +35234,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) "uyz" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/crew_quarters/barrestroom) -"uyO" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/surfacebase/servicebackroom) "uyW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36118,15 +35391,8 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "uDV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "uDZ" = ( @@ -36186,25 +35452,9 @@ }, /turf/simulated/floor/tiled/steel, /area/rnd/outpost/xenobiology/outpost_decon) -"uFq" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized{ - id = "booth_two" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "uFr" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_autopsy) "uGX" = ( /turf/simulated/floor/water/deep/pool, @@ -36231,7 +35481,7 @@ /area/rnd/outpost/xenobiology/outpost_hallway) "uIv" = ( /obj/machinery/newscaster, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "uIy" = ( /obj/structure/cable/green{ @@ -36246,7 +35496,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "uIN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -36349,8 +35599,7 @@ /obj/machinery/camera/network/medbay{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24; pixel_y = -8 }, @@ -36384,6 +35633,28 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 28 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"uKP" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uLM" = ( @@ -36437,7 +35708,7 @@ icon_state = "1-8" }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "uMw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -36470,7 +35741,7 @@ dir = 8; pixel_x = 10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "uNE" = ( /obj/structure/table/bench/wooden, @@ -36539,6 +35810,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/robotics/surgeryroom2) +"uQE" = ( +/obj/structure/grille, +/obj/structure/railing, +/turf/simulated/floor/tiled/techmaint, +/area/hallway/primary/fore) "uQH" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ @@ -36562,8 +35838,11 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/camera/network/tether, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "uRH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -36593,11 +35872,31 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "uSt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) +"uSB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "uSK" = ( /obj/machinery/door/airlock{ id_tag = "bathroomlock17"; @@ -36614,7 +35913,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "uTj" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/chemistry) "uTk" = ( /turf/simulated/shuttle/floor/black, @@ -36684,7 +35983,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -36789,6 +36087,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uYD" = ( @@ -36811,10 +36110,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "uZM" = ( @@ -36883,6 +36179,15 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"vcu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/freezer, +/area/crew_quarters/pool) "vcz" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -36930,7 +36235,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "vdV" = ( /obj/machinery/optable, /obj/machinery/oxygen_pump/anesthetic{ @@ -37033,8 +36338,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "vgh" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/borderfloor{ @@ -37062,10 +36366,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28; +/obj/machinery/power/apc/west_mount{ req_access = list(); req_one_access = list(11,67) }, @@ -37123,13 +36424,12 @@ dir = 8; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment) "viC" = ( /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -37151,7 +36451,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "vjk" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -37161,7 +36461,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "vkE" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -37197,11 +36497,8 @@ /turf/simulated/floor/wood, /area/library) "vmd" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -37211,7 +36508,7 @@ "vmJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "vmO" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -37265,7 +36562,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "vnI" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor, @@ -37299,8 +36596,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"vqr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "vqw" = ( /obj/structure/curtain/open, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) "vrb" = ( @@ -37331,31 +36642,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) -"vtr" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) "vud" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "hop_office" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - dir = 1 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "hop_office" +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hop) +/turf/simulated/floor/plating/eris/under, +/area/shuttle/tourbus/cockpit) "vuf" = ( /obj/structure/table/marble, /obj/effect/floor_decal/corner/grey/diagonal, @@ -37380,6 +36677,12 @@ /obj/structure/bed/chair/sofa/brown/left, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/bar) +"vuW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "vvl" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -37497,11 +36800,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "vzq" = ( @@ -37539,11 +36838,7 @@ /area/crew_quarters/heads/hop) "vzP" = ( /obj/structure/table/woodentable, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/light/small{ dir = 1 }, @@ -37582,26 +36877,8 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "vBf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) "vBN" = ( @@ -37613,8 +36890,7 @@ dir = 4 }, /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/camera/network/civilian{ @@ -37640,7 +36916,7 @@ /area/rnd/outpost/xenobiology/outpost_north_airlock) "vCM" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_breakroom) "vCX" = ( /obj/structure/disposalpipe/segment{ @@ -37741,11 +37017,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -37813,6 +37085,27 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"vGn" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "vGG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -37845,17 +37138,6 @@ }, /turf/simulated/floor/wood, /area/library) -"vHn" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two_ex" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "vHt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -37918,6 +37200,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "vJD" = ( @@ -37925,7 +37210,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "vJL" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -37952,14 +37237,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "vKj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/shutters{ closed_layer = 10; density = 0; @@ -37971,7 +37250,8 @@ opacity = 0; open_layer = 1 }, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) "vKk" = ( @@ -38105,9 +37385,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "vNK" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/hallway/lower/third_south) "vOL" = ( @@ -38181,11 +37459,7 @@ /obj/item/lightreplacer, /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -38203,6 +37477,9 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) +"vRi" = ( +/turf/simulated/open, +/area/tether/elevator) "vRx" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -38248,17 +37525,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vRG" = ( -/obj/machinery/station_map{ - pixel_y = 32 +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "vRI" = ( @@ -38318,7 +37595,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "vSZ" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/lobby) "vTc" = ( /obj/effect/floor_decal/borderfloor, @@ -38371,6 +37648,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) +"vTN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "vTX" = ( /obj/structure/bed/chair/wood{ dir = 4 @@ -38424,19 +37714,6 @@ }, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) -"vVx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/wall, -/area/tether/surfacebase/medical/storage) "vVO" = ( /obj/machinery/door/window/westright{ req_one_access = list(35,28) @@ -38576,7 +37853,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "vXj" = ( /obj/structure/toilet{ dir = 8 @@ -38626,6 +37903,24 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) +"vXY" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "vYa" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -38663,7 +37958,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "wan" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -38827,11 +38122,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "wdG" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -38946,10 +38238,7 @@ /turf/simulated/wall/shull, /area/shuttle/tourbus/general) "wiD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) @@ -38995,8 +38284,7 @@ /obj/random/maintenance/medical, /obj/random/maintenance/clean, /obj/random/junk, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor{ @@ -39036,13 +38324,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) -"wkI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/crew_quarters/pool) "wlz" = ( /obj/structure/table/standard, /obj/item/toy/plushie/coffee_fox, @@ -39058,7 +38339,7 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "wlQ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted/command, /area/bridge/bridge_hallway) "wmp" = ( /obj/effect/floor_decal/spline/plain{ @@ -39066,15 +38347,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"wmP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "wmQ" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -39137,29 +38409,37 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "woS" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, -/area/crew_quarters/recreation_area) +/area/rnd/outpost/xenobiology/outpost_hallway) "woW" = ( /obj/machinery/door/airlock/multi_tile/glass{ id_tag = "MedbayTriage"; name = "Medbay Airlock"; req_one_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "wpb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "DRAMATIC"; + name = "Dramatic Blast Door" + }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "Druma"; + name = "Entertainment Shutters" + }, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, -/area/crew_quarters/recreation_area) +/area/tether/surfacebase/entertainment) "wpq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -39345,7 +38625,7 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "wwu" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -39391,7 +38671,6 @@ pixel_y = -5 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 27 }, /turf/simulated/floor/tiled/dark, @@ -39437,8 +38716,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -39465,6 +38743,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wyd" = ( @@ -39479,7 +38760,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/machinery/door/firedoor/glass, @@ -39512,20 +38792,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "iaar"; + name = "iaar" + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"wyL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/botanystorage) "wyP" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -39542,7 +38814,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "wyT" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -39592,7 +38864,7 @@ /area/rnd/outpost/xenobiology/outpost_stairs) "wAK" = ( /obj/machinery/oxygen_pump/anesthetic, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/surgery2) "wAO" = ( /obj/machinery/light, @@ -39658,19 +38930,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "wCJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "surfbriglockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/security/upperhall) "wCO" = ( @@ -39826,21 +39086,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "wEu" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/techfloor_grid, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "wEA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -39864,7 +39112,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "wGd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -40008,19 +39256,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"wMQ" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "booth_one" - }, -/obj/structure/window/reinforced/polarized{ - id = "booth_two" - }, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) "wNv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40068,7 +39303,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/effect/floor_decal/spline/plain{ @@ -40159,16 +39393,15 @@ /turf/simulated/floor, /area/bridge/bridge_hallway) "wRT" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "saunatint" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "saunatint"; + name = "saunatint" }, /turf/simulated/floor/plating, /area/triumph/surfacebase/sauna) "wSi" = ( /obj/structure/sign/department/xenolab, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) "wSx" = ( /obj/structure/disposalpipe/segment{ @@ -40184,19 +39417,10 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "wTy" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_two" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/bar) +/turf/simulated/wall/prepainted/civilian, +/area/tether/surfacebase/north_stairs_three) "wUb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -40272,16 +39496,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "wVV" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -40348,7 +39569,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wXY" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/science, /area/rnd/robotics/surgeryroom1) "wZv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -40393,7 +39614,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "xaf" = ( /obj/structure/sign/nosmoking_1{ pixel_x = 32 @@ -40412,11 +39633,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "xag" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -40526,7 +39743,7 @@ /obj/item/clothing/under/swimsuit/stripper/captain, /obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "xfq" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -40572,18 +39789,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"xgL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xhp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -40626,12 +39831,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "xiL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) "xiZ" = ( @@ -40651,7 +39855,7 @@ /obj/structure/curtain/open/shower, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/area/triumph/surfacebase/sauna) "xjq" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -40756,8 +39960,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/techfloor, @@ -40776,11 +39979,23 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "xnO" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) @@ -40792,7 +40007,6 @@ }, /obj/machinery/door/blast/shutters{ id = "kitchen2"; - layer = 3.3; name = "Kitchen Shutters" }, /obj/structure/cable/green{ @@ -40972,11 +40186,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "xsC" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/medbay{ @@ -41089,8 +40308,7 @@ dir = 8; pixel_x = -12 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -41187,8 +40405,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/status_display{ @@ -41214,23 +40431,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) -"xyG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/camera/network/tether, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xyK" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -41239,7 +40439,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "xyZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -41254,17 +40454,6 @@ dir = 1 }, /area/tether/surfacebase/shuttle_pad) -"xzF" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "xzG" = ( /obj/structure/bed/chair/office/dark, /obj/machinery/button/remote/blast_door{ @@ -41342,7 +40531,7 @@ dir = 8; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/entertainment/backstage) "xBW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -41351,9 +40540,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xCi" = ( @@ -41376,6 +40562,9 @@ dir = 4 }, /obj/structure/disposalpipe/junction, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xCJ" = ( @@ -41395,7 +40584,7 @@ dir = 8; pixel_y = -10 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/lobby) "xCK" = ( /obj/structure/railing{ @@ -41405,11 +40594,7 @@ /area/tether/surfacebase/outside/outside3) "xCM" = ( /obj/structure/table/standard, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -41434,10 +40619,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) "xDq" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tether/surfacebase/cafeteria) "xDt" = ( @@ -41502,6 +40684,28 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) +"xGb" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "xGi" = ( /obj/structure/table/steel, /obj/effect/floor_decal/borderfloor{ @@ -41521,10 +40725,7 @@ pixel_x = 28 }, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "xGm" = ( @@ -41564,7 +40765,7 @@ dir = 1; pixel_y = -4 }, -/turf/simulated/wall, +/turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "xHR" = ( /obj/structure/bed/chair{ @@ -41581,26 +40782,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) -"xHU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) "xIc" = ( /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/shuttle_pad; @@ -41634,11 +40815,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/machinery/air_alarm{ dir = 8; pixel_x = 24 @@ -41670,7 +40847,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/port) "xIU" = ( /obj/structure/closet/secure_closet/hop2, /turf/simulated/floor/tiled, @@ -41714,10 +40891,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "xKc" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -41780,14 +40954,8 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "xKF" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/polarized/full{ - id = "booth_one_ex" - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) "xKJ" = ( @@ -41831,11 +40999,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "xLS" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "xMN" = ( @@ -41883,13 +41047,30 @@ /area/rnd/robotics) "xOd" = ( /obj/structure/table/reinforced, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) +"xOe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "xOq" = ( /obj/structure/railing{ dir = 4 @@ -41912,38 +41093,24 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"xPq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/tourbus/cockpit) "xPD" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, +/obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/rnd/research_storage) +"xPN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "xQe" = ( /obj/machinery/light_switch{ pixel_y = 25 @@ -42020,7 +41187,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/starboard) "xRh" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -42073,15 +41240,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) -"xRZ" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) "xSf" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -42117,7 +41275,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "xSZ" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/botanystorage) "xTf" = ( /turf/simulated/floor/tiled/freezer, @@ -42145,12 +41303,6 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/hydroponics) -"xUY" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/rnd/robotics) "xVm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -42172,7 +41324,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/hallway/primary/fore) "xVK" = ( /obj/machinery/air_alarm{ dir = 1; @@ -42246,6 +41398,21 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) +"xXs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "xXz" = ( /obj/machinery/papershredder, /obj/machinery/air_alarm{ @@ -42255,7 +41422,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "xYd" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/prepainted, /area/hallway/lower/third_south) "xYk" = ( /obj/effect/floor_decal/borderfloor{ @@ -42303,6 +41470,16 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) +"xZh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "xZr" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -42361,11 +41538,15 @@ /area/tether/surfacebase/medical/lobby) "yaJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/bridge) "yaQ" = ( @@ -42447,18 +41628,15 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "yeu" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "surfsurgery2" +/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ + id = "surfsurgery1"; + name = "surfsurgery1" }, +/obj/effect/paint_stripe/babyblue, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/surgery1) "yeM" = ( @@ -42472,21 +41650,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "yeV" = ( -/obj/effect/floor_decal/corner/blue/diagonal, -/obj/effect/floor_decal/corner/blue/diagonal{ - dir = 4 - }, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/turf/simulated/wall/prepainted/command, /area/tether/surfacebase/surface_three_hall) "ygq" = ( /obj/structure/bed/chair{ @@ -42516,11 +41680,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "yhk" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ icon_state = "0-2" }, @@ -42562,7 +41722,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "yja" = ( -/turf/simulated/wall, +/turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/barbackmaintenance) "yjc" = ( /obj/machinery/atmospherics/portables_connector, @@ -42575,15 +41735,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "yjJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "ykw" = ( @@ -42635,19 +41788,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) -"yli" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/servicebackroom) +/area/hallway/primary/starboard) "ylC" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -58994,14 +58135,14 @@ eGm eGm eGm eGm -pWq +nUF acY gXn gXn gXn gJl acY -tHu +nUF eGm eGm eGm @@ -59187,16 +58328,16 @@ eGm eGm eGm eGm -pWq -uSt +nUF +nUF bBs lmj bGG bGG bGG mnI -uSt -tHu +nUF +nUF eGm eGm eGm @@ -59380,8 +58521,8 @@ eGm eGm eGm eGm -pWq -uSt +nUF +nUF uNE bGG hGp @@ -59390,8 +58531,8 @@ eYA vwj bGG uNE -uSt -tHu +nUF +nUF eGm eGm eGm @@ -59590,7 +58731,7 @@ acY rdR rdR rdR -ptF +eiE eGm eGm eGm @@ -59767,7 +58908,7 @@ eGm eGm eGm eGm -pbQ +nUF gXn bGG hGp @@ -59784,7 +58925,7 @@ uSt asD eQZ mdi -mMi +rdR eGm eGm eGm @@ -59961,7 +59102,7 @@ eGm eGm eGm eGm -pbQ +nUF bGG bGG qkm @@ -59978,7 +59119,7 @@ dUJ mnm jPV mjl -mMi +rdR eGm eGm eGm @@ -60012,23 +59153,23 @@ eGm eGm eGm iQH -qtf -qtf -qtf +woS +woS +woS bPa -pNf +woS iQH iQH -pNf +woS iQH iQH -pNf +woS bPa iQH -pNf +woS iQH iQH -pNf +woS iQH wSi sku @@ -60155,7 +59296,7 @@ eGm eGm eGm eGm -pbQ +nUF gXn bGG xiZ @@ -60171,8 +59312,8 @@ bGG uSt xyK xVw -pIo -mMi +qlX +rdR eGm eGm eGm @@ -60364,9 +59505,9 @@ gbb acY acY sZZ -mQZ -pIo -mMi +lLC +qlX +rdR eGm eGm eGm @@ -60544,8 +59685,8 @@ eGm eGm eGm eGm -ntb -uSt +nUF +nUF uNE qkm dSp @@ -60554,13 +59695,13 @@ hQd dSp jgM uNE -uSt -gUb -ptF -jCY -mQZ -pIo -mMi +nUF +nUF +eiE +aaC +sWC +cUW +rdR eGm eGm eGm @@ -60739,21 +59880,21 @@ eGm eGm eGm eGm -ntb -uSt +nUF +nUF gNa jXN dSp oxE fHk qUf -uSt -iGh +nUF +nUF eGm -ptF -jCY -mQZ -pIo +eiE +grE +csF +svu iGE nno nno @@ -60767,7 +59908,7 @@ nno iGE iGE iGE -jSJ +nno eGm eGm eGm @@ -60792,19 +59933,19 @@ dsq nCh vWQ oNi -txY +woS iQH iQH -txY +woS iQH iQH -txY +woS iQH iQH -txY +woS iQH iQH -txY +pNf iQH wSi sku @@ -60934,20 +60075,20 @@ eGm eGm eGm eGm -ntb +nUF acY mwD dSp oxE ief acY -iGh +nUF eGm eGm -ptF +eiE jCY -mQZ -pIo +lLC +qlX iGE kSa cyk @@ -60961,7 +60102,7 @@ koO xHR pXd qKt -wkI +nno eGm eGm eGm @@ -61129,18 +60270,18 @@ eGm eGm eGm eGm -pbQ +nUF wKN vTp xwD sxw -nLZ +nUF eGm eGm eGm -ptF +eiE rNu -mQZ +lLC ppS iGE goh @@ -61323,19 +60464,19 @@ eGm eGm eGm eGm -pbQ +nUF hjX uxR afh uKN -nLZ +nUF eGm -ptF -ptF -ptF -jCY -mQZ -pIo +eiE +eiE +eiE +mkv +lLC +qlX iGE eGl jhF @@ -61347,8 +60488,8 @@ ylC ylC ylC qnf -xsp -aak +vcu +sTA iGE eGm eGm @@ -61393,7 +60534,7 @@ dOV xCK tZk tZk -mYh +orl pPF oGX wKf @@ -61518,18 +60659,18 @@ eGm eGm eGm acY -gUb -gUb -gUb -gUb +nUF +nUF +nUF +nUF acY eGm -ptF -fET -nFz +eiE +dia +uQE mgr -mQZ -pIo +lLC +qlX iGE fKu nCP @@ -61541,7 +60682,7 @@ uGX uGX uGX def -xsp +fmD koz iGE eGm @@ -61587,7 +60728,7 @@ dOV xCK tZk tZk -mYh +orl raW lCl kDF @@ -61718,12 +60859,12 @@ eGm eGm eGm eGm -ptF -ptF -ptF +eiE +eiE +eiE jCY -mQZ -pIo +lLC +qlX iGE fEl nCP @@ -61735,9 +60876,9 @@ uGX uGX uGX def -xsp -aak -wkI +kio +iRU +nno eGm eGm eGm @@ -61917,7 +61058,7 @@ chu vde poQ svq -pIo +qlX iGE gaD nCP @@ -61931,7 +61072,7 @@ uGX def xsp iYo -wkI +nno eGm eGm eGm @@ -61955,7 +61096,7 @@ oNi jlw sqA iUp -oNi +tPI tcL tcL tcL @@ -61989,8 +61130,8 @@ ftd ftd ftd ftd -icv -icv +trH +trH sge sge sge @@ -62111,7 +61252,7 @@ gpz gpz wVQ hUG -fVH +cUW iGE swW sfv @@ -62123,9 +61264,9 @@ mqX uGX uGX def -xsp -aak -wkI +lkI +sTA +nno eGm eGm eGm @@ -62305,7 +61446,7 @@ wxz rIK lZk rYq -pIo +qlX fGn sch mOE @@ -62511,8 +61652,8 @@ iXH iXH iXH oWp -xsp -aak +nJJ +iRU iGE eGm eGm @@ -62523,7 +61664,7 @@ eGm eGm eGm eGm -qRK +iXC eDq nlp oIR @@ -62717,7 +61858,7 @@ eGm eGm eGm eGm -qRK +iXC aVY aBU aVv @@ -62901,7 +62042,7 @@ mMS wxR xsp aak -wkI +nno eGm eGm eGm @@ -62911,7 +62052,7 @@ eGm eGm eGm eGm -qRK +iXC aVY xDw wKZ @@ -63080,7 +62221,7 @@ rxv rxv icq tNs -mQZ +lLC kYg fGn sch @@ -63095,7 +62236,7 @@ iUE aCO lwe jpm -wkI +nno eGm eGm eGm @@ -63275,7 +62416,7 @@ eDm rav nQW pyq -ptJ +rcv fGn phm fDc @@ -63287,9 +62428,9 @@ oCZ oCZ eIH oCZ -oCZ +jbX krE -wkI +nno eGm eGm eGm @@ -63299,7 +62440,7 @@ eGm eGm eGm eGm -qRK +iXC qYQ bWr njK @@ -63481,7 +62622,7 @@ pjS pjS fgV nUb -nUb +caX qKd iGE eGm @@ -63493,7 +62634,7 @@ eGm eGm eGm eGm -qRK +iXC cBT hAe pia @@ -63662,7 +62803,7 @@ wyx tmP ojn ixe -mQZ +lLC lRG iGE jjJ @@ -63687,7 +62828,7 @@ eGm eGm eGm eGm -qRK +iXC jlL tyA vNz @@ -63844,8 +62985,8 @@ jjc jjc eGm eGm -gtb -gtb +bXW +bXW ktH mwl mjp @@ -63856,12 +62997,12 @@ cil urA ojn ixe -mQZ +lLC gjx jga jga kal -woS +jUo jUo jga jga @@ -64035,10 +63176,10 @@ eGm wCJ cdW cdW -hzl +wCJ eGm eGm -gtb +bXW tKN oUs esZ @@ -64050,7 +63191,7 @@ nAv lnJ ojn ixe -mQZ +lLC mDw jga dox @@ -64070,7 +63211,7 @@ lGR nsK kLX eGm -pTs +aPp rUN mec gTd @@ -64229,7 +63370,7 @@ eGm wCJ cdW cdW -hzl +wCJ eGm eGm onk @@ -64244,9 +63385,9 @@ rwX wwA mjp efK -mQZ -ptJ -wpb +lLC +rcv +jUo vng fJn sWW @@ -64254,9 +63395,9 @@ sWW sWW dsW jga -jCY -uAE -ptJ +vTN +kpP +fEb kLX dRa svR @@ -64414,12 +63555,12 @@ eCd dOV lig lig -aDh -aDh +iLn +iLn lig lig -aDh -aDh +iLn +iLn lig ibF tvs @@ -64440,7 +63581,7 @@ mjp ssL msB eLl -wpb +jUo vng fJn saM @@ -64449,7 +63590,7 @@ sWW rLQ jga euI -uAE +kpP goa kLX srU @@ -64458,11 +63599,11 @@ mlK mCi kLX ebZ -pTs +aPp cyg -laF -mxc -laF +qOl +xPD +qOl ugX aPa eZH @@ -64620,7 +63761,7 @@ fBe jjc eGm eGm -gtb +bXW jrG tst xYT @@ -64629,12 +63770,12 @@ baD mBG jjc jJP -ixt -gqL +tTD +eiE ixe -szv -ptJ -wpb +kwu +rcv +jUo pou oGT sII @@ -64652,30 +63793,30 @@ kLX kLX kLX ebZ -laF -mxc -laF +qOl +xPD +qOl lYH -laF +qOl rxk xPD ovU -hlG +ovU rRU rRU aNo -eLe +naT rRU -hlG +ovU hfy eGb hfy aji aji aji -hvH +cjB atk -hvH +cjB aji tVj buX @@ -64826,16 +63967,16 @@ jjc jjc jjc atb -mQZ -ptJ -wpb +lLC +rcv +jUo hNm xnN rAh atT tqE rQN -wpb +jUo kAc rsS gXX @@ -64846,7 +63987,7 @@ emv dBV kLX ebZ -laF +qOl cfV oAM ddX @@ -64864,7 +64005,7 @@ rRU jDv qEF nin -hvH +cjB ihU pbe mPJ @@ -65020,8 +64161,8 @@ hKU dCm iTb ixe -mQZ -ptJ +lLC +rcv fYm fYm fYm @@ -65030,8 +64171,8 @@ lnO fYm fYm fYm -lHP -rsS +oKU +ayH cCP kLX kLX @@ -65214,7 +64355,7 @@ sGG wqG iTb ixe -mQZ +lLC toN fYm aoi @@ -65227,19 +64368,19 @@ fYm dMR rsS mWf -kTG -kTG +qZH +qZH pTP xIP xab -ptF +cyt ebZ xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU oKJ @@ -65252,7 +64393,7 @@ rRU rUm uBv alz -hvH +cjB dRD bLy okS @@ -65417,23 +64558,23 @@ mVp mqy ioa ioa -thn +wRT qrK hWS viJ -quY -quY -quY +vuW +vuW +vuW bgf fXS lSR qKD xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU liW @@ -65602,32 +64743,32 @@ jqH grq iTb cWI -mQZ +lLC dof -thn +wRT oVf hEs hEs dnv jsD ioa -thn +wRT loZ bCo bJR rJK guH jlJ -uAE +kpP bvv -mMi +aVN eGm xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU mcx @@ -65636,7 +64777,7 @@ hLU aTi abl xTg -hlG +ovU gTl rZl gzn @@ -65770,7 +64911,7 @@ tZk tZk eCd dOV -iQo +jsE kBT biu fMk @@ -65796,9 +64937,9 @@ sfU fEA iTb cWI -mQZ +lLC dof -thn +wRT qUY oCa oCa @@ -65806,22 +64947,22 @@ hwy jsD czU fYm -kLX -kLX +fYm +fYm pfB -kLX -kLX +fYm +fYm pjT -kiZ +fZp bvv -ptF +cyt eGm xYd nvV -rZS -rZS -rZS -rZS +vRi +vRi +vRi +vRi nvV ovU gCz @@ -65830,7 +64971,7 @@ pDh lhr xOF pYM -hlG +ovU pDv hQK jVq @@ -65964,7 +65105,7 @@ tZk tZk eCd dOV -iQo +jsE aeX aeX cDH @@ -65990,9 +65131,9 @@ jjc jjc jjc aDw -mQZ +lLC dof -thn +wRT qUY oCa oCa @@ -66004,11 +65145,11 @@ bww iqT uMd xfd -kLX +fYm lHP -kiZ +fZp bvv -mMi +cyt eGm xYd nvV @@ -66018,13 +65159,13 @@ rZS aGP nvV ovU -iEl +rRU nzV naT -hlG +ovU wNL xxk -hlG +ovU nBx fgY kwQ @@ -66042,7 +65183,7 @@ ogT txP sXR bkm -awl +fXg eGm eGm eGm @@ -66184,9 +65325,9 @@ xdQ xiE jjc cWI -mQZ +lLC dof -thn +wRT mmE aGv aGv @@ -66198,32 +65339,32 @@ gVl vmJ mLa aZM -kLX +fYm dna -kiZ +fZp bvv -mMi -eGm -gJU -gJU -gJU +cyt +pbQ +xYd +xYd +mNm vRG qUG oIl nQz -hlG +ovU dXD hha uUq -hlG -hlG +ovU +ovU bTM -hlG +ovU mit gwF mit aji -xUY +cjB hrH aji ogT @@ -66236,7 +65377,7 @@ ogT qAc ghn pbi -awl +fXg eGm eGm eGm @@ -66352,7 +65493,7 @@ tZk tZk eCd dOV -iQo +jsE mcm aeX xJf @@ -66378,30 +65519,30 @@ qoC fYO jjc vnr -szv +kwu koF fYm -thn wRT -fYm -fYm -fYm -fYm -fYm +wRT +qRK +qRK +qRK +qRK +qRK kmn -sTA +its cUL sYI -kLX -oKU -saK +fYm +qWc +vqr ntl -ptF -eGm -eGm -eGm -gJU -mra +vXY +flb +xGb +flb +jjy +pXZ pXZ qpO kNe @@ -66430,7 +65571,7 @@ ogT gXm raD wux -awl +fXg eGm eGm eGm @@ -66572,31 +65713,31 @@ aAI vIi jjc uim -szv -ptJ +kwu +rcv mLF fID yef -mLF +wTy xmn ckD hAs -mLF +wTy wvZ cmk lHr roN -kLX +fYm ocA -kiZ -bvv -mMi -eGm -eGm -eGm -bce -prv -cbM +kiy +xPN +xZh +kXp +jcG +nmQ +nmQ +nmQ +oMt oFU xtM oua @@ -66624,7 +65765,7 @@ ogT nPA ilA gsJ -awl +fXg eGm eGm eGm @@ -66740,7 +65881,7 @@ tZk tZk eCd dOV -iQo +jsE aeX aeX vch @@ -66750,14 +65891,14 @@ aeX wuK skn kni -kni +obH qXw -kni -kni +obH +obH gXO gXO rhs -kni +obH tMU xtX vWs @@ -66766,7 +65907,7 @@ soK lGw eGW cWI -mQZ +lLC mDw mLF ssc @@ -66775,24 +65916,24 @@ sAa bNt hLT mGO -mLF +wTy dSJ iIJ iIJ xjn -kLX +fYm uRE -uAE -bvv -mMi -eGm -eGm -eGm -bce -xyG -jsx +xXs +dYS +tLw +jqi +oDX +pPL +rZE +pXZ +pXZ fvy -odE +vGn mMd odE wDK @@ -66818,7 +65959,7 @@ ogT pWy del eby -cfz +fXg eGm eGm eGm @@ -66934,7 +66075,7 @@ tZk tZk eCd dOV -iQo +jsE ixZ aeX lXI @@ -66951,7 +66092,7 @@ gjP gSM gSM eBk -kni +obH jUv vRK vSZ @@ -66960,33 +66101,33 @@ tLW vSZ vSZ cWI -szv -ptJ +kwu +rcv mLF pVi jwJ -mLF +wTy szw -mLF -mLF -mLF -ptF -ptF -ptF -ptF -kLX +wTy +wTy +wTy +fYm +fYm +fYm +fYm +fYm dIO -uAE +xXs bvv -ptF -eGm -eGm -eGm -gJU -mVM +xYd +xYd +dBm +mtC +coV +rkU rkU etf -ucY +kJa ucY ucY ucY @@ -67013,12 +66154,12 @@ mKW mKW mKW mKW -aMc -aMc +fGZ +fGZ oVB oVB -aMc -aMc +fGZ +fGZ oVB eGm eGm @@ -67129,12 +66270,12 @@ tZk eCd dOV skn -mDR -mDR +jsE +jsE skn skn -mDR -mDR +jsE +jsE skn skn vcA @@ -67145,7 +66286,7 @@ gnm qub unR jct -kni +obH kWn uIN lxc @@ -67154,8 +66295,8 @@ uou xjq idP cWI -szv -ptJ +kwu +rcv xYX ybN cPg @@ -67169,18 +66310,18 @@ cFx dEh ptF nrO -lHP -uAE +sDD +xXs iGD -ptF -gJU -gJU -gJU -gJU -xHU -rkU -iwI -ucY +xYd +gpp +ggC +tCR +tCR +pOp +pOp +tCR +tCR rhH jIV kVB @@ -67213,7 +66354,7 @@ sxj clX clX uww -pru +fGZ eGm eGm eGm @@ -67339,7 +66480,7 @@ kPZ qcH gQS knX -kni +obH cCG bnm mwt @@ -67363,18 +66504,18 @@ dgz ixt ptF nav -lHP -uAE +sDD +xXs bvv -ptF -gJU -gJU -pJQ -sMZ -rPD -xgL +xYd +gpp +ggC +tCR bAz -ucY +bAz +bAz +bAz +tCR kFH oRO jPA @@ -67407,7 +66548,7 @@ dUy dUy dUy sDa -pru +fGZ eGm eGm eGm @@ -67533,7 +66674,7 @@ qHD hWH unR pkL -kni +obH mwz uIN iVh @@ -67560,15 +66701,15 @@ ptF kSN opq nUm -ptF -gJU -gJU -gJU -gJU -ehm -jps -cUn -ucY +xYd +xYd +dBm +tCR +bAz +bAz +bAz +bAz +tCR suk vQT pXe @@ -67592,9 +66733,9 @@ apy gMY gMY kFx -gwU -gwU -gwU +jiE +jiE +jiE kFx rNN xKJ @@ -67727,14 +66868,14 @@ kPZ qcH unR dvp -kni +obH bsL sgl cLp eCh bqu kaB -idP +bEK mPw mQZ jbP @@ -67756,13 +66897,13 @@ gqY osB kTG wyc -pTP -kTG -dFK -jDg -mWU -fBy -ucY +eST +tCR +bAz +bAz +bAz +bAz +tCR ucY oYS ucY @@ -67795,7 +66936,7 @@ kFx wix dUy sDa -pru +fGZ eGm eGm eGm @@ -67912,7 +67053,7 @@ eGm eGm eGm eGm -kni +obH kXU hTk nad @@ -67921,7 +67062,7 @@ ael fxp unR dvp -kni +obH jBR dZl teQ @@ -67935,28 +67076,28 @@ quY iHe iHe nWd -asJ -asJ +iMe +nrV asJ asJ pvn -asJ +iMe aUe iHe iHe iHe -iHe +qul xCs -iHe -iHe -iHe -iHe -iHe -tRx -wmP -rxn -fBy -fyE +kAD +gJC +lWD +ixf +tCR +bAz +bAz +bAz +bAz +tCR lrz nRX wyX @@ -67975,7 +67116,7 @@ vTc vNK bRe dUy -xPq +vud ulb qCH tLK @@ -67989,7 +67130,7 @@ pvw kFx dUy sDa -pru +fGZ eGm eGm eGm @@ -68106,7 +67247,7 @@ eGm eGm eGm eGm -kni +obH qXh bHH bHH @@ -68115,7 +67256,7 @@ uUz wCO bHH paU -kni +obH tby dPO peq @@ -68129,28 +67270,28 @@ mep djL djL djL -djL -djL +nfL +iNu djL djL dKc -djL +nfL jPj dYm dYm dYm -dYm -dYm +uSB +gbq oZj iOW gzU -avT -avT -avT -cow -pAa -tYN -mpF +xOe +tCR +tCR +tCR +tCR +tCR +tCR dbL blA ncd @@ -68162,14 +67303,14 @@ sKQ lsP irW asn -mpF +gAM xgo kFC pzX -gJU +xYd pfN dUy -xPq +vud cXk jOc kmv @@ -68193,13 +67334,13 @@ eGm eGm eGm eGm -fEn -fEn -fEn +fFk +fFk +fFk akS dCa -fEn -fEn +fFk +fFk eGm tZk tZk @@ -68300,48 +67441,48 @@ eGm eGm eGm eGm -kni -kni -kni -kni -kni -kni -kni -kni -kni -kni +obH +obH +obH +obH +obH +obH +obH +obH +obH +obH vSZ vSZ vSZ rgE eTH ldD -dLp +vSZ egD uAE pIo -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -uih -qVC -rjb +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ +dyJ qVC +feZ +ehy gDK -gDK -tMF -quL +eaC +eaC +eaC xnO aeK uIO @@ -68377,7 +67518,7 @@ wUb kFx dUy sDa -pru +fGZ eGm eGm eGm @@ -68387,13 +67528,13 @@ eGm eGm eGm eGm -fEn +fFk xFl aiC tYY urJ jvn -fEn +fFk eGm eGm tZk @@ -68511,10 +67652,10 @@ rUO vSZ vSZ fKZ -cWI -uAE -pIo -uih +iIW +dPz +fVH +dyJ xMO cvC uih @@ -68530,13 +67671,13 @@ qix bPe rXR qVC -bPN -qVC -sHq -sHq -jiB -quL -szv +feZ +hfu +afv +rRX +rRX +rRX +pAa hRE tcx uOF @@ -68557,7 +67698,7 @@ rBT vNK bRe dUy -adK +awl fSk oej nmZ @@ -68571,7 +67712,7 @@ laf kFx dUy sDa -pru +fGZ eGm eGm eGm @@ -68581,13 +67722,13 @@ eGm eGm eGm eGm -fEn +fFk yhk iNx neW xLb pPW -fEn +fFk eGm eGm dPd @@ -68708,7 +67849,7 @@ nFz uEQ uAE pIo -uih +dyJ jid eUA cxl @@ -68724,15 +67865,15 @@ dVF lRy okn qVC -fza -qVC -sHq -sHq -jiB -quL +aLR +hVA +bWf +osl +crP +crl szv icz -mpF +gAM vlQ xnw aMK @@ -68748,10 +67889,10 @@ ooR ezc woF ioy -gJU +xYd shm dUy -adK +awl pSE qyS twj @@ -68775,17 +67916,17 @@ qnw qnw eGm eGm -fEn -fEn -fEn +fFk +fFk +fFk odx hoA -fEn -fEn -fEn -fEn -fEn -fEn +fFk +fFk +fFk +fFk +fFk +fFk dOV xCK tZk @@ -68902,7 +68043,7 @@ hyt eox uAE pIo -uih +dyJ gvI bxM uih @@ -68915,16 +68056,16 @@ wsX ifN oTS rYh +aDh +aDh qVC qVC qVC -diq -qVC qVC qVC qVC -vFf -szv +ono +onA adP ooR ooR @@ -68966,20 +68107,20 @@ fAU qDj iLO aZw -fEn -fEn -fEn -fEn +fFk +fFk +fFk +fFk fEn hqw uqp huc cXA -fEn +fFk tMf fhw iRo -fEn +fFk dOV xCK tZk @@ -69096,9 +68237,9 @@ hyt wWp kiZ fDw -uih -uih -uih +dyJ +dyJ +dyJ uih uih uih @@ -69109,7 +68250,7 @@ erZ pKk erZ apS -qVC +aDh gmU usS fza @@ -69160,7 +68301,7 @@ fbr apD jWP dnq -fEn +fFk bvr wEA uAe @@ -69173,7 +68314,7 @@ nkA tMf tMf tMf -fEn +fFk dOV xCK tZk @@ -69267,7 +68408,7 @@ bYs eGm eGm eGm -gAM +vBf vBf vBf ncQ @@ -69330,7 +68471,7 @@ tRQ oDC woF xpt -gJU +xYd bhB dUy dUy @@ -69354,20 +68495,20 @@ tVF apD jWP mGX -fEn +fFk hsb mbJ seJ -fEn -fEn +fFk +fFk nIU egR -fEn -fEn +fFk +fFk bws whS lOu -fEn +fFk dOV xCK tZk @@ -69461,7 +68602,7 @@ bYs eGm eGm eGm -vKj +vBf nvE qdY umH @@ -69497,7 +68638,7 @@ lME lME lME pAF -qVC +aDh rQs fza fza @@ -69514,8 +68655,8 @@ hLj ukm oXM oXM -bDc -imm +ooR +ooR tRQ pYp cwN @@ -69548,11 +68689,11 @@ fbr cLd eJF jBg -fEn +fFk ozv lem mRU -fEn +fFk bUS mKy uOa @@ -69561,7 +68702,7 @@ tqV shK iGJ eap -fEn +fFk dOV uVU tZk @@ -69652,7 +68793,7 @@ tZk xhW bYs bYs -ime +gGi gGi gGi ncQ @@ -69675,9 +68816,9 @@ wUr ons ewm hyt -ylZ -kiZ -pIo +hCm +myC +tUP gjp vCX wlQ @@ -69693,7 +68834,7 @@ kDq ffs agx xAH -fza +hzl fza ivT stW @@ -69742,20 +68883,20 @@ oCL kZp kpz eci -fEn -fEn +fFk +fFk vMR qBq -fEn +fFk rTL nrd wDg gvA -fEn -fEn -fEn -fEn -fEn +fFk +fFk +fFk +fFk +fFk dOV dOV xCK @@ -69846,7 +68987,7 @@ eCd dOV bYs bYs -bwS +gGi cHD cHD ncQ @@ -69895,7 +69036,7 @@ gvZ pjL vFf kiZ -mDw +uKP oXM jeM cgs @@ -69912,7 +69053,7 @@ tRQ xYk jXM rRQ -gJU +xYd fGZ fGZ oVB @@ -69944,13 +69085,13 @@ oPP oPP tGr bZH -fzf -fzf +loy +loy wwM mZG nAf -fzf -fzf +loy +loy dOV xCK tZk @@ -70040,7 +69181,7 @@ eCd dOV bYs bYs -bwS +gGi tjn tEa ncQ @@ -70066,10 +69207,10 @@ lsn xRh saK bcW +yeV +yeV khE -khE -khE -hhK +qqq hhK hhK hhK @@ -70079,7 +69220,7 @@ hhK hhK hhK hhK -qVC +aDh mSL iXd xyZ @@ -70138,13 +69279,13 @@ lIJ iDb tDV lIJ -fzf +loy pdv pGm pGm pGm fWG -fzf +loy dOV xCK tZk @@ -70234,7 +69375,7 @@ eCd dOV dOV dOV -bwS +gGi cHD uoL vKj @@ -70263,7 +69404,7 @@ pIo lRV mKp mQd -hhK +qqq qbk rld mcH @@ -70273,7 +69414,7 @@ qKA xXz nja eaP -qVC +aDh rlr sWP xyZ @@ -70305,11 +69446,11 @@ dQg jPH fGZ xBW -gme -oKx -gme -mjb -mjb +dLp +adK +dLp +gKL +ntb wiQ mjb gme @@ -70428,7 +69569,7 @@ wcw bYs bYs bYs -bwS +gGi uvB oIn ncQ @@ -70444,7 +69585,7 @@ hEQ ccI bfh gOY -ygY +gzG fKO fTJ hUc @@ -70457,7 +69598,7 @@ pIo net rYo vTh -hhK +qqq rVr iMv mqH @@ -70475,10 +69616,10 @@ fza wHu nER krJ -vFf -uAE -lCG -kHp +ono +saK +hty +bRh mCW mgD baa @@ -70486,7 +69627,7 @@ rLf hdG epX suh -naX +gYg rQu qEy mCW @@ -70526,7 +69667,7 @@ oih lIJ piA lIJ -fzf +loy gXZ wJt iub @@ -70622,7 +69763,7 @@ wcw bYs bYs bYs -bwS +gGi uvB nJl ncQ @@ -70651,7 +69792,7 @@ pIo lRV dHP mkH -hhK +qqq mVi jAH mNV @@ -70672,7 +69813,7 @@ iWl vFf uAE lCG -kHp +bRh koS qEy nLv @@ -70684,11 +69825,11 @@ xKk sLb qEy jsq -gEo +bRh qTX woF rBT -gJU +xYd oVB oVB oVB @@ -70720,7 +69861,7 @@ oPP shN sPw nZp -fzf +loy fJH vaz sXc @@ -70816,10 +69957,10 @@ wcw bYs bYs bYs -bwS +gGi uvB uvB -eLm +vKj kCR qlx ibT @@ -70830,10 +69971,10 @@ vRF wch fPk sBe -dxd +uTj iKi -dxd -dxd +uTj +uTj qAA tVS lAH @@ -70845,7 +69986,7 @@ pIo lRV lRV kpt -hhK +qqq xIU dWC dWC @@ -70866,7 +70007,7 @@ qVC vFf uAE lCG -kHp +bRh qEy qEy qEy @@ -70878,11 +70019,11 @@ qEy qEy qEy qEy -gEo +bRh qTX woF iCu -gJU +xYd lLy hqJ oVB @@ -70914,7 +70055,7 @@ oPP lIJ piA lIJ -fzf +loy aRe vaz sXc @@ -71010,7 +70151,7 @@ wcw bYs bYs bYs -bwS +gGi iVE cPW woW @@ -71024,13 +70165,13 @@ wwU aFf qkA rzV -dxd +uTj hYr oSf qhk qaJ sLi -dxd +uTj fET nFz oho @@ -71038,17 +70179,17 @@ kiZ pIo lRV aon -lRV -hhK -hhK +pRf +qqq +qqq +sPr +sPr +sPr +sPr +sPr sPr -vud -vud -vud -vud -vud gjh -hhK +qqq khE ixt qVC @@ -71060,7 +70201,7 @@ jiB quL uAE lCG -kHp +bRh cch jgu jgu @@ -71072,14 +70213,14 @@ fEg jgu jgu knh -gEo +bRh qTX woF rBT -gJU -gJU -gJU -gJU +xYd +xYd +xYd +xYd bor clX clX @@ -71104,11 +70245,11 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ -fzf +loy avK woN sXc @@ -71204,7 +70345,7 @@ wcw bYs bYs bYs -bwS +gGi hjV jMs mJF @@ -71224,9 +70365,9 @@ mAq bXl ohV qOH -dxd -ptF -ptF +uTj +laF +laF xsb wMM pIo @@ -71270,7 +70411,7 @@ bDc hUV qbK dbu -vNK +mYh lff lff vNK @@ -71288,8 +70429,8 @@ oVB mTf oVB oVB -aMc -aMc +fGZ +fGZ oVB eGm eGm @@ -71298,7 +70439,7 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ @@ -71398,12 +70539,12 @@ dPd scG bYs bYs -jlF -kbY -kbY -kbY +gGi +jSJ +jSJ +jSJ adV -kbY +jSJ lgG ncI yeu @@ -71412,7 +70553,7 @@ yeu ncI gZZ eOI -dxd +uTj hcG ohV fuc @@ -71421,24 +70562,24 @@ qoB xzG xZS pZi -bGk -kiZ -pIo +oeS +dPz +fVH lRV dHP lRV iDZ hhK tbv -guv -dlI -dlI -dlI -yeV +koV +koV +koV +koV +koV pGk hhK -khE -khE +yeV +yeV qVC oZC qVC @@ -71450,21 +70591,21 @@ uAE lCG bDc pmy -csX -csX +wpb +wpb bDc qBj csX dTD bDc -csX -csX +wpb +wpb bDc bDc pwx rGq xso -vNK +mYh lff lff vNK @@ -71593,7 +70734,7 @@ eGm scG bYs dPd -koV +adV exK xdt skw @@ -71636,7 +70777,7 @@ qLy wWG ljm aAs -sQl +iSf sQl sQl tkV @@ -71658,7 +70799,7 @@ nMb dAN sjh lQF -vNK +mYh lff lff vNK @@ -71679,7 +70820,7 @@ oVB tpC jtT bwd -pru +fGZ eGm eGm eGm @@ -71787,7 +70928,7 @@ eGm kFF bYs dPd -kbY +jSJ xCM aHg rCl @@ -71800,15 +70941,15 @@ cEG ncI sar iVt -dxd +uTj hsO cTu gSS fhU bHT -dxd -ptF -ptF +uTj +laF +laF uay dhE mQk @@ -71816,7 +70957,7 @@ nvP nvP nvP siH -pkN +ena pkN pkN tHF @@ -71873,7 +71014,7 @@ efG bNY jtT opJ -pru +fGZ eGm eGm eGm @@ -71981,7 +71122,7 @@ dPd kFF bYs dPd -kbY +jSJ wAK pCU oFZ @@ -71994,15 +71135,15 @@ tAV ncI uBz ilW -dxd +uTj oDf afS hKh cJs vyj -dxd +uTj fUX -ptF +laF bGk szv kuE @@ -72067,14 +71208,14 @@ oVB aIH jtT opJ -pru +fGZ eGm eGm eGm eGm eGm eGm -ocU +ois lIJ piA lIJ @@ -72175,7 +71316,7 @@ dPd kFF bYs dPd -koV +adV baW uCE mSa @@ -72188,26 +71329,26 @@ vdV ncI bhx lMk -dxd -dxd -dxd -dxd -dxd -dxd -khE +uTj +uTj +uTj +uTj +uTj +uTj +jie gRf -ptF +jie vXa -wFZ +ckf rSX -khE +faK tzD -pjB +fAs neE -pjB +fAs gsY pVR -mst +pVR ptF gRV jrd @@ -72222,28 +71363,28 @@ lqw nPb lqw tOO -rut +tOO xiL lqw xiL lqw -jAO -jAO -jAO +qsE +qsE +qsE cgW ibh bua cgW ibh -jAO -jAO +qsE +qsE lcB kiG jAO -jAO -jAO -jAO -jAO +qsE +qsE +qsE +qsE dUy pvN pvN @@ -72268,11 +71409,11 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ -fzf +loy tvl ivi sXc @@ -72369,7 +71510,7 @@ eGm kFF bYs dPd -koV +adV bNQ psg cVv @@ -72392,11 +71533,11 @@ rtZ xQS fPS ciO -szv +pPC gLd rwK eTd -pjB +fAs hRM mHM qSA @@ -72436,8 +71577,8 @@ dIC ktl qjW aSq -jAO -jAO +qsE +qsE dUy dUy dUy @@ -72452,8 +71593,8 @@ tHn kdQ klz oVB -vtr -vtr +fGZ +fGZ oVB eGm eGm @@ -72466,7 +71607,7 @@ oPP lIJ piA lIJ -fzf +loy pGm ivi sXc @@ -72562,13 +71703,13 @@ eGm eGm wcw bYs -dyJ -kbY -kbY -kbY -kbY -kbY -kbY +lqG +jSJ +jSJ +jSJ +jSJ +jSJ +jSJ ncI ncI ncI @@ -72581,7 +71722,7 @@ aZj aZj wBv siX -nSF +teO rdb uIy cCS @@ -72596,9 +71737,9 @@ gjZ jBw pDy pDy -lAa +jBw dmb -lAa +jBw lAa pFk eHz @@ -72627,16 +71768,16 @@ bFp wpz sga vwQ -jAO -jAO -jAO -jAO -jAO -oVB -oVB -oVB -oVB -oVB +qsE +qsE +qsE +qsE +qsE +cOo +cOo +cOo +cOo +cOo oVB oVB oVB @@ -72660,7 +71801,7 @@ oPP shN sPw nZp -fzf +loy fJH ivi sXc @@ -72756,7 +71897,7 @@ dPd eGm kFF bYs -bEK +lqG avu bjO uXv @@ -72784,7 +71925,7 @@ gTZ ddf eWW nbe -pjB +fAs tGv fun cev @@ -72823,7 +71964,7 @@ jbS lLi yja vun -noU +eez lYy noU jNp @@ -72854,7 +71995,7 @@ oPP ijp piA lIJ -fzf +loy gXZ mxi iub @@ -72950,7 +72091,7 @@ tZk eGm kFF bYs -bEK +lqG iSZ xIm nUc @@ -72981,7 +72122,7 @@ pjB pjB pjB wfD -jBw +mXz wVo aLn wIR @@ -73017,7 +72158,7 @@ pwv sjv mTb byv -byv +mst iIV uaC uQi @@ -73044,7 +72185,7 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ @@ -73144,7 +72285,7 @@ tZk tZk kFF bYs -gKL +lqG tFl hBf sDe @@ -73154,7 +72295,7 @@ bmE hsL qTV snx -hsL +duG imL rha caI @@ -73238,17 +72379,17 @@ eGm eGm eGm eGm -ocU +ois lIJ piA lIJ -fzf +loy gqr oHq rAX obJ jNQ -fzf +loy dOV xCK tZk @@ -73338,7 +72479,7 @@ tZk tZk eCd bYs -gKL +lqG eet hou tRu @@ -73348,7 +72489,7 @@ eun nUc nUc adu -vVx +unp olW fWV uMB @@ -73436,13 +72577,13 @@ oPP lIJ piA lIJ -fzf -fzf -fzf -fzf -fzf -fzf -fzf +loy +loy +loy +loy +loy +loy +loy dOV xCK tZk @@ -73532,7 +72673,7 @@ tZk tZk eCd bYs -gKL +lqG iSZ nUc nUc @@ -73547,7 +72688,7 @@ jhw wbQ kcM uMw -dMz +nlx nlx rOz fxY @@ -73726,7 +72867,7 @@ tZk tZk eCd bYs -gKL +lqG pRx uVb kBG @@ -73921,28 +73062,28 @@ tZk eCd bYs lqG -aOg -aOg -aOg -aOg -aOg +lqG +lqG +lqG +lqG +lqG oPU oPU oPU oPU oPU -ijD -ijD -ijD -ijD -ijD -ijD -ijD -ijD +fxY +fxY +fxY +fxY +fxY +fxY +fxY +fxY eQc cOu eQc -pjB +iGh ktJ lmA hbO @@ -74021,7 +73162,7 @@ qTN oPP jPP jPP -mNm +ois dOV biw tZk @@ -74121,22 +73262,22 @@ bYs bYs dPd dPd -onT +guv xLS cBN eiR -onT +guv hRu vgg mkR fBW yiU tdp -onT +guv otb lpk jwU -pjB +iGh wrI oEG hbO @@ -74215,7 +73356,7 @@ oPP oPP jPP jPP -mNm +ois dOV xCK tZk @@ -74315,22 +73456,22 @@ bYs bYs bYs dPd -onT +guv cwf pWX tns -onT +guv fnK hXb sRl hCH vpN gEL -onT +guv taq vcz fpW -pjB +iGh dVr nsl tYC @@ -74509,22 +73650,22 @@ scG bYs bYs dPd -onT +guv iwu ozw eZy -onT +guv iwu eiR utB irb eiR eiR -onT +guv bmh vcz eWa -pjB +iGh wDv pYn fuT @@ -74569,9 +73710,9 @@ fxG kLu kLu pcg -jAO -jAO -jAO +qsE +qsE +qsE uyz uyz uyz @@ -74703,7 +73844,7 @@ wcw bYs bYs dPd -onT +guv fnK aHd hYE @@ -74718,13 +73859,13 @@ oYs wUf ksc kdK -eQc -eQc -eQc -eQc -eQc -eQc -pjB +ijD +ijD +ijD +ijD +ijD +ijD +iGh wDv uSg rrx @@ -74902,13 +74043,13 @@ pDC aUW pDC onT -onT -onT -onT +guv +guv +guv but -onT -onT -onT +guv +guv +guv wnG vcz rqu @@ -74918,7 +74059,7 @@ dBH ctR sBJ wWq -eQc +ijD rrx rrx rrx @@ -74951,8 +74092,8 @@ ria ria ajK ria -jAO -jAO +qsE +qsE faf eEc eEc @@ -75102,7 +74243,7 @@ bzg ofn oaE aHM -onT +guv pea vcz lLp @@ -75146,13 +74287,13 @@ oME juI xxp fUk -jAO -pcI +qsE +vqw +vqw vqw -pcI nsR rYO -loy +rYO rYO uyz wuB @@ -75296,7 +74437,7 @@ jQd aSf dXU eWA -onT +guv pea dli bbg @@ -75306,7 +74447,7 @@ bbg bbg psA cWU -jJl +jdA prj ibQ bsX @@ -75339,12 +74480,12 @@ dlx opb pTk urz -jAO -jAO +qsE +qsE kWN jUH jUH -wMQ +nsR sGo sGo wqp @@ -75490,7 +74631,7 @@ iOA lWj gtl qgC -onT +guv vEE iuy nyB @@ -75500,7 +74641,7 @@ lLp hck kDm jdA -bXW +jdA prj bes prj @@ -75528,17 +74669,17 @@ mGk lRD xWE kCo +xKF +xKF +xKF +xKF +xKF qsE qsE -qsE -qsE -qsE -qsE -iRN rgt dcB lIH -wMQ +nsR jTz lgD bAK @@ -75684,7 +74825,7 @@ kqR tBR oSE ral -onT +guv xCi iuy lLp @@ -75693,7 +74834,7 @@ biA lLp rrA oWK -jJl +jdA xhR prj wQV @@ -75728,15 +74869,15 @@ dOV dOV dOV dOV -czh +xKF dLw ouU jrv -wMQ +nsR vuQ uHp iVo -imA +xKF dOV dOV dOV @@ -75878,7 +75019,7 @@ jmm pvf oSE vvl -onT +guv gig lwr sKX @@ -75887,7 +75028,7 @@ tvQ uDD mLY rDi -jJl +jdA uSd kev lgu @@ -75913,7 +75054,7 @@ kqq bdb bqs vOS -hAi +fDu dOV dOV dOV @@ -75922,15 +75063,15 @@ kvC kvC szm dOV -jOp xKF xKF xKF -uFq -vHn -vHn -vHn -wTy +xKF +xKF +xKF +xKF +xKF +xKF dOV eLO kvC @@ -76081,7 +75222,7 @@ xhp lLp rrA oWK -jJl +jdA uSd prj wQV @@ -76092,10 +75233,10 @@ prj hyk uhL fJV -qqq +bFS aoO -qqq -qqq +bFS +bFS pqK pqK pqK @@ -76107,7 +75248,7 @@ bdb bdb iku rLN -hAi +fDu dOV biw kvC @@ -76266,7 +75407,7 @@ jmm lqQ bLf txh -onT +guv pea tiw lLp @@ -76275,7 +75416,7 @@ lLp lLp iRw rvP -jJl +jdA rQI prj ikm @@ -76286,10 +75427,10 @@ lal hxw qFU prj -qqq +bFS oEm eaa -dcc +fDu bOj mkj duJ @@ -76298,10 +75439,10 @@ omX frL mUu eQx -dRA +fDu eaa fuz -hAi +fDu dOV xCK tZk @@ -76453,14 +75594,14 @@ dOV dOV dOV bYs -onT +guv dyy hip vyD nlz tMg fgp -onT +guv dzs tiw ygy @@ -76468,34 +75609,34 @@ tXm lLp lLp siU -jdA +nGW eQc -bXt -wyL +xSZ +yjJ bBD -wyL +yjJ xSZ yjJ bMg -mXz +yjJ lWr yjJ -qqq +bFS bsT bqs -qLn -xzF -qhL +fDu +fDu +fDu kTj uVA uVA xts fDu -xzF -xRZ +fDu +fDu bqs maE -hAi +fDu dOV xCK tZk @@ -76647,14 +75788,14 @@ kvC kvC szm bYs -onT -onT -onT -onT -onT +guv +guv +guv +guv +guv wEu -onT -onT +guv +guv xCi lLp lLp @@ -76662,9 +75803,9 @@ lLp lLp lLp usi -jJl +nGW dOV -obH +uDV oqa eGZ ugQ @@ -76674,7 +75815,7 @@ hLZ kaq jko oRr -qqq +bFS vKs rFM kBl @@ -76689,7 +75830,7 @@ wwG wwG wwG jCu -hAi +fDu dOV xCK tZk @@ -76848,7 +75989,7 @@ gWY gWY tuh bYs -jJl +nGW kFn hTs qIn @@ -76856,9 +75997,9 @@ csz xrg hLe bwH -jJl +nGW dOV -obH +uDV aDG iNJ fxy @@ -76868,8 +76009,8 @@ qYU qZj nyb mEK -qqq -qqq +bFS +bFS oVJ bqs bqs @@ -77042,28 +76183,28 @@ rnj qWk lxQ bYs -fFk -fAs -fAs -fAs -fAs -fAs -fAs -fAs +nGW +nGW +nGW +nGW +nGW +nGW +nGW +nGW nGW dOV -obH +uDV xvH nLY kvq -cOo +yjJ fXX qYU nZm vDg sGB ddu -qqq +bFS qkn mxM ykO @@ -77076,7 +76217,7 @@ cOU pAw jJJ lFD -uyO +fDu dOV dOV xCK @@ -77246,30 +76387,30 @@ dOV dOV dOV dOV -obH +uDV gyl aIw hAD -cOo +yjJ oML qYU gxR wwu qYU bhO -qqq -qqq bFS -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli +bFS +bFS +fDu +fDu +fDu +fDu +fDu +fDu +fDu +fDu +fDu +fDu bFS dOV biw @@ -77440,11 +76581,11 @@ kvC kvC ail dOV -obH +uDV nTo aIw sKb -cOo +yjJ uiX qYU vzy @@ -77453,7 +76594,7 @@ usU oSY fWO mOi -obH +uDV dOV dOV dOV @@ -77634,11 +76775,11 @@ tZk tZk eCd dOV -obH +uDV tPS bKH euf -cOo +yjJ nTo qYU qYU @@ -77647,7 +76788,7 @@ qYU lPs lPs aMa -obH +uDV dOV biw kvC @@ -77829,9 +76970,9 @@ tZk eCd dOV uDV -yjJ -yjJ -yjJ +uDV +uDV +uDV xSZ icV rgg @@ -77841,7 +76982,7 @@ gMB gMB gMB akk -obH +uDV dOV xCK tZk @@ -78027,14 +77168,14 @@ dOV dOV dOV uDV -yjJ -yjJ -yjJ -yjJ -yjJ -yjJ -yjJ -yjJ +uDV +uDV +uDV +uDV +uDV +uDV +uDV +uDV xSZ dOV xCK diff --git a/maps/tether/levels/underdark.dmm b/maps/tether/levels/underdark.dmm index fe8813fbe1..0682c61267 100644 --- a/maps/tether/levels/underdark.dmm +++ b/maps/tether/levels/underdark.dmm @@ -117,11 +117,8 @@ /obj/structure/cable/green{ icon_state = "0-10" }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + alarms_hidden = 1 }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) diff --git a/maps/triumph/engines/burn.dmm b/maps/triumph/engines/burn.dmm index 1c84d310c8..d0c94327b2 100644 --- a/maps/triumph/engines/burn.dmm +++ b/maps/triumph/engines/burn.dmm @@ -1,10 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "as" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "ay" = ( @@ -281,8 +278,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -353,10 +349,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "nN" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -551,8 +544,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, diff --git a/maps/triumph/engines/fission.dmm b/maps/triumph/engines/fission.dmm index c05f2dd9a9..ac0339e3b2 100644 --- a/maps/triumph/engines/fission.dmm +++ b/maps/triumph/engines/fission.dmm @@ -183,11 +183,7 @@ name = "Powernet Sensor - Engine Output"; name_tag = "Engine Output" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "hO" = ( @@ -202,8 +198,7 @@ /area/engineering/engine_room) "hS" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -294,7 +289,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -327,7 +321,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterVent"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/reinforced, @@ -340,8 +333,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techfloor, @@ -401,8 +393,7 @@ /obj/structure/closet/radiation, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/techmaint, @@ -459,7 +450,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -555,7 +545,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -667,10 +656,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Hj" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -756,7 +742,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -881,8 +866,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_room) "Ny" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -936,7 +920,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -992,7 +975,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterVent"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor/reinforced, diff --git a/maps/triumph/engines/rust.dmm b/maps/triumph/engines/rust.dmm index ce1f5183e0..fa36ecb84d 100644 --- a/maps/triumph/engines/rust.dmm +++ b/maps/triumph/engines/rust.dmm @@ -483,8 +483,7 @@ dir = 4; icon_state = "pdoor1"; id = "EngineVent"; - name = "Reactor Vent"; - p_open = 0 + name = "Reactor Vent" }, /turf/simulated/floor/reinforced, /area/engineering/engine_room) @@ -525,10 +524,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "lu" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -668,10 +664,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/plating, /area/engineering/engine_room) "rX" = ( @@ -782,8 +775,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/warning{ @@ -1021,11 +1013,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Ln" = ( diff --git a/maps/triumph/engines/sme.dmm b/maps/triumph/engines/sme.dmm index f827e010d3..588ddc96cb 100644 --- a/maps/triumph/engines/sme.dmm +++ b/maps/triumph/engines/sme.dmm @@ -56,7 +56,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -193,7 +192,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -278,8 +276,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -470,10 +467,7 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "sY" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/manifold/visible/green{ dir = 1 }, @@ -624,7 +618,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -685,7 +678,6 @@ /obj/machinery/door/blast/regular{ dir = 4; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -792,11 +784,7 @@ output_tag = "cooling_out"; sensors = list("engine_sensor"="Engine Core") }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Dv" = ( @@ -847,10 +835,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_room) "Ev" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-4" }, @@ -1052,7 +1037,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /turf/simulated/floor, @@ -1072,7 +1056,6 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "SupermatterPort"; - layer = 3.3; name = "Reactor Blast Door" }, /obj/machinery/atmospherics/pipe/simple/visible/red, diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm index 3fd1564b5e..6569ff4e1e 100644 --- a/maps/triumph/levels/deck1.dmm +++ b/maps/triumph/levels/deck1.dmm @@ -306,10 +306,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -764,10 +761,7 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/storage) "cn" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/techfloor/orange{ dir = 10 }, @@ -1346,8 +1340,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -1740,8 +1733,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/red, @@ -1775,8 +1767,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -2121,8 +2112,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -2313,10 +2303,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -2447,8 +2434,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -2760,10 +2746,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "jf" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -3162,11 +3145,8 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) "ks" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable, /turf/simulated/floor/plating, @@ -3532,11 +3512,8 @@ /area/storage/tech) "lP" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/table/rack{ dir = 8; @@ -3575,11 +3552,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/engi_engine) "lT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3879,11 +3853,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/table/rack{ dir = 8; layer = 2.6 @@ -4277,11 +4247,8 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "oE" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /obj/effect/floor_decal/techfloor/orange{ @@ -4426,8 +4393,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "pc" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -4508,8 +4474,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway/lower) "ps" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange, @@ -4549,22 +4514,14 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/debris/cleanable/dirt, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-2" }, /turf/simulated/floor/plating, /area/storage/tech) "py" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /obj/structure/closet/crate/bin{ anchored = 1 @@ -5129,11 +5086,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -6422,10 +6376,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - name = "south bump"; - pixel_y = -32 +/obj/machinery/power/apc/south_mount{ + cell_type = /obj/item/cell/super }, /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 2346; @@ -6608,11 +6560,7 @@ /area/engineering/engine_smes) "wf" = ( /obj/structure/closet/secure_closet/atmos_personal, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -6684,8 +6632,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -6953,11 +6900,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "xj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "4-8" @@ -6996,10 +6940,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/techfloor/orange, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -7311,10 +7252,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "yA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -7351,8 +7289,7 @@ dir = 1 }, /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -7488,10 +7425,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/workshop) "ze" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -7576,8 +7510,7 @@ /turf/simulated/wall/prepainted/engineering, /area/maintenance/trash_pit) "zy" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/bench/wooden, @@ -8069,11 +8002,8 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -8284,8 +8214,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange{ @@ -8674,15 +8603,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/shunt) "Dm" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -8776,8 +8703,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -8900,9 +8826,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "DU" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/portables_connector{ dir = 4 }, @@ -9637,8 +9561,7 @@ /obj/item/hardsuit/ce/equipped{ req_access = list(56) }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -9746,8 +9669,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "GP" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/ladder/up, @@ -9780,10 +9702,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan{ icon_state = "4-8" }, @@ -10854,15 +10773,9 @@ name = "Engineering Hardsuits"; req_access = list(11) }, -/obj/item/hardsuit/eva/equipped{ - req_access = list(10) - }, -/obj/item/hardsuit/eva/equipped{ - req_access = list(10) - }, -/obj/item/hardsuit/eva/equipped{ - req_access = list(10) - }, +/obj/item/hardsuit/eva/equipped, +/obj/item/hardsuit/eva/equipped, +/obj/item/hardsuit/eva/equipped, /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) @@ -11057,8 +10970,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) "Ll" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/computer/ship/navigation/telescreen{ @@ -11570,11 +11482,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) "MV" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11822,8 +11730,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -11878,11 +11785,8 @@ /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -12025,11 +11929,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) "Ov" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, @@ -12304,11 +12204,8 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -12524,11 +12421,8 @@ /turf/space, /area/space) "Qh" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -12586,10 +12480,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/portnacelle) "Qp" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, @@ -12707,11 +12598,7 @@ /turf/simulated/floor/tiled/hydro, /area/engineering/atmos) "QM" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -13143,11 +13030,8 @@ }, /area/tcommsat/chamber) "Sj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/power/apc/east_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-8" @@ -13685,8 +13569,7 @@ /turf/space, /area/space) "Ua" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -13710,10 +13593,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tcommsat/computer) "Ud" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -13814,11 +13694,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -14048,8 +13924,7 @@ /turf/simulated/wall/prepainted/engineering, /area/engineering/engine_monitoring) "Vi" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange{ @@ -14283,11 +14158,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/tiled/techmaint, /area/engineering/workshop) @@ -14413,11 +14285,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 28 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -14761,8 +14630,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor/orange, @@ -14796,15 +14664,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/engineering/hallway) -"XH" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/storage/briefcase/inflatable, -/obj/item/storage/briefcase/inflatable, -/turf/simulated/floor/tiled, -/area/engineering/atmos/monitoring) "XI" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/carpet/blucarpet, @@ -14949,8 +14808,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -15190,11 +15048,7 @@ }, /obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/storage) @@ -15591,8 +15445,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/engineering/hallway/lower) "ZY" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor/orange{ @@ -35325,7 +35178,7 @@ zj ZJ yp Lo -XH +YL eN vW nC diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index 86dc404d24..eae478dc5d 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -49,8 +49,8 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "ah" = ( -/obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "ai" = ( @@ -63,11 +63,8 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "aj" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -135,8 +132,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/steeldecal/steel_decals_central6, @@ -355,7 +351,6 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "belter_docking"; - layer = 3.3; name = "Belting Dock Controller"; pixel_x = 24; pixel_y = 30; @@ -415,7 +410,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "bh" = ( -/obj/machinery/icecream_vat, +/obj/structure/icecream_cart, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bi" = ( @@ -484,10 +479,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "bp" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/civilian, /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/carpet/bcarpet, @@ -835,10 +827,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/hallway/primary/port) @@ -867,11 +856,7 @@ /obj/item/packageWrap, /obj/item/packageWrap, /obj/item/packageWrap, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -899,10 +884,7 @@ }, /obj/structure/closet, /obj/item/storage/backpack/dufflebag, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -985,11 +967,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/random/trash, /turf/simulated/floor/plating, /area/maintenance/cargo) @@ -1117,6 +1095,7 @@ /obj/item/clothing/head/helmet/space/void/mining, /obj/item/clothing/suit/space/void/mining, /obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "de" = ( @@ -1125,7 +1104,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -1316,11 +1294,8 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 8 }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -1342,10 +1317,7 @@ name = "sink"; pixel_x = 13 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 25 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "dO" = ( @@ -1456,11 +1428,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "ec" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -1599,8 +1567,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/catwalk, @@ -1788,11 +1755,8 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "ff" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/power/apc/north_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -2073,11 +2037,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "fW" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2093,8 +2053,7 @@ "fX" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2258,8 +2217,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/triumph/surfacebase/mining_main/refinery) "gu" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor, @@ -2353,11 +2311,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "gO" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2753,11 +2707,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "ik" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /obj/structure/closet/wardrobe, @@ -2923,8 +2874,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "iF" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -3135,11 +3085,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/substation/cargo) @@ -3205,7 +3151,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -3266,11 +3211,7 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "jH" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3377,10 +3318,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "jX" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled, @@ -3433,7 +3371,7 @@ name = "Engineering Fore External Access" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "mining_fore_airlock"; name = "exterior access button"; @@ -3578,15 +3516,13 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "kE" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/structure/table/standard, @@ -3652,10 +3588,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "kM" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3784,11 +3717,8 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "lg" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -3827,11 +3757,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "ll" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -3863,6 +3789,11 @@ /obj/machinery/computer/shuttle_control/belter{ dir = 4 }, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the belter shuttle systems, to help miners find where they left their shuttle."; + gps_tag = "BELTER"; + name = "belter beacon" + }, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "ls" = ( @@ -3978,10 +3909,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/kitchen) "lQ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 17 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -4118,8 +4046,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "mt" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -4150,10 +4077,7 @@ /turf/simulated/floor/tiled/monotile, /area/triumph/surfacebase/mining_main/eva) "mA" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; @@ -4284,7 +4208,6 @@ /area/crew_quarters/freezer) "mX" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/holopad, @@ -4520,11 +4443,7 @@ /obj/structure/bed/chair/comfy/teal{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_11) "nO" = ( @@ -4626,8 +4545,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "og" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/red, @@ -4659,11 +4577,7 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -4702,8 +4616,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "om" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -4755,8 +4668,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/vacant/vacant_shop) "ox" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/door/airlock/glass, @@ -5168,7 +5080,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor{ @@ -5229,11 +5140,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "pS" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green, /turf/simulated/floor/wood, /area/quartermaster/foyer) @@ -5352,11 +5259,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5434,7 +5337,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchen-c"; - layer = 3.3; name = "Kitchen Service Shutters" }, /obj/machinery/door/firedoor, @@ -5613,7 +5515,7 @@ icon_state = "2-8" }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "solar_dock"; name = "interior access button"; @@ -5703,7 +5605,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/recharger, @@ -5900,11 +5801,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "rI" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -5931,8 +5829,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/door/firedoor, @@ -6092,6 +5989,9 @@ "sm" = ( /obj/structure/bed/chair/shuttle, /obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/panic_button{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "sn" = ( @@ -6101,10 +6001,7 @@ "so" = ( /obj/structure/ore_box, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -6582,8 +6479,7 @@ /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -6669,7 +6565,6 @@ /obj/machinery/door/blast/shutters{ dir = 8; id = "kitchen"; - layer = 3.3; name = "Kitchen Service Shutters" }, /turf/simulated/floor/tiled/monotile, @@ -6724,8 +6619,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -6748,8 +6642,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "uf" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/undies_wardrobe, @@ -6860,8 +6753,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) "uu" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/closet/wardrobe, @@ -6878,8 +6770,7 @@ /turf/simulated/wall/r_wall/prepainted/civilian, /area/triumph/surfacebase/bar_backroom) "uz" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -6932,8 +6823,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "uJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -6983,10 +6873,7 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "uR" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -7071,11 +6958,7 @@ /turf/simulated/floor/airless, /area/space) "vc" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -7125,11 +7008,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/port) "vj" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-2" }, @@ -7261,7 +7140,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel/airless, +/turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "vx" = ( /obj/machinery/light/small{ @@ -7500,10 +7379,7 @@ /area/crew_quarters/recreation_area_hallway) "wj" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -7581,11 +7457,8 @@ /turf/simulated/floor/carpet/sblucarpet, /area/quartermaster/qm) "wx" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -7650,11 +7523,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/lounge/kitchen_freezer) "wD" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -7785,7 +7655,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/door/firedoor{ @@ -8054,8 +7923,7 @@ /area/crew_quarters/freezer) "xI" = ( /obj/landmark/spawnpoint/latejoin/station/cryogenics, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -8108,8 +7976,7 @@ /area/maintenance/dormitory) "xQ" = ( /obj/structure/table/glass, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/light{ @@ -8140,6 +8007,9 @@ /obj/item/stack/flag/green, /obj/item/stack/flag/yellow, /obj/item/stack/flag/red, +/obj/item/binoculars{ + pixel_y = 6 + }, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) "xW" = ( @@ -8309,8 +8179,7 @@ "yt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/techfloor{ @@ -8350,8 +8219,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "yy" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/plating, @@ -8571,8 +8439,7 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "yZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -8758,10 +8625,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_4) "zz" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -8852,8 +8716,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_2) "zP" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/computer/ship/navigation/telescreen{ @@ -9379,9 +9242,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "BA" = ( @@ -9455,10 +9316,7 @@ /turf/simulated/floor/tiled, /area/hydroponics) "BP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/wardrobe, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) @@ -9613,11 +9471,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "Cr" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -9735,8 +9589,7 @@ dir = 4; pixel_y = 33 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -9781,8 +9634,7 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -9871,11 +9723,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "De" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -9915,7 +9763,6 @@ dir = 4 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /turf/simulated/floor/tiled, @@ -9988,8 +9835,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/plating, @@ -10031,11 +9877,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -10082,8 +9924,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/triumph/surfacebase/mining_main/refinery) "DR" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/plating, @@ -10105,8 +9946,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "DV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/closet/wardrobe, @@ -10245,8 +10085,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -10274,8 +10113,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "Eu" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -10431,8 +10269,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area_hallway) "EV" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/techfloor{ @@ -10555,10 +10392,7 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10784,11 +10618,8 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "Gf" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -10882,8 +10713,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "Gu" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/reagent_dispensers/beerkeg, @@ -11189,8 +11019,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/bar) "Hn" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor, @@ -11260,8 +11089,7 @@ "HB" = ( /obj/structure/table/marble, /obj/item/hand_labeler, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/item/storage/box/donkpockets, @@ -11475,7 +11303,6 @@ /area/maintenance/dormitory) "Im" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -11520,11 +11347,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/crate/bin{ anchored = 1 }, @@ -11544,8 +11367,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "IA" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -11581,8 +11403,7 @@ /turf/simulated/floor/plating, /area/triumph/surfacebase/mining_main/refinery) "IG" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/filingcabinet/chestdrawer, @@ -11881,10 +11702,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "Jy" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11916,21 +11734,14 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "JF" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/flora/pottedplant/smalltree, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "JH" = ( @@ -12174,11 +11985,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/fiftyspawner/steel, /turf/simulated/floor/wood, @@ -12717,8 +12525,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_office) "LZ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -12907,11 +12714,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -13007,8 +12810,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "MX" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/techfloor, @@ -13087,7 +12889,7 @@ /area/crew_quarters/recreation_area) "Nl" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "mining_fore_airlock"; name = "interior access button"; @@ -13220,8 +13022,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "NA" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/crate/bin{ @@ -13480,7 +13281,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13508,11 +13308,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "Ox" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -13703,8 +13499,7 @@ /area/triumph/surfacebase/mining_main/storage) "OV" = ( /obj/structure/closet/secure_closet/cargotech, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/cargo{ @@ -13898,7 +13693,7 @@ icon_state = "1-2" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "solar_dock"; name = "exterior access button"; @@ -14030,11 +13825,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "PT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -14217,8 +14009,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "QI" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/table/rack/shelf, @@ -14471,8 +14262,7 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "Rq" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14627,8 +14417,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "RP" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/table/woodentable, @@ -14788,11 +14577,8 @@ "Si" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -14810,8 +14596,7 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/port) "Sl" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/recipe_lookup/drinks{ @@ -15216,6 +15001,7 @@ /area/crew_quarters/bar) "TB" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "TC" = ( @@ -15300,8 +15086,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -15376,9 +15161,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "Uc" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /obj/landmark{ name = "blobstart" }, @@ -15480,11 +15263,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "Up" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /turf/simulated/floor/wood, @@ -15530,7 +15310,6 @@ /obj/machinery/door/blast/shutters{ dir = 4; id = "bar"; - layer = 3.3; name = "Bar Shutters" }, /obj/machinery/light{ @@ -15578,10 +15357,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "UE" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -15696,8 +15472,7 @@ /area/crew_quarters/recreation_area) "UU" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/chair/sofa/black/right{ @@ -15910,6 +15685,8 @@ /area/shuttle/mining_ship/general) "Vz" = ( /obj/machinery/light, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "VA" = ( @@ -15936,8 +15713,7 @@ "VE" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/dogbed, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -16025,8 +15801,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/white, @@ -16133,9 +15908,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/machinery/firealarm{ - pixel_y = 24 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/station/stairs_two) "Wh" = ( @@ -16301,8 +16074,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -16327,8 +16099,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "WJ" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -16401,8 +16172,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "WX" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/random/trash_pile, @@ -16484,7 +16254,6 @@ "Xi" = ( /obj/machinery/conveyor_switch/oneway{ id = "mining_interior"; - layer = 3.3; name = "refining conveyor"; pixel_y = 14 }, @@ -16576,11 +16345,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/station/stairs_two) "XC" = ( @@ -16646,8 +16411,7 @@ /area/crew_quarters/sleep/Dorm_7) "XM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16686,7 +16450,6 @@ "XQ" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - layer = 3.3; pixel_y = 30 }, /turf/simulated/floor/tiled, @@ -16755,6 +16518,7 @@ /obj/item/clothing/head/helmet/space/void/mining, /obj/item/clothing/suit/space/void/mining, /obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "Yg" = ( @@ -16819,8 +16583,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -16829,19 +16592,14 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "Yu" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16883,8 +16641,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/structure/catwalk, @@ -17308,21 +17065,14 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "ZR" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" }, /obj/structure/flora/pottedplant/smalltree, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "ZU" = ( diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm index 1efc24c8de..946fdc537c 100644 --- a/maps/triumph/levels/deck3.dmm +++ b/maps/triumph/levels/deck3.dmm @@ -381,10 +381,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/table/woodentable, /obj/item/toy/plushie/kitten, /turf/simulated/floor/wood, @@ -842,8 +839,7 @@ /area/triumph/station/stairs_three) "aHX" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -1134,8 +1130,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "aWr" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1513,10 +1508,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -2107,11 +2099,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/button/windowtint{ dir = 8; id = "ward_b"; @@ -2293,10 +2281,7 @@ /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/black, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/medical/resleeving) @@ -2322,8 +2307,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay3) "bYR" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -2994,10 +2978,7 @@ /area/maintenance/fpmaint2) "cDC" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "cEs" = ( @@ -3049,11 +3030,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -3085,10 +3062,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_c) "cGb" = ( @@ -3112,11 +3086,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "cGu" = ( @@ -3217,10 +3187,7 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer_auxiliary) "cKJ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "cLl" = ( @@ -3241,10 +3208,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_b) "cMb" = ( @@ -3360,11 +3324,7 @@ "cRH" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3433,11 +3393,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/research) "cTS" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -3535,10 +3491,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "cZD" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/triumph/station/stairs_three) "cZK" = ( @@ -4085,10 +4038,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "dzs" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light_switch{ pixel_x = 25 }, @@ -4292,7 +4242,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/multi_tile, /obj/structure/curtain/open/shower/medical, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -4300,6 +4249,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "dHN" = ( @@ -4307,10 +4257,7 @@ /area/rnd/research_foyer_auxiliary) "dIa" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled, /area/rnd/storage) @@ -4531,11 +4478,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/secure_closet/medical3{ name = "surgeon's locker" }, @@ -4887,8 +4830,7 @@ /obj/item/material/knife/machete, /obj/item/clothing/accessory/holster/machete, /obj/item/clothing/accessory/permit/gun/paramedic, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/item/bodybag/cryobag, @@ -5290,10 +5232,7 @@ }, /obj/structure/table/steel_reinforced, /obj/item/hand_labeler, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "eyb" = ( @@ -5404,11 +5343,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -5612,11 +5547,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "eNW" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -5723,11 +5655,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5914,8 +5842,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -6732,10 +6659,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -6884,8 +6808,7 @@ /turf/simulated/floor/tiled, /area/medical/surgeryprep) "fNb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -6998,11 +6921,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "fRk" = ( @@ -7037,8 +6956,7 @@ /turf/simulated/floor/tiled, /area/medical/virology) "fRL" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/carpet/blue, @@ -7114,11 +7032,7 @@ /area/rnd/reception_desk) "fTU" = ( /obj/machinery/computer/rdconsole/core, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7682,8 +7596,7 @@ /turf/simulated/floor/plating, /area/rnd/rdoffice) "guA" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -7710,6 +7623,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "guJ" = ( @@ -7889,10 +7803,7 @@ /obj/machinery/light{ color = "#0098c8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/medical/virologyaccess) "gCw" = ( @@ -8031,11 +7942,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "gJS" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -8094,11 +8001,7 @@ /obj/effect/floor_decal/corner/lightorange/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -8274,8 +8177,7 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "gXK" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -8469,11 +8371,7 @@ /turf/simulated/floor/tiled/dark, /area/assembly/robotics) "hgb" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -8687,11 +8585,7 @@ }, /obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/corner/blue/diagonal, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/landmark/spawnpoint/job/medical_doctor, /turf/simulated/floor/tiled/white, /area/medical/exam_room/exam_1) @@ -8944,10 +8838,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "hwg" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -9273,8 +9164,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9343,8 +9233,7 @@ /obj/item/clothing/mask/surgical, /obj/item/storage/secure/briefcase/ml3m_pack_cmo, /obj/item/clothing/accessory/poncho/roles/cloak/cmo, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ @@ -9638,15 +9527,12 @@ /turf/simulated/floor/tiled, /area/medical/virology) "hWK" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, /obj/structure/bed/chair{ - dir = 1 + dir = 4 }, /obj/machinery/light{ dir = 8; @@ -9818,11 +9704,7 @@ "ido" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/medical/psych_ward) "idK" = ( @@ -9870,6 +9752,9 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "ifg" = ( @@ -10023,8 +9908,7 @@ /area/rnd/research/testingrange) "iny" = ( /obj/structure/loot_pile/maint/trash, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/plating, @@ -10150,11 +10034,7 @@ /area/rnd/rdoffice) "iry" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/table/steel_reinforced, /obj/item/storage/box/masks{ pixel_x = -7 @@ -10223,8 +10103,7 @@ /turf/simulated/floor/tiled, /area/medical/surgery2) "iuJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/closet/coffin, @@ -10261,11 +10140,7 @@ "ivK" = ( /obj/structure/table/standard, /obj/item/flashlight/lamp, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10523,8 +10398,7 @@ /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "iEo" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/open, @@ -10639,11 +10513,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/assembly/robotics/surgery) "iIR" = ( @@ -10911,10 +10781,7 @@ pixel_y = 6 }, /obj/item/toy/plushie/kitten, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/medical/psych/psych_2) "iVb" = ( @@ -11240,8 +11107,7 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -11566,11 +11432,7 @@ /area/holodeck_control) "jvO" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/substation/research) @@ -11767,10 +11629,7 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "jBH" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11875,10 +11734,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/rnd/test_area) "jFt" = ( @@ -12482,11 +12338,7 @@ icon_state = "0-4" }, /obj/machinery/washing_machine, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/white, /area/rnd/research_restroom) "kjr" = ( @@ -12972,11 +12824,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "kFN" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -13027,11 +12875,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "kIf" = ( @@ -13489,10 +13333,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "lcw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/camera/network/civilian, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13528,11 +13369,7 @@ /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) "leM" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) "lfj" = ( @@ -13596,11 +13433,7 @@ icon_state = "0-8" }, /obj/structure/catwalk, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "ljL" = ( @@ -13711,11 +13544,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/bed/chair/office/dark, /obj/machinery/computer/med_data/laptop{ dir = 1; @@ -13792,8 +13621,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/camera/network/medbay{ @@ -13826,11 +13654,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -13840,8 +13664,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "lsR" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/blue/diagonal, @@ -14016,10 +13839,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "lzH" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) @@ -14319,11 +14139,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -14694,7 +14510,6 @@ "mge" = ( /obj/structure/bed/roller, /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_x = 28 }, @@ -15155,10 +14970,7 @@ /turf/space, /area/space) "mDv" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -15271,10 +15083,7 @@ dir = 1 }, /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "mHV" = ( @@ -15336,11 +15145,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/fore) "mLf" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ icon_state = "0-2" @@ -15517,21 +15322,14 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet/crate/bin{ anchored = 1 }, /turf/simulated/floor/tiled, /area/teleporter/departing) "mSd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "mSK" = ( @@ -15698,11 +15496,7 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) "mXs" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -15715,8 +15509,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16123,10 +15916,7 @@ /area/triumph/station/stairs_three) "nrD" = ( /obj/machinery/camera/network/civilian, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "nsd" = ( @@ -16171,10 +15961,7 @@ /area/medical/resleeving) "nvp" = ( /obj/effect/floor_decal/techfloor, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -16480,11 +16267,7 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -16802,8 +16585,7 @@ /turf/simulated/floor/wood, /area/hallway/primary/port) "nUC" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -16973,22 +16755,14 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) "odm" = ( /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/sink{ pixel_y = 19 }, @@ -17070,11 +16844,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/rnd/misc_lab) "ohC" = ( @@ -17251,11 +17021,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/button/windowtint{ dir = 8; id = "ward_a"; @@ -17400,7 +17166,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -17510,11 +17276,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "oyK" = ( @@ -17855,11 +17617,8 @@ /area/medical/surgeryprep) "oMP" = ( /obj/machinery/atmospherics/portables_connector, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -18033,10 +17792,7 @@ /area/rnd/misc_lab) "oSV" = ( /obj/structure/reagent_dispensers/watertank, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/research) "oTe" = ( @@ -18086,11 +17842,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18139,10 +17891,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "oXx" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/loot_pile/maint/trash, /turf/simulated/floor/plating, /area/maintenance/research) @@ -18318,8 +18067,7 @@ dir = 8; light_range = 12 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/machinery/holopad, @@ -18356,11 +18104,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) "peR" = ( @@ -19082,10 +18826,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "pHm" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) @@ -19131,7 +18872,7 @@ req_access = list(39) }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "virology_airlock_control"; name = "Virology Access Button"; @@ -19201,11 +18942,7 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_d) "pLn" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -19733,8 +19470,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "qaw" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/padded, @@ -19759,11 +19495,7 @@ /turf/simulated/floor/plating, /area/rnd/misc_lab) "qdL" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/wood, /area/hallway/primary/port) @@ -20019,11 +19751,7 @@ /turf/simulated/wall/prepainted/science, /area/rnd/research_foyer_auxiliary) "qqe" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/rnd/anomaly_lab) @@ -20179,11 +19907,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/red, /obj/effect/floor_decal/borderfloorwhite{ @@ -20567,11 +20291,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -20837,10 +20557,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "qSB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/disease2/diseaseanalyser, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -21007,7 +20724,6 @@ /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_c) "qZM" = ( -/obj/machinery/computer/ship/sensors, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -21020,8 +20736,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -21116,11 +20831,7 @@ /turf/simulated/floor/tiled, /area/rnd/anomaly_lab/containment_two) "rdw" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -21326,8 +21037,7 @@ /area/medical/virologyisolation) "rnw" = ( /obj/structure/closet/l3closet/virology, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite{ @@ -21355,11 +21065,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "rqj" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21599,8 +21305,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) "rAp" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/random/trash, @@ -21923,8 +21628,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -22179,8 +21883,7 @@ /area/hallway/primary/aft) "rZm" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -22346,8 +22049,7 @@ /turf/simulated/floor/carpet/tealcarpet, /area/medical/patient_d) "skH" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/chair/wheelchair, @@ -22355,10 +22057,12 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "skW" = ( -/obj/machinery/door/firedoor/multi_tile, /obj/structure/curtain/open/shower/medical, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) "slc" = ( @@ -22417,8 +22121,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "smf" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -22866,11 +22569,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "sGt" = ( @@ -22880,8 +22579,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "sHa" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/reagent_dispensers/watertank, @@ -22968,10 +22666,7 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -23010,8 +22705,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "sLb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -23122,10 +22816,7 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology) "sQh" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/techfloor, /obj/structure/cable/green, /turf/simulated/floor/tiled/techfloor, @@ -23415,11 +23106,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -24097,15 +23784,10 @@ "tIc" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/corner/blue/full, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -24145,10 +23827,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "tJE" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -24191,6 +23870,9 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, +/obj/structure/panic_button{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "tLd" = ( @@ -24252,11 +23934,7 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/test_area) "tNv" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -24354,8 +24032,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "tPb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -24405,11 +24082,8 @@ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) @@ -24543,11 +24217,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -24813,10 +24483,7 @@ pixel_y = 16 }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/effect/floor_decal/industrial/outline/blue, /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -24949,10 +24616,7 @@ /obj/structure/table/standard, /obj/item/soap/nanotrasen, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled, /area/holodeck_control) "uon" = ( @@ -25050,10 +24714,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "uuj" = ( @@ -25131,11 +24792,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay/aft) "uxB" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -25470,11 +25127,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -25782,8 +25435,7 @@ /turf/simulated/floor/tiled, /area/medical/medbay_primary_storage) "vcY" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/random/trash_pile, @@ -25867,18 +25519,14 @@ /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "vgT" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "vha" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/techfloor{ @@ -26061,8 +25709,7 @@ /obj/item/storage/firstaid/toxin{ pixel_y = 8 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/industrial/outline/blue, @@ -26109,8 +25756,7 @@ /obj/effect/floor_decal/industrial/loading{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -26296,11 +25942,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "vAo" = ( @@ -26704,11 +26346,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled, /area/triumph/station/stairs_three) "vQu" = ( @@ -26819,11 +26457,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "vVP" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26897,11 +26531,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medical_restroom) "vYZ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -26944,11 +26574,7 @@ /area/maintenance/substation/research) "wap" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "waz" = ( @@ -27348,11 +26974,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay3) "woC" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -27461,11 +27083,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -27498,10 +27116,7 @@ /turf/simulated/floor/plating, /area/maintenance/research) "wwu" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -27555,8 +27170,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -27600,6 +27214,9 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/blue/border, +/obj/machinery/computer/ship/sensors{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/cockpit) "wCL" = ( @@ -27841,10 +27458,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/medical/patient_d) "wLf" = ( @@ -28013,10 +27627,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych_ward) "wQy" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/rnd/xenobiology) @@ -28509,10 +28120,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "xrB" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -28658,11 +28266,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/button/windowtint{ dir = 8; id = "ward_c"; @@ -29099,10 +28703,7 @@ /turf/simulated/floor/plating, /area/maintenance/research) "xOU" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/rnd/breakroom) "xOV" = ( @@ -29268,8 +28869,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/xenoflora_storage) "xUB" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/portable_atmospherics/powered/pump, @@ -29378,11 +28978,7 @@ /area/maintenance/research) "xZy" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -29443,8 +29039,7 @@ /area/medical/sleeper) "ygh" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light, @@ -29530,11 +29125,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index 3ffbae079e..e6e6ebaf63 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -149,10 +149,7 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "ahv" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -608,11 +605,7 @@ /turf/simulated/floor/plating, /area/shuttle/courser/general) "awz" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -995,11 +988,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -1325,11 +1314,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/flora/pottedplant/flower, /turf/simulated/floor/wood, /area/bridge/office) @@ -1384,11 +1369,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Captain's Office" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -1420,8 +1401,7 @@ /obj/machinery/camera/network/security{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled, @@ -1507,8 +1487,7 @@ /obj/item/radio/intercom/department/security{ pixel_y = -24 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/wood, @@ -2521,11 +2500,7 @@ "bKU" = ( /obj/machinery/camera/network/exploration, /obj/structure/table/bench/steel, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "bKZ" = ( @@ -2801,11 +2776,7 @@ /area/security/forensics) "bSR" = ( /obj/structure/flora/pottedplant/minitree, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/item/radio/intercom{ dir = 8; pixel_x = -24 @@ -3143,8 +3114,7 @@ "cfR" = ( /obj/structure/closet/secure_closet/security, /obj/structure/window/basic, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -3172,10 +3142,7 @@ }, /obj/machinery/iv_drip, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/white, /area/exploration/medical) "cgB" = ( @@ -3186,11 +3153,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -3409,8 +3372,7 @@ /area/maintenance/security/starboard) "cpb" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled, @@ -3717,8 +3679,7 @@ "cFi" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/item/reagent_containers/glass/cooler_bottle, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/corner/red{ @@ -4263,11 +4224,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4376,11 +4333,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "ddG" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -4607,11 +4560,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "dhK" = ( @@ -4858,10 +4807,7 @@ /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) "dnt" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) @@ -5185,10 +5131,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "dtN" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "dtZ" = ( @@ -5216,11 +5159,7 @@ "duF" = ( /obj/machinery/camera/network/command, /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, @@ -5378,11 +5317,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -5390,10 +5326,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/sauna) "dBP" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/central) "dCl" = ( @@ -5505,11 +5438,7 @@ /area/chapel/main) "dGi" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/porta_turret/stationary, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -5585,7 +5514,7 @@ /area/hydroponics/garden) "dIH" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "interior access button"; @@ -5828,11 +5757,7 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "dQJ" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -5857,11 +5782,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/machinery/light{ dir = 8; light_range = 12 @@ -6184,7 +6105,7 @@ id_tag = "sec_shuttle_pump" }, /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "exterior access button"; @@ -6851,10 +6772,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "eFy" = ( @@ -6921,11 +6839,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/suit_storage_unit/exploration, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) @@ -7027,19 +6941,11 @@ dir = 1 }, /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/grass, /area/hydroponics/garden) "eKd" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -7128,7 +7034,6 @@ /area/crew_quarters/sleep/CMO_quarters) "eNI" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/light{ @@ -7302,8 +7207,7 @@ /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) "eTm" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/dark, @@ -7512,11 +7416,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/closet/crate/bin{ anchored = 1 }, @@ -7610,11 +7510,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 @@ -7682,11 +7578,7 @@ /area/shuttle/excursion/general) "fkf" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CE_quarters) "fkm" = ( @@ -7958,11 +7850,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/machinery/light{ dir = 4 }, @@ -8034,7 +7922,7 @@ /area/exploration/explorer_prep) "ftm" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "exterior access button"; @@ -8180,8 +8068,7 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/wood, @@ -8411,8 +8298,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorblack, @@ -8438,10 +8324,7 @@ /area/lawoffice) "fLQ" = ( /obj/structure/closet/secure_closet/detective, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/lino, /area/security/detectives_office) "fLR" = ( @@ -8458,7 +8341,7 @@ "fLT" = ( /obj/machinery/door/firedoor, /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1380; master_tag = "civvie_docker"; pixel_x = 5; @@ -8560,10 +8443,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/monotile, /area/security/forensics) @@ -8589,10 +8469,7 @@ pixel_y = 5 }, /obj/item/hand_labeler, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "fPE" = ( @@ -8807,11 +8684,7 @@ dir = 1 }, /obj/structure/table/steel_reinforced, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -9095,11 +8968,8 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/catwalk, /obj/random/trash, @@ -9769,11 +9639,7 @@ /area/ai_upload) "gED" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/bed/chair/comfy/black{ dir = 8 }, @@ -9996,10 +9862,7 @@ "gPm" = ( /obj/landmark/spawnpoint/job/clown, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/clownoffice) "gPM" = ( @@ -10425,7 +10288,6 @@ dir = 4 }, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/effect/floor_decal/borderfloor{ @@ -10647,11 +10509,7 @@ "hip" = ( /obj/structure/table/steel, /obj/machinery/recharger, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -10726,11 +10584,7 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/table/rack/shelf/steel, /obj/item/clothing/head/helmet/ballistic{ pixel_x = -5; @@ -10812,11 +10666,7 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/interrogation) "hnG" = ( @@ -10829,11 +10679,8 @@ /turf/simulated/floor/tiled, /area/exploration) "hoa" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable{ icon_state = "0-4" @@ -10961,10 +10808,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "hsu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/bench/wooden, /turf/simulated/floor/tiled/freezer, /area/triumph/surfacebase/sauna) @@ -11305,10 +11149,7 @@ /area/security/evidence_storage) "hHM" = ( /obj/structure/closet/wardrobe/red, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/red{ dir = 10 @@ -11407,11 +11248,7 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "hJV" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -11604,11 +11441,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -11702,10 +11535,7 @@ /area/crew_quarters/sleep/CMO_quarters) "hVl" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -11968,11 +11798,7 @@ /turf/simulated/floor/tiled, /area/chapel/main) "ifq" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -12034,8 +11860,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "iiq" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/dark, @@ -12242,8 +12067,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/civilian_hallway_mid) "iqj" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/spline/fancy/wood, @@ -12375,8 +12199,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 9 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -12827,11 +12650,7 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "iKm" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -13143,11 +12962,7 @@ dir = 1 }, /obj/machinery/camera/network/security, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/armoury) "iVk" = ( @@ -13163,8 +12978,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "iVr" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/structure/filingcabinet/tall, @@ -13669,11 +13483,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/lounge) "joN" = ( @@ -13879,11 +13689,7 @@ dir = 5 }, /obj/structure/flora/ausbushes/ppflowers, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/grass, /area/hydroponics/garden) "jtj" = ( @@ -14158,11 +13964,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "jBQ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/woodentable, /obj/item/paper_bin, /obj/item/pen, @@ -14191,10 +13993,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/carpet/blucarpet, /area/lawoffice) "jDE" = ( @@ -14229,7 +14028,7 @@ /area/security/prison) "jFB" = ( /obj/machinery/access_button{ - command = "cycle_interior"; + command = "cycle_int"; frequency = 1379; master_tag = "sec_shuttle_airlock"; name = "interior access button"; @@ -14327,11 +14126,8 @@ /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/excursion/general) "jJL" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-4" @@ -14345,11 +14141,7 @@ /turf/simulated/floor/tiled, /area/bridge/hallway) "jJV" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/table/reinforced, /obj/random/tech_supply, /obj/random/tech_supply, @@ -14509,8 +14301,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "jNp" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/carpet/bcarpet, @@ -14531,10 +14322,7 @@ icon_state = "1-4" }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "jOl" = ( @@ -14904,8 +14692,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/carpet/bcarpet, @@ -14932,10 +14719,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "kaw" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/effect/floor_decal/corner/red{ dir = 10 @@ -15124,11 +14908,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "khl" = ( @@ -15205,21 +14985,14 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "kiD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "kiQ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable{ icon_state = "0-8" }, @@ -15302,8 +15075,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -15582,11 +15354,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/bridge/meeting_room) "kyG" = ( @@ -15851,10 +15619,7 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "kGi" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CMO_quarters) "kGu" = ( @@ -15862,8 +15627,7 @@ /area/security/range) "kGB" = ( /obj/machinery/holopad, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/monotile, @@ -16219,11 +15983,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/HOP_quarters) "kPs" = ( @@ -16408,8 +16168,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/item/clothing/under/swimsuit/stripper/cowbikini, /obj/item/reagent_containers/food/drinks/cans/waterbottle, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -16481,10 +16240,7 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "kYv" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/structure/cable/green{ icon_state = "1-4" @@ -16556,8 +16312,7 @@ /turf/simulated/floor/airless/ceiling, /area/space) "lcP" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/filingcabinet/chestdrawer, @@ -16584,11 +16339,7 @@ /area/security/nuke_storage) "ldn" = ( /obj/structure/closet/secure_closet/blueshield, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -16824,10 +16575,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "lqD" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/light, /obj/structure/cable/cyan{ icon_state = "0-8" @@ -17094,11 +16842,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/maintenance/substation/command) "lCw" = ( @@ -17358,11 +17102,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/CMO_quarters) "lOq" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -17383,11 +17123,7 @@ /turf/simulated/floor/plating, /area/maintenance/central) "lOs" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -17705,10 +17441,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/lounge) "maJ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/light{ dir = 1 }, @@ -18176,11 +17909,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "mrJ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -18625,8 +18354,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -18738,8 +18466,7 @@ /turf/simulated/wall/r_wall/prepainted/security, /area/security/brig) "mMS" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/borderfloorblack, @@ -18938,7 +18665,7 @@ /area/hallway/secondary/civilian_hallway_mid) "mTU" = ( /obj/machinery/access_button{ - command = "cycle_exterior"; + command = "cycle_ext"; frequency = 1380; master_tag = "civvie_docker"; pixel_y = -21 @@ -19004,11 +18731,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/table/rack/shelf/steel, /obj/item/gun/ballistic/fiveseven, /obj/item/gun/ballistic/fiveseven, @@ -19358,11 +19081,7 @@ dir = 1 }, /obj/machinery/recharge_station, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/bridge/hallway) "nnq" = ( @@ -19660,11 +19379,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "nzw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CE_quarters) "nzy" = ( @@ -20122,11 +19837,7 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/excursion/general) "nMp" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -20155,11 +19866,7 @@ /area/crew_quarters/clownoffice) "nNa" = ( /obj/structure/dogbed, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -20774,11 +20481,7 @@ /turf/simulated/floor/tiled/monotile, /area/exploration/pathfinder_office) "ogK" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/exploration/meeting) "ogQ" = ( @@ -21015,11 +20718,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "oqF" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -21255,8 +20954,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -21446,11 +21144,7 @@ /obj/item/pen/invisible, /obj/item/pen/invisible, /obj/item/pen/invisible, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -21506,11 +21200,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai/foyer) "oKo" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "oKZ" = ( @@ -21639,11 +21329,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/dark, /area/triumph/station/stairs_four) "oPo" = ( @@ -21711,8 +21397,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24; pixel_y = 6 }, @@ -21752,11 +21437,8 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -21798,11 +21480,7 @@ /turf/simulated/floor/tiled/monotile, /area/security/lobby) "oUz" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -21889,8 +21567,7 @@ "oXL" = ( /obj/structure/table/steel, /obj/item/storage/toolbox/mechanical, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/machinery/light{ @@ -22226,7 +21903,6 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 27 }, /obj/item/storage/briefcase{ @@ -22472,11 +22148,8 @@ /turf/simulated/floor/carpet, /area/bridge/office) "pqr" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -22511,7 +22184,6 @@ /area/teleporter) "prS" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22556,11 +22228,7 @@ /area/security/lobby) "ptO" = ( /obj/machinery/papershredder, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -22629,8 +22297,7 @@ /area/security/brig) "pwQ" = ( /obj/machinery/photocopier, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/effect/floor_decal/corner/purple/full, @@ -22774,16 +22441,11 @@ dir = 6 }, /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "pAb" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/wood, @@ -22869,11 +22531,8 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22969,10 +22628,7 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "pEM" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, @@ -23083,8 +22739,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -23396,11 +23051,7 @@ /turf/simulated/wall/prepainted/exploration, /area/exploration/explorer_prep) "pWm" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/closet/crate/secure/weapon, /turf/simulated/floor/tiled, /area/exploration/excursion_dock) @@ -23481,10 +23132,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) "qbH" = ( @@ -23974,7 +23622,6 @@ }, /obj/machinery/button/windowtint{ id = "hop_bedroom"; - layer = 3.3; pixel_y = 25 }, /turf/simulated/floor/carpet/bcarpet, @@ -24471,11 +24118,7 @@ /obj/item/cell/high{ maxcharge = 15000 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/security/eva) "qNu" = ( @@ -24502,11 +24145,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/structure/cable{ icon_state = "1-2" }, @@ -24590,11 +24229,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -24846,10 +24481,7 @@ /area/hallway/secondary/civilian_hallway_mid) "qZu" = ( /obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/CE_quarters) "qZD" = ( @@ -25198,11 +24830,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "rlK" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -25266,11 +24894,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/library/study) "roT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green, /turf/simulated/floor/tiled, @@ -25298,11 +24923,7 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "rpR" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan{ icon_state = "0-8" }, @@ -25414,8 +25035,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "rvM" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/dark, @@ -25500,11 +25120,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled, /area/exploration/showers) "rzL" = ( @@ -26278,10 +25894,7 @@ /obj/structure/closet{ name = "Evidence Closet" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) @@ -26302,11 +25915,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/excursion_dock) "saW" = ( @@ -26440,10 +26049,7 @@ /turf/simulated/floor/tiled, /area/hydroponics/garden) "sgq" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ icon_state = "0-8" }, @@ -26472,8 +26078,7 @@ /turf/simulated/floor/tiled, /area/exploration/pathfinder_office) "shJ" = ( -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/machinery/light/small, @@ -26575,11 +26180,7 @@ /area/bridge/meeting_room) "skY" = ( /obj/structure/table/steel, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -26663,11 +26264,7 @@ /turf/simulated/floor/tiled/white, /area/triumph/surfacebase/sauna) "snu" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "snQ" = ( @@ -26815,8 +26412,7 @@ /area/hallway/secondary/docking_hallway) "sve" = ( /obj/structure/table/bench/wooden, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -25 }, /obj/effect/mist, @@ -26872,10 +26468,7 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/corner/red/border{ dir = 4 }, @@ -26899,10 +26492,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -27706,11 +27296,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "thX" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "tix" = ( @@ -28262,10 +27848,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "tCF" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/fire_alarm/east_mount, /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/maintenance/chapel) @@ -28384,11 +27967,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "tFw" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -28683,11 +28262,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/machinery/power/apc/north_mount, /turf/simulated/floor/plating, /area/vacant/vacant_bar) "tQJ" = ( @@ -29513,11 +29088,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "usn" = ( @@ -29771,14 +29342,12 @@ /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for shutters."; id = "hop_office_desk"; - layer = 3.3; name = "Desk Privacy Shutter"; pixel_x = -25; pixel_y = -25 }, /obj/machinery/button/windowtint{ id = "hop_office"; - layer = 3.3; pixel_x = -24; pixel_y = 25 }, @@ -29902,10 +29471,7 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "uDg" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/security/hanger) @@ -29931,11 +29497,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "uDx" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -30265,10 +29827,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "uPB" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, @@ -30785,11 +30344,8 @@ /turf/simulated/floor/tiled, /area/exploration/showers) "vjT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /obj/structure/cable/green{ icon_state = "0-2" @@ -31225,8 +30781,7 @@ /area/exploration/excursion_dock) "vEi" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -31270,8 +30825,7 @@ /area/crew_quarters/sleep/HOP_quarters) "vFn" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, /turf/simulated/floor/tiled/techmaint, @@ -31327,10 +30881,7 @@ /turf/simulated/floor/carpet, /area/security/brig) "vGH" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -32 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31392,11 +30943,7 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -31471,11 +31018,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/tiled/dark, /area/security/armoury) "vKT" = ( @@ -31553,11 +31096,8 @@ /area/maintenance/substation/exploration) "vNY" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super }, /turf/simulated/floor/wood, /area/library) @@ -31813,11 +31353,7 @@ /obj/item/radio/intercom{ pixel_y = -24 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 32 - }, +/obj/machinery/power/apc/east_mount, /obj/structure/cable/cyan, /turf/simulated/floor/tiled, /area/shuttle/excursion/cockpit) @@ -31960,8 +31496,7 @@ "wbl" = ( /obj/structure/table/steel, /obj/item/storage/box/evidence, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /turf/simulated/floor/tiled/monotile, @@ -32126,10 +31661,7 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "whp" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/security) @@ -32222,10 +31754,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "woe" = ( @@ -32837,7 +32366,6 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /obj/item/storage/briefcase{ @@ -33133,11 +32661,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, +/obj/machinery/power/apc/east_mount, /turf/simulated/floor/wood, /area/security/breakroom) "wVY" = ( @@ -33163,11 +32687,7 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "wWR" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/machinery/vending/fitness, /turf/simulated/floor/tiled, /area/triumph/surfacebase/tram) @@ -33320,8 +32840,7 @@ /area/gateway) "xch" = ( /obj/machinery/light, -/obj/machinery/firealarm{ - dir = 1; +/obj/machinery/fire_alarm/south_mount{ pixel_y = -24 }, /obj/structure/bed/chair{ @@ -33618,8 +33137,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "xkO" = ( -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -28 }, /turf/simulated/floor/wood, @@ -33782,10 +33300,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "xmL" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/cable/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -33824,11 +33339,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 5 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, @@ -33984,7 +33495,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/newscaster{ - layer = 3.3; pixel_x = -27 }, /turf/simulated/floor/wood, @@ -34066,11 +33576,7 @@ /turf/simulated/floor/plating, /area/maintenance/security/starboard) "xwo" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 4; - pixel_y = 26 - }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/wood, /area/bridge/office) "xwz" = ( @@ -34815,11 +34321,7 @@ name = "AI Upload turret control"; pixel_y = -26 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -34856,8 +34358,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/machinery/firealarm{ - dir = 8; +/obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, /obj/effect/floor_decal/corner/red{ @@ -35021,11 +34522,7 @@ /area/security/lobby) "ydy" = ( /obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, +/obj/machinery/power/apc/east_mount, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -35210,11 +34707,7 @@ /turf/simulated/floor/plating, /area/hallway/secondary/docking_hallway) "yfy" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/power/apc/west_mount, /obj/structure/cable{ icon_state = "0-4" }, @@ -35329,10 +34822,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -24 - }, +/obj/machinery/power/apc/south_mount, /obj/structure/catwalk, /obj/structure/cable{ icon_state = "4-8" diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm index 6859b86f77..59d2c31e2c 100644 --- a/maps/triumph/levels/flagship.dmm +++ b/maps/triumph/levels/flagship.dmm @@ -1,6 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ac" = ( -/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4 + }, /turf/unsimulated/floor/steel, /area/centcom/command) "ae" = ( @@ -2677,7 +2679,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC2"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor/steel, @@ -4185,7 +4186,6 @@ /area/centcom/restaurant) "nm" = ( /obj/machinery/vending/wallmed1{ - layer = 3.3; name = "Emergency NanoMed"; pixel_y = 30 }, @@ -4302,7 +4302,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "ArmouryC4"; - layer = 3.3; name = "Armoury" }, /turf/unsimulated/floor{ @@ -4359,7 +4358,6 @@ /obj/machinery/door/blast/shutters{ dir = 2; id = "kitchenC"; - layer = 3.3; name = "Kitchen Shutters" }, /turf/unsimulated/floor/steel, @@ -6792,6 +6790,12 @@ name = "plating" }, /area/centcom/terminal) +"vO" = ( +/obj/machinery/door/firedoor/glass, +/turf/unsimulated/floor/steel{ + icon_state = "white" + }, +/area/centcom/medical) "vP" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/centcom/security) @@ -7172,7 +7176,7 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/general) "wQ" = ( @@ -7894,6 +7898,12 @@ icon_state = "dark" }, /area/centcom/control) +"zm" = ( +/obj/spawner/window/low_wall/full/firelocks, +/turf/unsimulated/floor{ + name = "plating" + }, +/area/centcom/security) "zt" = ( /obj/machinery/button/remote/blast_door{ id = "HEAVY"; @@ -8856,7 +8866,7 @@ /area/centcom/control) "CB" = ( /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/east_bump, +/obj/machinery/power/apc/alarms_hidden/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -9370,6 +9380,8 @@ }, /area/centcom/command) "Et" = ( +/obj/spawner/window/low_wall/full/firelocks, +/obj/spawner/window/low_wall/full/firelocks, /turf/unsimulated/floor{ name = "plating" }, @@ -10364,7 +10376,8 @@ "HS" = ( /obj/machinery/door/window/brigdoor{ req_access = list(63); - req_one_access = list(1) + req_one_access = list(1); + dir = 4 }, /obj/machinery/button/remote/airlock{ id = "front"; @@ -11315,7 +11328,6 @@ /area/centcom/living) "KF" = ( /obj/machinery/newscaster{ - layer = 3.3; pixel_x = 28 }, /obj/effect/floor_decal/borderfloorblack{ @@ -11719,6 +11731,9 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -13328,7 +13343,8 @@ /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ req_access = list(63); - req_one_access = list(1) + req_one_access = list(1); + dir = 4 }, /turf/unsimulated/floor{ icon_state = "dark" @@ -13626,7 +13642,7 @@ pixel_y = -28 }, /obj/structure/cable/green, -/obj/machinery/power/apc/alarms_hidden/west_bump, +/obj/machinery/power/apc/alarms_hidden/west_mount, /turf/simulated/floor/tiled/dark, /area/shuttle/specops/cockpit) "RN" = ( @@ -14950,7 +14966,8 @@ /obj/machinery/door/airlock/multi_tile/glass{ req_access = list(5) }, -/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -15739,7 +15756,7 @@ /area/centcom/evac) "YL" = ( /obj/structure/cable, -/obj/machinery/power/apc/alarms_hidden/south_bump, +/obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/plating, /area/centcom/specops/dock) "YM" = ( @@ -38918,7 +38935,7 @@ dw gQ Ft dw -dw +vO dw dw dw @@ -46696,7 +46713,7 @@ WK WK WK WK -Et +zm Et WK wp diff --git a/sound/custom_vote.ogg b/sound/custom_vote.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e8f0e2a36ec56e861cd1aa202c007d0f2bf1115c GIT binary patch literal 62451 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
    -StAu-rjRfdg;?fS>&~ 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 literal 0 HcmV?d00001 diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 2477641c7e..56951b1484 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -4,7 +4,7 @@ "version": "4.3.1", "type": "module", "dependencies": { - "axios": "^0.21.1", + "axios": "^1.6.0", "glob": "^7.1.7", "source-map": "^0.7.3", "stacktrace-parser": "^0.1.10", diff --git a/tgui/packages/tgui/interfaces/EmbeddedController.js b/tgui/packages/tgui/interfaces/EmbeddedController.js index 1c0562426b..3d9debc210 100644 --- a/tgui/packages/tgui/interfaces/EmbeddedController.js +++ b/tgui/packages/tgui/interfaces/EmbeddedController.js @@ -467,6 +467,18 @@ const AirlockConsolePhoron = (props, context) => { : 'good'; }), }, + { + minValue: -273, + maxValue: 310, + value: data.chamber_temperature, + label: "Chamber Temperature", + textValue: data.chamber_temperature + " °C", + color: (value => { + return (value < 0) ? 'bad' + : (value < 15) ? 'average' + : 'good'; + }), + }, ]; return ( diff --git a/tgui/packages/tgui/interfaces/ExosuitFabricator.js b/tgui/packages/tgui/interfaces/ExosuitFabricator.js index ecce139d5f..1bdc570b6e 100644 --- a/tgui/packages/tgui/interfaces/ExosuitFabricator.js +++ b/tgui/packages/tgui/interfaces/ExosuitFabricator.js @@ -27,6 +27,8 @@ const MATERIAL_KEYS = { "lead": "stack-adamantine", "platinum": "stack-adamantine", "plastic": "stack-plastic", + "bananium": "stack-bananium", + "silencium": "stack-silencium", }; const COLOR_NONE = 0; diff --git a/tgui/packages/tgui/interfaces/MaterialProcessor.tsx b/tgui/packages/tgui/interfaces/MaterialProcessor.tsx new file mode 100644 index 0000000000..f2aaa73abb --- /dev/null +++ b/tgui/packages/tgui/interfaces/MaterialProcessor.tsx @@ -0,0 +1,158 @@ +import { BooleanLike } from "common/react"; +import { capitalize } from "common/string"; +import { Fragment } from "inferno"; +import { useBackend } from "../backend"; +import { Button, LabeledList, Section, AnimatedNumber } from "../components"; +import { Window } from '../layouts'; + +enum MaterialProcessorMode { + None = 0, + Smelt = 1, + Compress = 2, + Alloy = 3, +} + +const COLOR_PROCESSING = { + [MaterialProcessorMode.None]: false, + [MaterialProcessorMode.Smelt]: "orange", + [MaterialProcessorMode.Compress]: "blue", + [MaterialProcessorMode.Alloy]: "purple", +}; + +type OreData = +{ + name: string, + displayName: string, + processing: number, + amount: number, + ref: string, +} + +type MaterialProcessorData = +{ + on: BooleanLike, + fast: BooleanLike, + ores: OreData[], + unclaimedPoints: number, + idName: string, + idPoints: number, +} + +export const MaterialProcessor = (props, context) => { + const { act, data } = useBackend(context); + const { + on, + fast, + ores, + unclaimedPoints, + idName, + idPoints, + } = data; + + return ( + + +

    + + 0)} + onClick={() => act("claim_points", {})} + /> + }> + + + + {idName && ( + act("eject_id", {})} + /> + }> + + + ) || ( + act("insert_id", {})} /> + } + /> + )} + +
    +
    +
    + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/machines/IcecreamCart.tsx b/tgui/packages/tgui/interfaces/machines/IcecreamCart.tsx new file mode 100644 index 0000000000..58ed84f42e --- /dev/null +++ b/tgui/packages/tgui/interfaces/machines/IcecreamCart.tsx @@ -0,0 +1,88 @@ +import { useBackend } from "../../backend"; +import { Button, LabeledList, ProgressBar, Section, Stack } from "../../components"; +import { Window } from "../../layouts"; +import { ByondAtomColor } from "../common/Color"; + +interface IcecreamCartData { + baseIngredients: { + milk: number, + flour: number, + sugar: number, + ice: number, + }; + sources: { + name: string, + volume: number, + maxVolume: number, + color: ByondAtomColor, + ref: string, + }[]; + scoopSource: number | null; +} + +export const IcecreamCart = (props, context) => { + let { data, act } = useBackend(context); + + return ( + + + + + +
    + + + {data.baseIngredients.flour}u + + + {data.baseIngredients.ice}u + + + {data.baseIngredients.milk}u + + + {data.baseIngredients.sugar}u + + +
    +     +     + +
    + + {data.sources.map((s, i) => ( + + + +
    +     + +
    + act('produceCone')} /> +
    +     +     +     +     + ); +}; diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 2b9fa81bba..83a1e7858a 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -3566,12 +3566,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.1": - version: 0.21.4 - resolution: "axios@npm:0.21.4" +"axios@npm:^1.6.0": + version: 1.6.2 + resolution: "axios@npm:1.6.2" dependencies: - follow-redirects: ^1.14.0 - checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8 languageName: node linkType: hard @@ -5710,13 +5712,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.0": - version: 1.15.0 - resolution: "follow-redirects@npm:1.15.0" +"follow-redirects@npm:^1.15.0": + version: 1.15.3 + resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: debug: optional: true - checksum: eaec81c3e0ae57aae2422e38ad3539d0e7279b3a63f9681eeea319bb683dea67502c4e097136b8ce9721542b4e236e092b6b49e34e326cdd7733c274f0a3f378 + checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231 languageName: node linkType: hard @@ -9241,6 +9243,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "psl@npm:^1.1.28, psl@npm:^1.1.33": version: 1.8.0 resolution: "psl@npm:1.8.0" @@ -10668,7 +10677,7 @@ __metadata: version: 0.0.0-use.local resolution: "tgui-dev-server@workspace:packages/tgui-dev-server" dependencies: - axios: ^0.21.1 + axios: ^1.6.0 glob: ^7.1.7 source-map: ^0.7.3 stacktrace-parser: ^0.1.10 diff --git a/tools/dmi/__init__.py b/tools/dmi/__init__.py index 4c3ef22137..da6d73b680 100755 --- a/tools/dmi/__init__.py +++ b/tools/dmi/__init__.py @@ -174,6 +174,16 @@ def to_file(self, filename, *, palette=False): if palette: output = output.convert('P') output.save(filename, 'png', optimize=True, pnginfo=pnginfo) + + def swap_ns(self): + for i in range(0, len(self.states)): + state = self.states[i] + state.swap_ns() + + def swap_ew(self): + for i in range(0, len(self.states)): + state = self.states[i] + state.swap_ew() class State: @@ -216,7 +226,32 @@ def _frame_index(self, frame=0, dir=None): def get_frame(self, *args, **kwargs): return self.frames[self._frame_index(*args, **kwargs)] - + + def swap_ns(self): + for i in range(0, self.framecount): + if len(self.frames) <= i * self.dirs + 1: + continue + # south + f1 = (i * self.dirs) + 0 + # north + f2 = (i * self.dirs) + 1 + # swap + buffer = self.frames[f1] + self.frames[f1] = self.frames[f2] + self.frames[f2] = buffer + + def swap_ew(self): + for i in range(0, self.framecount): + if len(self.frames) <= i * self.dirs + 3: + continue + # east + f1 = (i * self.dirs) + 2 + # west + f2 = (i * self.dirs) + 3 + # swap + buffer = self.frames[f1] + self.frames[f1] = self.frames[f2] + self.frames[f2] = buffer def escape(text): text = text.replace('\\', '\\\\')

    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 B2Y>(o diff --git a/icons/mob/monitor_icons.dmi b/icons/mob/monitor_icons.dmi index 8c56c1496cf2f88d51e97355736cc606ed7c24ff..33789b41790aa49014200e421fd84bad8b84a388 100644 GIT binary patch literal 17831 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